Merge branch 'main' into hotfix-pass-auth-to-fetch

zarf-dev · May 18, 2023 · c68a8ad · c68a8ad
2 parents c8e13c4 + dc5d064
commit c68a8ad
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/cmd/package.go b/src/cmd/package.go
@@ -81,8 +81,11 @@ var packageDeployCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		pkgConfig.DeployOpts.PackagePath = choosePackage(args)
 
-		// Ensure uppercase keys from viper
+		// Ensure uppercase keys from viper and CLI --set
 		viperConfigSetVariables := utils.TransformMapKeys(v.GetStringMapString(V_PKG_DEPLOY_SET), strings.ToUpper)
+		pkgConfig.DeployOpts.SetVariables = utils.TransformMapKeys(pkgConfig.DeployOpts.SetVariables, strings.ToUpper)
+
+		// Merge the viper config file variables and provided CLI flag variables (CLI takes precedence))
 		pkgConfig.DeployOpts.SetVariables = utils.MergeMap(viperConfigSetVariables, pkgConfig.DeployOpts.SetVariables)
 
 		// Configure the packager