Apply user defaults for deploy/teardown commands.

Author: Moritz Clasmeier

cmd/deploy.go

@@ -263,6 +263,19 @@ func runDeploy(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	// Start with default configuration.
+	deploySettings := deployer.DefaultConfig()
+
+	// Apply user config on top (overriding defaults).
+	if err := tryApplyUserDefaults(globalLogger, &deploySettings); err != nil {
+		return fmt.Errorf("applying user config: %w", err)
+	}
+
+	// Apply changes from arg parsing.
+	if err := mergo.Merge(deploySettings, deploySettingsFromArgs, mergo.WithOverride, mergo.WithoutDereference); err != nil {
+		return fmt.Errorf("applying config patches from command line argument: %w", err)
+	}
+
 	if deploySettings.Roxie.Version != "" {
 		log.Dimf("Using main image tag %s", deploySettings.Roxie.Version)
 	} else {

cmd/teardown.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	"dario.cat/mergo"
 	"github.com/spf13/cobra"
 	"github.com/stackrox/roxie/internal/component"
 	"github.com/stackrox/roxie/internal/deployer"
@@ -55,6 +56,19 @@ func runTeardown(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
+	// Start with default configuration.
+	deploySettings := deployer.DefaultConfig()
+
+	// Apply user config on top (overriding defaults).
+	if err := tryApplyUserDefaults(globalLogger, &deploySettings); err != nil {
+		return fmt.Errorf("applying user config: %w", err)
+	}
+
+	// Apply changes from arg parsing.
+	if err := mergo.Merge(deploySettings, deploySettingsFromArgs, mergo.WithOverride, mergo.WithoutDereference); err != nil {
+		return fmt.Errorf("applying config patches from command line argument: %w", err)
+	}
+
 	d, err := deployer.New(log)
 	if err != nil {
 		return fmt.Errorf("failed to create deployer: %w", err)