WIP

mtojek · mtojek · commit fbcbe2e98f62 · 2023-03-06T17:54:57.000+01:00
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
 	}

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func RichParameter(cmd *cobra.Command, templateVersionParameter codersdk.Templat`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`func validateRichPrompt(value string, p codersdk.TemplateVersionParameter) error {`
`114`		`- return codersdk.ValidateWorkspaceBuildParameter(p, codersdk.WorkspaceBuildParameter{`
	`114`	`+ return codersdk.ValidateWorkspaceBuildParameter(p, &codersdk.WorkspaceBuildParameter{`
`115`	`115`	`Name: p.Name,`
`116`	`116`	`Value: value,`
`117`	`117`	`}, nil)`
Original file line number	Diff line number	Diff line change
`@@ -23,19 +23,25 @@ func ValidateWorkspaceBuildParameters(richParameters []TemplateVersionParameter,`
`23`	`23`	`continue // previous build parameters have been validated before the last build`
`24`	`24`	`}`
`25`	`25`
`26`		`- err := ValidateWorkspaceBuildParameter(richParameter, *buildParameter, lastBuildParameter)`
	`26`	`+ err := ValidateWorkspaceBuildParameter(richParameter, buildParameter, lastBuildParameter)`
`27`	`27`	`if err != nil {`
`28`	`28`	`return xerrors.Errorf("can't validate build parameter %q: %w", richParameter.Name, err)`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`return nil`
`32`	`32`	`}`
`33`	`33`
`34`		`-func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, buildParameter WorkspaceBuildParameter, lastBuildParameter *WorkspaceBuildParameter) error {`
`35`		`- value := buildParameter.Value`
	`34`	`+func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, buildParameter WorkspaceBuildParameter, lastBuildParameter WorkspaceBuildParameter) error {`
	`35`	`+ var value string`
	`36`	`+`
	`37`	`+ if buildParameter != nil {`
	`38`	`+ value = buildParameter.Value`
	`39`	`+ }`
	`40`	`+`
`36`	`41`	`if richParameter.Required && value == "" {`
`37`	`42`	`return xerrors.Errorf("parameter value is required")`
`38`	`43`	`}`
	`44`	`+`
`39`	`45`	`if value == "" { // parameter is optional, so take the default value`
`40`	`46`	`value = richParameter.DefaultValue`
`41`	`47`	`}`