WIP

mtojek · mtojek · commit ef50c356cbed · 2023-07-07T12:32:48.000+02:00
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -3967,6 +3967,7 @@ func (q *fakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
 		Required:            arg.Required,
 		DisplayOrder:        arg.DisplayOrder,
 		LegacyVariableName:  arg.LegacyVariableName,
+		Ephemeral:           arg.Ephemeral,
 	}
 	q.templateVersionParameters = append(q.templateVersionParameters, param)
 	return param, nil
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000135_ephemeral_parameters.down.sql b/coderd/database/migrations/000135_ephemeral_parameters.down.sql
@@ -0,0 +1 @@
+ALTER TABLE template_version_parameters DROP COLUMN ephemeral;
diff --git a/coderd/database/migrations/000135_ephemeral_parameters.up.sql b/coderd/database/migrations/000135_ephemeral_parameters.up.sql
@@ -0,0 +1,4 @@
+ALTER TABLE template_version_parameters ADD COLUMN ephemeral boolean NOT NULL DEFAULT false;
+
+COMMENT ON COLUMN template_version_parameters.ephemeral
+IS 'The value of an ephemeral parameter will not be preserved between consecutive workspace builds.';
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
@@ -17,7 +17,8 @@ INSERT INTO
         required,
         legacy_variable_name,
         display_name,
-        display_order
+        display_order,
+		ephemeral
     )
 VALUES
     (
@@ -37,7 +38,8 @@ VALUES
         $14,
         $15,
         $16,
-        $17
+        $17,
+		$18
     ) RETURNING *;
 
 -- name: GetTemplateVersionParameters :many
diff --git a/go.mod b/go.mod
@@ -75,7 +75,7 @@ require (
 	github.com/codeclysm/extract v2.2.0+incompatible
 	github.com/coder/flog v1.1.0
 	github.com/coder/retry v1.4.0
-	github.com/coder/terraform-provider-coder v0.9.0
+	github.com/coder/terraform-provider-coder v0.10.0
 	github.com/coder/wgtunnel v0.1.5
 	github.com/coreos/go-oidc/v3 v3.6.0
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
@@ -110,7 +110,7 @@ require (
 	github.com/hashicorp/go-version v1.6.0
 	github.com/hashicorp/golang-lru/v2 v2.0.1
 	github.com/hashicorp/hc-install v0.5.2
-	github.com/hashicorp/hcl/v2 v2.17.0
+	github.com/hashicorp/hcl/v2 v2.17.0 // indirect
 	github.com/hashicorp/terraform-config-inspect v0.0.0-20211115214459-90acf1ca460f
 	github.com/hashicorp/terraform-json v0.17.0
 	github.com/hashicorp/yamux v0.1.1
diff --git a/go.sum b/go.sum
@@ -193,8 +193,8 @@ github.com/coder/ssh v0.0.0-20230621095435-9a7e23486f1c h1:TI7TzdFI0UvQmwgyQhtI1
 github.com/coder/ssh v0.0.0-20230621095435-9a7e23486f1c/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=
 github.com/coder/tailscale v0.0.0-20230522123520-74712221d00f h1:F0Xr1d8h8dAHn7tab1HXuzYFkcjmCydnEfdMbkOhlVk=
 github.com/coder/tailscale v0.0.0-20230522123520-74712221d00f/go.mod h1:jpg+77g19FpXL43U1VoIqoSg1K/Vh5CVxycGldQ8KhA=
-github.com/coder/terraform-provider-coder v0.9.0 h1:OJazaeBz6O2h7tDDUyUWgNW71lTPbvbI2raX1CGuBzI=
-github.com/coder/terraform-provider-coder v0.9.0/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
+github.com/coder/terraform-provider-coder v0.10.0 h1:d9iKLhf0bIERqPr0sm02pFSiLphpZ9pKbcv9+8LGvaU=
+github.com/coder/terraform-provider-coder v0.10.0/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
 github.com/coder/wgtunnel v0.1.5 h1:WP3sCj/3iJ34eKvpMQEp1oJHvm24RYh0NHbj1kfUKfs=
 github.com/coder/wgtunnel v0.1.5/go.mod h1:bokoUrHnUFY4lu9KOeSYiIcHTI2MO1KwqumU4DPDyJI=
 github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
diff --git a/provisionersdk/proto/provisioner.proto b/provisionersdk/proto/provisioner.proto
@@ -43,6 +43,7 @@ message RichParameter {
     string legacy_variable_name = 14;
     string display_name = 15;
     int32 order = 16;
+	bool ephemeral = 17;
 }
 
 // RichParameterValue holds the key/value mapping of a parameter.

Original file line number	Diff line number	Diff line change
`@@ -3967,6 +3967,7 @@ func (q *fakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data`
`3967`	`3967`	`Required: arg.Required,`
`3968`	`3968`	`DisplayOrder: arg.DisplayOrder,`
`3969`	`3969`	`LegacyVariableName: arg.LegacyVariableName,`
	`3970`	`+ Ephemeral: arg.Ephemeral,`
`3970`	`3971`	`}`
`3971`	`3972`	`q.templateVersionParameters = append(q.templateVersionParameters, param)`
`3972`	`3973`	`return param, nil`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE template_version_parameters DROP COLUMN ephemeral;`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ message RichParameter {`
`43`	`43`	`string legacy_variable_name = 14;`
`44`	`44`	`string display_name = 15;`
`45`	`45`	`int32 order = 16;`
	`46`	`+ bool ephemeral = 17;`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`// RichParameterValue holds the key/value mapping of a parameter.`