From 58278e1d63d77fd223451ec2d8b5bd9df95e1156 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Date: Mon, 12 Feb 2024 10:48:48 +0530 Subject: [PATCH] fix(infra): Add clustername in nats event publishing for below resources: - helm release - domain entry --- apps/infra/internal/domain/domain-entries.go | 14 ++++++++++---- apps/infra/internal/domain/helm-release.go | 12 ++++++------ apps/infra/internal/domain/ingress.go | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/apps/infra/internal/domain/domain-entries.go b/apps/infra/internal/domain/domain-entries.go index bd438d8ff..037e01742 100644 --- a/apps/infra/internal/domain/domain-entries.go +++ b/apps/infra/internal/domain/domain-entries.go @@ -45,7 +45,7 @@ func (d *domain) CreateDomainEntry(ctx InfraContext, de entities.DomainEntry) (* if err != nil { return nil, errors.NewE(err) } - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeDomainEntries, nde.DomainName, PublishAdd) + d.resourceEventPublisher.PublishResourceEvent(ctx, nde.ClusterName, ResourceTypeDomainEntries, nde.DomainName, PublishAdd) return nde, nil } @@ -71,7 +71,7 @@ func (d *domain) UpdateDomainEntry(ctx InfraContext, de entities.DomainEntry) (* if err != nil { return nil, errors.NewE(err) } - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeDomainEntries, newDe.DomainName, PublishUpdate) + d.resourceEventPublisher.PublishResourceEvent(ctx, newDe.ClusterName, ResourceTypeDomainEntries, newDe.DomainName, PublishUpdate) return newDe, nil } @@ -79,7 +79,13 @@ func (d *domain) DeleteDomainEntry(ctx InfraContext, domainName string) error { if err := d.canPerformActionInAccount(ctx, iamT.DeleteDomainEntry); err != nil { return errors.NewE(err) } - err := d.domainEntryRepo.DeleteOne( + + existing, err := d.findDomainEntry(ctx, ctx.AccountName, domainName) + if err != nil { + return errors.NewE(err) + } + + err = d.domainEntryRepo.DeleteOne( ctx, repos.Filter{ fields.AccountName: ctx.AccountName, @@ -89,7 +95,7 @@ func (d *domain) DeleteDomainEntry(ctx InfraContext, domainName string) error { if err != nil { return errors.NewE(err) } - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeDomainEntries, domainName, PublishDelete) + d.resourceEventPublisher.PublishResourceEvent(ctx, existing.ClusterName, ResourceTypeDomainEntries, domainName, PublishDelete) return nil } diff --git a/apps/infra/internal/domain/helm-release.go b/apps/infra/internal/domain/helm-release.go index b56e6dfc6..a47ddbfee 100644 --- a/apps/infra/internal/domain/helm-release.go +++ b/apps/infra/internal/domain/helm-release.go @@ -125,7 +125,7 @@ func (d *domain) CreateHelmRelease(ctx InfraContext, clusterName string, hr enti return nil, errors.NewE(err) } - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeHelmRelease, nhr.Name, PublishAdd) + d.resourceEventPublisher.PublishResourceEvent(ctx, nhr.ClusterName, ResourceTypeHelmRelease, nhr.Name, PublishAdd) if err = d.resDispatcher.ApplyToTargetCluster(ctx, clusterName, &corev1.Namespace{ TypeMeta: metav1.TypeMeta{ @@ -179,7 +179,7 @@ func (d *domain) UpdateHelmRelease(ctx InfraContext, clusterName string, hrIn en return nil, errors.NewE(err) } - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeHelmRelease, uphr.Name, PublishUpdate) + d.resourceEventPublisher.PublishResourceEvent(ctx, uphr.ClusterName, ResourceTypeHelmRelease, uphr.Name, PublishUpdate) if err := d.applyHelmRelease(ctx, uphr); err != nil { return nil, errors.NewE(err) } @@ -204,7 +204,7 @@ func (d *domain) DeleteHelmRelease(ctx InfraContext, clusterName string, name st return errors.NewE(err) } - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeHelmRelease, uphr.Name, PublishUpdate) + d.resourceEventPublisher.PublishResourceEvent(ctx, uphr.ClusterName, ResourceTypeHelmRelease, uphr.Name, PublishUpdate) return d.resDispatcher.DeleteFromTargetCluster(ctx, clusterName, &uphr.HelmChart) } @@ -227,7 +227,7 @@ func (d *domain) OnHelmReleaseApplyError(ctx InfraContext, clusterName string, n if err != nil { return errors.NewE(err) } - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeHelmRelease, uphr.Name, PublishUpdate) + d.resourceEventPublisher.PublishResourceEvent(ctx, uphr.ClusterName, ResourceTypeHelmRelease, uphr.Name, PublishUpdate) return errors.NewE(err) } @@ -243,7 +243,7 @@ func (d *domain) OnHelmReleaseDeleteMessage(ctx InfraContext, clusterName string if err != nil { return errors.NewE(err) } - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeHelmRelease, hr.Name, PublishDelete) + d.resourceEventPublisher.PublishResourceEvent(ctx, clusterName, ResourceTypeHelmRelease, hr.Name, PublishDelete) return err } @@ -268,6 +268,6 @@ func (d *domain) OnHelmReleaseUpdateMessage(ctx InfraContext, clusterName string return errors.NewE(err) } - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeHelmRelease, uphr.GetName(), PublishUpdate) + d.resourceEventPublisher.PublishResourceEvent(ctx, uphr.ClusterName, ResourceTypeHelmRelease, uphr.GetName(), PublishUpdate) return nil } diff --git a/apps/infra/internal/domain/ingress.go b/apps/infra/internal/domain/ingress.go index 290c808a2..735148e06 100644 --- a/apps/infra/internal/domain/ingress.go +++ b/apps/infra/internal/domain/ingress.go @@ -31,7 +31,7 @@ func (d *domain) OnIngressUpdateMessage(ctx InfraContext, clusterName string, in return err } - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeDomainEntries, de.DomainName, PublishUpdate) + d.resourceEventPublisher.PublishResourceEvent(ctx, clusterName, ResourceTypeDomainEntries, de.DomainName, PublishUpdate) } return nil @@ -61,7 +61,7 @@ func (d *domain) OnIngressDeleteMessage(ctx InfraContext, clusterName string, in } for i := range domainNames { - d.resourceEventPublisher.PublishInfraEvent(ctx, ResourceTypeDomainEntries, domainNames[i].(string), PublishDelete) + d.resourceEventPublisher.PublishResourceEvent(ctx, clusterName, ResourceTypeDomainEntries, domainNames[i].(string), PublishDelete) } return nil }