Merge pull request #134 from rguptar/defaults

[fix] Ensure last prompt gets default value
Azure · Aug 15, 2022 · 55390d1 · 55390d1
2 parents 20dd635 + 45e8568
commit 55390d1
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/pkg/prompts/prompts.go b/pkg/prompts/prompts.go
@@ -66,12 +66,6 @@ func RunPromptsFromConfig(config *config.DraftConfig) (map[string]string, error)
 		if err != nil {
 			return nil, err
 		}
-		// Substitute the default value for variables where the user didn't enter anything
-		for _, variableDefault := range config.VariableDefaults {
-			if inputs[variableDefault.Name] == "" {
-				inputs[variableDefault.Name] = variableDefault.Value
-			}
-		}
 		inputs[prompt.OverrideString] = input
 	}
 
@@ -80,15 +74,16 @@ func RunPromptsFromConfig(config *config.DraftConfig) (map[string]string, error)
 		if err != nil {
 			return nil, err
 		}
-		// Substitute the default value for variables where the user didn't enter anything
-		for _, variableDefault := range config.VariableDefaults {
-			if inputs[variableDefault.Name] == "" {
-				inputs[variableDefault.Name] = variableDefault.Value
-			}
-		}
 		inputs[prompt.OverrideString] = input
 	}
 
+	// Substitute the default value for variables where the user didn't enter anything
+	for _, variableDefault := range config.VariableDefaults {
+		if inputs[variableDefault.Name] == "" {
+			inputs[variableDefault.Name] = variableDefault.Value
+		}
+	}
+
 	return inputs, nil
 }