WIP

coder · mtojek · Mar 7, 2023 · Mar 3, 2023 · Mar 3, 2023 · Mar 3, 2023
commit fbcbe2e98f623d8aea6cccd87f3a0cfed1a654dd
diff --git a/cli/cliui/parameter.go b/cli/cliui/parameter.go
@@ -111,7 +111,7 @@ func RichParameter(cmd *cobra.Command, templateVersionParameter codersdk.Templat
 }
 
 func validateRichPrompt(value string, p codersdk.TemplateVersionParameter) error {
-	return codersdk.ValidateWorkspaceBuildParameter(p, codersdk.WorkspaceBuildParameter{
+	return codersdk.ValidateWorkspaceBuildParameter(p, &codersdk.WorkspaceBuildParameter{
 		Name:  p.Name,
 		Value: value,
 	}, nil)

diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -1898,6 +1898,7 @@ func TestWorkspaceWithOptionalRichParameters(t *testing.T) {
 		secondParameterType        = "number"
 		secondParameterDescription = "_This_ is second *parameter*"
 		secondParameterRequired    = true
+		secondParameterValue       = "333"
 	)
 
 	client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
@@ -1951,17 +1952,22 @@ func TestWorkspaceWithOptionalRichParameters(t *testing.T) {
 
 	expectedBuildParameters := []codersdk.WorkspaceBuildParameter{
 		{Name: firstParameterName, Value: firstParameterDefaultValue},
+		{Name: secondParameterName, Value: secondParameterValue},
 	}
 
 	template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
 	workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) {
-		cwr.RichParameterValues = expectedBuildParameters
+		cwr.RichParameterValues = []codersdk.WorkspaceBuildParameter{
+			// First parameter is optional, so coder should pick the default value.
+			{Name: secondParameterName, Value: secondParameterValue},
+		}
 	})
 
 	workspaceBuild := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
 	require.Equal(t, codersdk.WorkspaceStatusRunning, workspaceBuild.Status)
 
 	workspaceBuildParameters, err := client.WorkspaceBuildParameters(ctx, workspaceBuild.ID)
 	require.NoError(t, err)
+
 	require.ElementsMatch(t, expectedBuildParameters, workspaceBuildParameters)
 }
diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go
@@ -23,19 +23,25 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,
 			continue // previous build parameters have been validated before the last build
 		}
 
-		err := ValidateWorkspaceBuildParameter(richParameter, *buildParameter, lastBuildParameter)
+		err := ValidateWorkspaceBuildParameter(richParameter, buildParameter, lastBuildParameter)
 		if err != nil {
 			return xerrors.Errorf("can't validate build parameter %q: %w", richParameter.Name, err)
 		}
 	}
 	return nil
 }
 
-func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, buildParameter WorkspaceBuildParameter, lastBuildParameter *WorkspaceBuildParameter) error {
-	value := buildParameter.Value
+func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, buildParameter *WorkspaceBuildParameter, lastBuildParameter *WorkspaceBuildParameter) error {
+	var value string
+
+	if buildParameter != nil {
+		value = buildParameter.Value
+	}
+
 	if richParameter.Required && value == "" {
 		return xerrors.Errorf("parameter value is required")
 	}
+
 	if value == "" { // parameter is optional, so take the default value
 		value = richParameter.DefaultValue
 	}