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

fix(apps/console): updates mres '.spec.resourceName' when cloning #253

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

fix(apps/console): updates mres '.spec.resourceName' when cloning #253

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
31 changes: 21 additions & 10 deletions apps/console/internal/domain/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,15 @@ func (d *domain) CloneEnvironment(ctx ConsoleContext, projectName string, source
return nil, errors.NewE(err)
}

if _, err := d.iamClient.AddMembership(ctx, &iam.AddMembershipIn{
UserId: string(ctx.UserId),
ResourceType: string(iamT.ResourceEnvironment),
ResourceRef: iamT.NewResourceRef(ctx.AccountName, iamT.ResourceEnvironment, destEnv.Spec.TargetNamespace),
Role: string(iamT.RoleResourceOwner),
}); err != nil {
d.logger.Errorf(err, "error while adding membership")
}

destEnv, err = d.environmentRepo.Create(ctx, destEnv)
if err != nil {
return nil, errors.NewE(err)
Expand All @@ -224,6 +233,15 @@ func (d *domain) CloneEnvironment(ctx ConsoleContext, projectName string, source
return nil, errors.NewE(err)
}

if err := d.applyK8sResource(ctx, sourceEnv.ProjectName, &corev1.Namespace{
TypeMeta: metav1.TypeMeta{APIVersion: "v1", Kind: "Namespace"},
ObjectMeta: metav1.ObjectMeta{
Name: destEnv.Spec.TargetNamespace,
},
}, destEnv.RecordVersion); err != nil {
return nil, errors.NewE(err)
}

if err := d.applyK8sResource(ctx, sourceEnv.ProjectName, &destEnv.Environment, destEnv.RecordVersion); err != nil {
return nil, errors.NewE(err)
}
Expand Down Expand Up @@ -370,11 +388,13 @@ func (d *domain) CloneEnvironment(ctx ConsoleContext, projectName string, source
}

for i := range managedResources {
spec := managedResources[i].Spec
spec.ResourceName = genMresResourceName(destEnv.Name, managedResources[i].Name)
if _, err := d.createAndApplyManagedResource(resCtx, &entities.ManagedResource{
ManagedResource: crdsv1.ManagedResource{
TypeMeta: managedResources[i].TypeMeta,
ObjectMeta: objectMeta(managedResources[i].ObjectMeta, destEnv.Spec.TargetNamespace),
Spec: managedResources[i].Spec,
Spec: spec,
Enabled: managedResources[i].Enabled,
},
AccountName: ctx.AccountName,
Expand All @@ -386,15 +406,6 @@ func (d *domain) CloneEnvironment(ctx ConsoleContext, projectName string, source
}
}

if _, err := d.iamClient.AddMembership(ctx, &iam.AddMembershipIn{
UserId: string(ctx.UserId),
ResourceType: string(iamT.ResourceEnvironment),
ResourceRef: iamT.NewResourceRef(ctx.AccountName, iamT.ResourceEnvironment, destEnv.Spec.TargetNamespace),
Role: string(iamT.RoleResourceOwner),
}); err != nil {
d.logger.Errorf(err, "error while adding membership")
}

return destEnv, nil
}

Expand Down
6 changes: 5 additions & 1 deletion apps/console/internal/domain/mres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,15 @@ func (d *domain) CreateManagedResource(ctx ResourceContext, mres entities.Manage
mres.ProjectName = ctx.ProjectName
mres.EnvironmentName = ctx.EnvironmentName

mres.Spec.ResourceName = fmt.Sprintf("env-%s-%s", ctx.EnvironmentName, mres.Name)
mres.Spec.ResourceName = genMresResourceName(ctx.EnvironmentName, mres.Name)

return d.createAndApplyManagedResource(ctx, &mres)
}

func genMresResourceName(envName string, mresName string) string {
return fmt.Sprintf("env-%s-%s", envName, mresName)
}

func (d *domain) createAndApplyManagedResource(ctx ResourceContext, mres *entities.ManagedResource) (*entities.ManagedResource, error) {
mres.SyncStatus = t.GenSyncStatus(t.SyncActionApply, 0)

Expand Down