Prompt for changed parameter option

mtojek · mtojek · commit 1e41500fdeaa · 2023-08-22T17:25:19.000+02:00
diff --git a/cli/parameterresolver.go b/cli/parameterresolver.go
@@ -141,6 +141,10 @@ next:
 			continue // immutables should not be passed to consecutive builds
 		}
 
+		if len(tvp.Options) > 0 && !isValidTemplateParameterOption(buildParameter, tvp.Options) {
+			continue // do not propagate invalid options
+		}
+
 		for i, r := range resolved {
 			if r.Name == buildParameter.Name {
 				resolved[i].Value = buildParameter.Value
@@ -180,10 +184,11 @@ func (pr *ParameterResolver) resolveWithInput(resolved []codersdk.WorkspaceBuild
 		// Parameter has not been resolved yet, so CLI needs to determine if user should input it.
 
 		firstTimeUse := pr.isFirstTimeUse(tvp.Name)
-
+		promptParameterOption := pr.isLastBuildParameterInvalidOption(tvp)
 		if (tvp.Ephemeral && pr.promptBuildOptions) ||
 			(action == WorkspaceCreate && tvp.Required) ||
 			(action == WorkspaceCreate && !tvp.Ephemeral) ||
+			(action == WorkspaceUpdate && promptParameterOption) ||
 			(action == WorkspaceUpdate && !tvp.Mutable && firstTimeUse) ||
 			(action == WorkspaceUpdate && tvp.Mutable && !tvp.Ephemeral && pr.promptRichParameters) {
 			parameterValue, err := cliui.RichParameter(inv, tvp)
@@ -206,6 +211,19 @@ func (pr *ParameterResolver) isFirstTimeUse(parameterName string) bool {
 	return findWorkspaceBuildParameter(parameterName, pr.lastBuildParameters) == nil
 }
 
+func (pr *ParameterResolver) isLastBuildParameterInvalidOption(templateVersionParameter codersdk.TemplateVersionParameter) bool {
+	if len(templateVersionParameter.Options) == 0 {
+		return false
+	}
+
+	for _, buildParameter := range pr.lastBuildParameters {
+		if buildParameter.Name == templateVersionParameter.Name {
+			return !isValidTemplateParameterOption(buildParameter, templateVersionParameter.Options)
+		}
+	}
+	return false
+}
+
 func findTemplateVersionParameter(workspaceBuildParameter codersdk.WorkspaceBuildParameter, templateVersionParameters []codersdk.TemplateVersionParameter) *codersdk.TemplateVersionParameter {
 	for _, tvp := range templateVersionParameters {
 		if tvp.Name == workspaceBuildParameter.Name {
@@ -223,3 +241,12 @@ func findWorkspaceBuildParameter(parameterName string, params []codersdk.Workspa
 	}
 	return nil
 }
+
+func isValidTemplateParameterOption(buildParameter codersdk.WorkspaceBuildParameter, options []codersdk.TemplateVersionParameterOption) bool {
+	for _, opt := range options {
+		if opt.Value == buildParameter.Value {
+			return true
+		}
+	}
+	return false
+}
diff --git a/cli/update_test.go b/cli/update_test.go
@@ -715,7 +715,8 @@ func TestUpdateValidateRichParameters(t *testing.T) {
 		}()
 
 		matches := []string{
-			"aaaa", "",
+			stringParameterName, "second_option",
+			"Planning workspace...", "",
 		}
 		for i := 0; i < len(matches); i += 2 {
 			match := matches[i]

Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,8 @@ func TestUpdateValidateRichParameters(t *testing.T) {`
`715`	`715`	`}()`
`716`	`716`
`717`	`717`	`matches := []string{`
`718`		`- "aaaa", "",`
	`718`	`+ stringParameterName, "second_option",`
	`719`	`+ "Planning workspace...", "",`
`719`	`720`	`}`
`720`	`721`	`for i := 0; i < len(matches); i += 2 {`
`721`	`722`	`match := matches[i]`