Skip to content

Commit f13512e

Browse files
author
Moritz Clasmeier
committed
Fix mergo pointers
1 parent f77598e commit f13512e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

cmd/deploy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func runDeploy(cmd *cobra.Command, args []string) error {
272272
}
273273

274274
// Apply changes from arg parsing.
275-
if err := mergo.Merge(deploySettings, deploySettingsFromArgs, mergo.WithOverride, mergo.WithoutDereference); err != nil {
275+
if err := mergo.Merge(&deploySettings, &deploySettingsFromArgs, mergo.WithOverride, mergo.WithoutDereference); err != nil {
276276
return fmt.Errorf("applying config patches from command line argument: %w", err)
277277
}
278278

cmd/teardown.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func runTeardown(cmd *cobra.Command, args []string) error {
6565
}
6666

6767
// Apply changes from arg parsing.
68-
if err := mergo.Merge(deploySettings, deploySettingsFromArgs, mergo.WithOverride, mergo.WithoutDereference); err != nil {
68+
if err := mergo.Merge(&deploySettings, &deploySettingsFromArgs, mergo.WithOverride, mergo.WithoutDereference); err != nil {
6969
return fmt.Errorf("applying config patches from command line argument: %w", err)
7070
}
7171

0 commit comments

Comments
 (0)