Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: Also deep-clone aws config in buildTarget #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2024
Merged

fix: Also deep-clone aws config in buildTarget #992

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
8 changes: 5 additions & 3 deletions pkg/kluctl_project/targets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ func (c *LoadedKluctlProject) RenderTarget(target *types.Target) error {
}

func (c *LoadedKluctlProject) buildTarget(configTarget *types.Target) (*types.Target, error) {
var target types.Target
err := utils.DeepCopy(&target, configTarget)
target, err := utils.DeepClone(configTarget)
if err != nil {
return nil, err
}
Expand All @@ -89,5 +88,8 @@ func (c *LoadedKluctlProject) buildTarget(configTarget *types.Target) (*types.Ta
target.Aws.ServiceAccount = c.Config.Aws.ServiceAccount
}
}
return &target, nil
// just to make sure we don't later overwrite stuff from c.Config, which we might have copied into the target a few
// lines above this
target, err = utils.DeepClone(target)
return target, nil
}
9 changes: 9 additions & 0 deletions pkg/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ func DeepCopy(dst interface{}, src interface{}) error {
})
}

func DeepClone[T any](src *T) (*T, error) {
ret := new(T)
err := DeepCopy(ret, src)
if err != nil {
return ret, err
}
return ret, nil
}

func FindStrInSlice(a []string, s string) int {
for i, v := range a {
if v == s {
Expand Down