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

350 all resource cleanups should happen properly when environment is getting deleted it is not deleting all the resources under it #353

Merged
abdheshnayak merged 2 commits into from
Jul 19, 2024
Merged

350 all resource cleanups should happen properly when environment is getting deleted it is not deleting all the resources under it #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05aa0ba
:art: Added env resources deletion when env is deleted
abdheshnayak Jul 19, 2024
fb68881
:art: Added imported-mres for deletion while deleting environment
abdheshnayak Jul 19, 2024
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
3 changes: 2 additions & 1 deletion apps/accounts/internal/domain/accounts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ func (d *domain) ensureNamespaceForAccount(ctx context.Context, accountName stri
}

func (d *domain) deleteNamespaceForAccount(ctx context.Context, targetNamespace string) error {
panic("not implemented. Yet to decide if we want to delete namespace when account is deleted")
// panic("not implemented. Yet to decide if we want to delete namespace when account is deleted")
return fmt.Errorf("not supported yet")
}

func (d *domain) ensureKloudliteRegistryCredentials(ctx UserContext, account *entities.Account) error {
Expand Down
48 changes: 44 additions & 4 deletions apps/console/internal/domain/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,39 @@ import (
t "github.com/kloudlite/api/pkg/types"
)

func (d *domain) cleanupEnvironment(ctx ConsoleContext, envName string) error {
Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot Jul 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: Consider adding a log statement at the start of the cleanupEnvironment function.

Adding a log statement at the beginning of the cleanupEnvironment function can help in debugging and tracking the flow of the cleanup process.

Suggested change
func (d *domain) cleanupEnvironment(ctx ConsoleContext, envName string) error {
func (d *domain) cleanupEnvironment(ctx ConsoleContext, envName string) error {
log.Printf("Starting cleanup for environment: %s in account: %s", envName, ctx.AccountName)

filter := repos.Filter{
fields.AccountName: ctx.AccountName,
fields.EnvironmentName: envName,
}

if err := d.appRepo.DeleteMany(ctx, filter); err != nil {
return errors.NewE(err)
}

if err := d.externalAppRepo.DeleteMany(ctx, filter); err != nil {
return errors.NewE(err)
}

if err := d.secretRepo.DeleteMany(ctx, filter); err != nil {
return errors.NewE(err)
}

if err := d.configRepo.DeleteMany(ctx, filter); err != nil {
return errors.NewE(err)
}

if err := d.routerRepo.DeleteMany(ctx, filter); err != nil {
return errors.NewE(err)
}

if err := d.importedMresRepo.DeleteMany(ctx, filter); err != nil {
return errors.NewE(err)
}

return nil
}

func (d *domain) findEnvironment(ctx ConsoleContext, name string) (*entities.Environment, error) {
env, err := d.environmentRepo.FindOne(ctx, repos.Filter{
fields.AccountName: ctx.AccountName,
Expand Down Expand Up @@ -515,6 +548,10 @@ func (d *domain) DeleteEnvironment(ctx ConsoleContext, name string) error {
d.resourceEventPublisher.PublishConsoleEvent(ctx, entities.ResourceTypeEnvironment, uenv.Name, PublishUpdate)

if uenv.IsArchived != nil && *uenv.IsArchived {
if err := d.cleanupEnvironment(ctx, name); err != nil {
return errors.NewE(err)
}

return d.environmentRepo.DeleteById(ctx, uenv.Id)
}

Expand Down Expand Up @@ -553,18 +590,21 @@ func (d *domain) OnEnvironmentApplyError(ctx ConsoleContext, errMsg, namespace,
}

func (d *domain) OnEnvironmentDeleteMessage(ctx ConsoleContext, env entities.Environment) error {
err := d.environmentRepo.DeleteOne(
if err := d.cleanupEnvironment(ctx, env.Name); err != nil {
return errors.NewE(err)
}

if err := d.environmentRepo.DeleteOne(
ctx,
repos.Filter{
fields.AccountName: ctx.AccountName,
fields.MetadataName: env.Name,
},
)
if err != nil {
); err != nil {
return errors.NewE(err)
}

if _, err = d.iamClient.RemoveResource(ctx, &iam.RemoveResourceIn{
if _, err := d.iamClient.RemoveResource(ctx, &iam.RemoveResourceIn{
ResourceRef: iamT.NewResourceRef(ctx.AccountName, iamT.ResourceEnvironment, env.Name),
}); err != nil {
return errors.NewE(err)
Expand Down