Skip to content
This repository was archived by the owner on Jun 11, 2025. It is now read-only.

fix(infra): Add clustername in nats event publishing #264

Merged
nxtcoder17 merged 1 commit into from
Feb 12, 2024
Merged

fix(infra): Add clustername in nats event publishing #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions apps/infra/internal/domain/domain-entries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -71,15 +71,21 @@ 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
}

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,
Expand All @@ -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
}

Expand Down
12 changes: 6 additions & 6 deletions apps/infra/internal/domain/helm-release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}

Expand All @@ -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
}

Expand All @@ -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
}
4 changes: 2 additions & 2 deletions apps/infra/internal/domain/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}