Apr 3, 2023 · Mar 31, 2023 · Mar 31, 2023 · Mar 31, 2023 · Mar 31, 2023 · Mar 31, 2023
diff --git a/cli/cliui/parameter.go b/cli/cliui/parameter.go
 }

 funcRichParameter(inv*clibase.Invocation,templateVersionParameter codersdk.TemplateVersionParameter) (string,error) {
 _,_=fmt.Fprintln(inv.Stdout,Styles.Bold.Render(templateVersionParameter.Name))
 label:=templateVersionParameter.Name
 iftemplateVersionParameter.DisplayName!="" {
 label=templateVersionParameter.DisplayName
 }

 _,_=fmt.Fprintln(inv.Stdout,Styles.Bold.Render(label))
 iftemplateVersionParameter.DescriptionPlaintext!="" {
 _,_=fmt.Fprintln(inv.Stdout,"  "+strings.TrimSpace(strings.Join(strings.Split(templateVersionParameter.DescriptionPlaintext,"\n"),"\n  "))+"\n")
 }
diff --git a/cli/create_test.go b/cli/create_test.go
 firstParameterValue="1"

 secondParameterName="second_parameter"
 secondParameterDisplayName="Second Parameter"
 secondParameterDescription="This is second parameter"
 secondParameterValue="2"

 Complete:&proto.Provision_Complete{
 Parameters: []*proto.RichParameter{
 {Name:firstParameterName,Description:firstParameterDescription,Mutable:true},
 {Name:secondParameterName,Description:secondParameterDescription,Mutable:true},
 {Name:secondParameterName,DisplayName:secondParameterDisplayName,Description:secondParameterDescription,Mutable:true},
 {Name:immutableParameterName,Description:immutableParameterDescription,Mutable:false},
 },
 },

 matches:= []string{
 firstParameterDescription,firstParameterValue,
 secondParameterDisplayName,"",
 secondParameterDescription,secondParameterValue,
 immutableParameterDescription,immutableParameterValue,
 "Confirm create?","yes",
 match:=matches[i]
 value:=matches[i+1]
 pty.ExpectMatch(match)
 pty.WriteLine(value)

 ifvalue!="" {
 pty.WriteLine(value)
 }
 }
 <-doneChan
 })
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
 param:= database.TemplateVersionParameter{
 TemplateVersionID:arg.TemplateVersionID,
 Name:arg.Name,
 DisplayName:arg.DisplayName,
 Description:arg.Description,
 Type:arg.Type,
 Mutable:arg.Mutable,
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000112_rich_parameter_display_name.down.sql b/coderd/database/migrations/000112_rich_parameter_display_name.down.sql
 ALTERTABLE template_version_parameters DROP COLUMN display_name;
diff --git a/coderd/database/migrations/000112_rich_parameter_display_name.up.sql b/coderd/database/migrations/000112_rich_parameter_display_name.up.sql
 ALTERTABLE template_version_parameters ADD COLUMN display_nametextNOT NULL DEFAULT'';

 COMMENTON COLUMNtemplate_version_parameters.display_name
 IS'Display name of the rich parameter';
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templateversionparameters.sql b/coderd/database/queries/templateversionparameters.sql
        validation_error,
        validation_monotonic,
        required,
        legacy_variable_name
        legacy_variable_name,
        display_name
    )
 VALUES
    (
        $12,
        $13,
        $14,
        $15
        $15,
 $16
    ) RETURNING*;

 -- name: GetTemplateVersionParameters :many
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
 _,err=server.Database.InsertTemplateVersionParameter(ctx, database.InsertTemplateVersionParameterParams{
 TemplateVersionID:input.TemplateVersionID,
 Name:richParameter.Name,
 DisplayName:richParameter.DisplayName,
 Description:richParameter.Description,
 Type:richParameter.Type,
 Mutable:richParameter.Mutable,
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
 }
 return codersdk.TemplateVersionParameter{
 Name:param.Name,
 DisplayName:param.DisplayName,
 Description:param.Description,
 DescriptionPlaintext:descriptionPlaintext,
 Type:param.Type,
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
 firstParameterValue="1"

 secondParameterName="second_parameter"
 secondParameterDisplayName="Second Parameter"
 secondParameterType="number"
 secondParameterDescription="_This_ is second *parameter*"
 secondParameterValue="2"
 },
 {
 Name:secondParameterName,
 DisplayName:secondParameterDisplayName,
 Type:secondParameterType,
 Description:secondParameterDescription,
 ValidationMin:1,
 require.Equal(t,firstParameterDescriptionPlaintext,templateRichParameters[0].DescriptionPlaintext)
 require.Equal(t,codersdk.ValidationMonotonicOrder(""),templateRichParameters[0].ValidationMonotonic)// no validation for string
 require.Equal(t,secondParameterName,templateRichParameters[1].Name)
 require.Equal(t,secondParameterDisplayName,templateRichParameters[1].DisplayName)
 require.Equal(t,secondParameterType,templateRichParameters[1].Type)
 require.Equal(t,secondParameterDescription,templateRichParameters[1].Description)
 require.Equal(t,secondParameterDescriptionPlaintext,templateRichParameters[1].DescriptionPlaintext)
diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
 // TemplateVersionParameter represents a parameter for a template version.
 typeTemplateVersionParameterstruct {
 Namestring`json:"name"`
 DisplayNamestring`json:"display_name,omitempty"`
 Descriptionstring`json:"description"`
 DescriptionPlaintextstring`json:"description_plaintext"`
 Typestring`json:"type" enums:"string,number,bool,list(string)"`
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
 "default_value":"string",
 "description":"string",
 "description_plaintext":"string",
 "display_name":"string",
 "icon":"string",
 "legacy_variable_name":"string",
 "mutable":true,
 |`default_value`| string| false|||
 |`description`| string| false|||
 |`description_plaintext`| string| false|||
 |`display_name`| string| false|||
 |`icon`| string| false|||
 |`legacy_variable_name`| string| false|||
 |`mutable`| boolean| false|||
diff --git a/docs/api/templates.md b/docs/api/templates.md
 "default_value":"string",
 "description":"string",
 "description_plaintext":"string",
 "display_name":"string",
 "icon":"string",
 "legacy_variable_name":"string",
 "mutable":true,
 |`» default_value`| string| false|||
 |`» description`| string| false|||
 |`» description_plaintext`| string| false|||
 |`» display_name`| string| false|||
 |`» icon`| string| false|||
 |`» legacy_variable_name`| string| false|||
 |`» mutable`| boolean| false|||
diff --git a/go.mod b/go.mod
 github.com/codeclysm/extractv2.2.0+incompatible
 github.com/coder/flogv1.1.0
 github.com/coder/retryv1.3.1-0.20230210155434-e90a2e1e091d
 github.com/coder/terraform-provider-coderv0.6.21
 github.com/coder/terraform-provider-coderv0.6.23
 github.com/coder/wgtunnelv0.1.5
 github.com/coreos/go-oidc/v3v3.4.0
 github.com/coreos/go-systemdv0.0.0-20191104093116-d3cd4ed1dbcf
diff --git a/go.sum b/go.sum
 github.com/coder/sshv0.0.0-20220811105153-fcea99919338/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914=
 github.com/coder/tailscalev1.1.1-0.20230329230537-76a675d945b7 h1:07rCDmnCKGG666bR0WI1grlI/RnI54xj0C+2d2gWeE4=
 github.com/coder/tailscalev1.1.1-0.20230329230537-76a675d945b7/go.mod h1:jpg+77g19FpXL43U1VoIqoSg1K/Vh5CVxycGldQ8KhA=
 github.com/coder/terraform-provider-coderv0.6.21 h1:TIH6+/VQFreT8q/CkRvpHtbIeM5cOAhuDS5Sh1Nm21Q=
 github.com/coder/terraform-provider-coderv0.6.21/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
 github.com/coder/terraform-provider-coderv0.6.23 h1:O2Rcj0umez4DfVdGnKZi63z1Xzxd0IQOn9VQDB8YU8g=
 github.com/coder/terraform-provider-coderv0.6.23/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
 github.com/coder/wgtunnelv0.1.5 h1:WP3sCj/3iJ34eKvpMQEp1oJHvm24RYh0NHbj1kfUKfs=
 github.com/coder/wgtunnelv0.1.5/go.mod h1:bokoUrHnUFY4lu9KOeSYiIcHTI2MO1KwqumU4DPDyJI=
 github.com/containerd/aufsv0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
 }
 protoParam:=&proto.RichParameter{
 Name:param.Name,
 DisplayName:param.DisplayName,
 Description:param.Description,
 Type:param.Type,
 Mutable:param.Mutable,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,7 +62,12 @@ func ParameterSchema(inv *clibase.Invocation, parameterSchema codersdk.Parameter
		}

		funcRichParameter(inv*clibase.Invocation,templateVersionParameter codersdk.TemplateVersionParameter) (string,error) {
		_,_=fmt.Fprintln(inv.Stdout,Styles.Bold.Render(templateVersionParameter.Name))
		label:=templateVersionParameter.Name
		iftemplateVersionParameter.DisplayName!="" {
		label=templateVersionParameter.DisplayName
		}

		_,_=fmt.Fprintln(inv.Stdout,Styles.Bold.Render(label))
		iftemplateVersionParameter.DescriptionPlaintext!="" {
		_,_=fmt.Fprintln(inv.Stdout," "+strings.TrimSpace(strings.Join(strings.Split(templateVersionParameter.DescriptionPlaintext,"\n"),"\n "))+"\n")
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -366,6 +366,7 @@ func TestCreateWithRichParameters(t *testing.T) {
		firstParameterValue="1"

		secondParameterName="second_parameter"
		secondParameterDisplayName="Second Parameter"
		secondParameterDescription="This is second parameter"
		secondParameterValue="2"

Expand All		@@ -382,7 +383,7 @@ func TestCreateWithRichParameters(t *testing.T) {
		Complete:&proto.Provision_Complete{
		Parameters: []*proto.RichParameter{
		{Name:firstParameterName,Description:firstParameterDescription,Mutable:true},
		{Name:secondParameterName,Description:secondParameterDescription,Mutable:true},
		{Name:secondParameterName,DisplayName:secondParameterDisplayName,Description:secondParameterDescription,Mutable:true},
		{Name:immutableParameterName,Description:immutableParameterDescription,Mutable:false},
		},
		},
Expand DownExpand Up		@@ -418,6 +419,7 @@ func TestCreateWithRichParameters(t *testing.T) {

		matches:= []string{
		firstParameterDescription,firstParameterValue,
		secondParameterDisplayName,"",
		secondParameterDescription,secondParameterValue,
		immutableParameterDescription,immutableParameterValue,
		"Confirm create?","yes",
Expand All		@@ -426,7 +428,10 @@ func TestCreateWithRichParameters(t *testing.T) {
		match:=matches[i]
		value:=matches[i+1]
		pty.ExpectMatch(match)
		pty.WriteLine(value)

		ifvalue!="" {
		pty.WriteLine(value)
		}
		}
		<-doneChan
		})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2944,6 +2944,7 @@ func (q *fakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
		param:= database.TemplateVersionParameter{
		TemplateVersionID:arg.TemplateVersionID,
		Name:arg.Name,
		DisplayName:arg.DisplayName,
		Description:arg.Description,
		Type:arg.Type,
		Mutable:arg.Mutable,
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTERTABLE template_version_parameters DROP COLUMN display_name;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		ALTERTABLE template_version_parameters ADD COLUMN display_nametextNOT NULL DEFAULT'';

		COMMENTON COLUMNtemplate_version_parameters.display_name
		IS'Display name of the rich parameter';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,7 +15,8 @@ INSERT INTO
		validation_error,
		validation_monotonic,
		required,
		legacy_variable_name
		legacy_variable_name,
		display_name
		)
		VALUES
		(
Expand All		@@ -33,7 +34,8 @@ VALUES
		$12,
		$13,
		$14,
		$15
		$15,
		$16
		) RETURNING*;

		-- name: GetTemplateVersionParameters :many
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -879,6 +879,7 @@ func (server Server) CompleteJob(ctx context.Context, completed proto.Complete
		_,err=server.Database.InsertTemplateVersionParameter(ctx, database.InsertTemplateVersionParameterParams{
		TemplateVersionID:input.TemplateVersionID,
		Name:richParameter.Name,
		DisplayName:richParameter.DisplayName,
		Description:richParameter.Description,
		Type:richParameter.Type,
		Mutable:richParameter.Mutable,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1596,6 +1596,7 @@ func convertTemplateVersionParameter(param database.TemplateVersionParameter) (c
		}
		return codersdk.TemplateVersionParameter{
		Name:param.Name,
		DisplayName:param.DisplayName,
		Description:param.Description,
		DescriptionPlaintext:descriptionPlaintext,
		Type:param.Type,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1792,6 +1792,7 @@ func TestWorkspaceWithRichParameters(t *testing.T) {
		firstParameterValue="1"

		secondParameterName="second_parameter"
		secondParameterDisplayName="Second Parameter"
		secondParameterType="number"
		secondParameterDescription="_This_ is second parameter"
		secondParameterValue="2"
Expand All		@@ -1814,6 +1815,7 @@ func TestWorkspaceWithRichParameters(t *testing.T) {
		},
		{
		Name:secondParameterName,
		DisplayName:secondParameterDisplayName,
		Type:secondParameterType,
		Description:secondParameterDescription,
		ValidationMin:1,
Expand DownExpand Up		@@ -1850,6 +1852,7 @@ func TestWorkspaceWithRichParameters(t *testing.T) {
		require.Equal(t,firstParameterDescriptionPlaintext,templateRichParameters[0].DescriptionPlaintext)
		require.Equal(t,codersdk.ValidationMonotonicOrder(""),templateRichParameters[0].ValidationMonotonic)// no validation for string
		require.Equal(t,secondParameterName,templateRichParameters[1].Name)
		require.Equal(t,secondParameterDisplayName,templateRichParameters[1].DisplayName)
		require.Equal(t,secondParameterType,templateRichParameters[1].Type)
		require.Equal(t,secondParameterDescription,templateRichParameters[1].Description)
		require.Equal(t,secondParameterDescriptionPlaintext,templateRichParameters[1].DescriptionPlaintext)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,6 +41,7 @@ const (
		// TemplateVersionParameter represents a parameter for a template version.
		typeTemplateVersionParameterstruct {
		Namestring`json:"name"`
		DisplayNamestring`json:"display_name,omitempty"`
		Descriptionstring`json:"description"`
		DescriptionPlaintextstring`json:"description_plaintext"`
		Typestring`json:"type" enums:"string,number,bool,list(string)"`
Expand Down