Don't add nest deeper if it is already under 'dev.'

digitalocean · Oct 18, 2022 · b879d3c · b879d3c
1 parent e0369a3
commit b879d3c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/commands/apps_dev.go b/commands/apps_dev.go
@@ -89,6 +89,12 @@ func AppsDev() *Command {
 		"An optional existing app ID. If specified, the app spec will be fetched from the given app.",
 	)
 
+	AddStringFlag(
+		build, doctl.ArgAppDevConfig,
+		"", "",
+		`Path to the app dev config.`,
+	)
+
 	AddStringFlag(
 		build, doctl.ArgEnvFile,
 		"", "",

diff --git a/commands/doit.go b/commands/doit.go
@@ -224,7 +224,7 @@ func AddStringFlag(cmd *Command, name, shorthand, dflt, desc string, opts ...fla
 	// app dev config set/unset --dev-config flag to be nested deeper.
 	// i.e dev.config.set.dev-config over config.set.dev-config
 	// This prevents a conflict with the base config setting.
-	if name == doctl.ArgAppDevConfig {
+	if name == doctl.ArgAppDevConfig && !strings.HasPrefix(fn, appDevConfigFileNamespace+".") {
 		fn = fmt.Sprintf("%s.%s", appDevConfigFileNamespace, fn)
 	}