coder · mtojek · Jul 7, 2023 · Jul 7, 2023 · Jul 7, 2023 · Jul 7, 2023
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/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -75,7 +75,6 @@ func TemplateVersionParameter(param database.TemplateVersionParameter) (codersdk
 		ValidationError:      param.ValidationError,
 		ValidationMonotonic:  codersdk.ValidationMonotonicOrder(param.ValidationMonotonic),
 		Required:             param.Required,
-		LegacyVariableName:   param.LegacyVariableName,
 	}, nil
 }
 

diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -3966,7 +3966,6 @@ func (q *fakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
 		ValidationMonotonic: arg.ValidationMonotonic,
 		Required:            arg.Required,
 		DisplayOrder:        arg.DisplayOrder,
-		LegacyVariableName:  arg.LegacyVariableName,
 	}
 	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_drop_rich_parameter_legacy_variable.down.sql b/coderd/database/migrations/000135_drop_rich_parameter_legacy_variable.down.sql
@@ -0,0 +1,5 @@
+-- Unfortunately we can't bring back deleted values.
+
+ALTER TABLE template_version_parameters ADD COLUMN legacy_variable_name text NOT NULL DEFAULT '';
+
+COMMENT ON COLUMN template_version_parameters.legacy_variable_name IS 'Name of the legacy variable for migration purposes';
diff --git a/coderd/database/migrations/000135_drop_rich_parameter_legacy_variable.up.sql b/coderd/database/migrations/000135_drop_rich_parameter_legacy_variable.up.sql
@@ -0,0 +1 @@
+ALTER TABLE template_version_parameters DROP COLUMN legacy_variable_name;
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
@@ -15,7 +15,6 @@ INSERT INTO
         validation_error,
         validation_monotonic,
         required,
-        legacy_variable_name,
         display_name,
         display_order
     )
@@ -36,8 +35,7 @@ VALUES
         $13,
         $14,
         $15,
-        $16,
-        $17
+        $16
     ) RETURNING *;
 
 -- name: GetTemplateVersionParameters :many

diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -826,7 +826,6 @@ func (server *Server) CompleteJob(ctx context.Context, completed *proto.Complete
 				ValidationMonotonic: richParameter.ValidationMonotonic,
 				Required:            richParameter.Required,
 				DisplayOrder:        richParameter.Order,
-				LegacyVariableName:  richParameter.LegacyVariableName,
 			})
 			if err != nil {
 				return nil, xerrors.Errorf("insert parameter: %w", err)

diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -1484,7 +1484,6 @@ func convertTemplateVersionParameter(param database.TemplateVersionParameter) (c
 		ValidationError:      param.ValidationError,
 		ValidationMonotonic:  codersdk.ValidationMonotonicOrder(param.ValidationMonotonic),
 		Required:             param.Required,
-		LegacyVariableName:   param.LegacyVariableName,
 	}, nil
 }
 

diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
@@ -63,7 +63,6 @@ type TemplateVersionParameter struct {
 	ValidationMax        *int32                           `json:"validation_max,omitempty"`
 	ValidationMonotonic  ValidationMonotonicOrder         `json:"validation_monotonic,omitempty" enums:"increasing,decreasing"`
 	Required             bool                             `json:"required"`
-	LegacyVariableName   string                           `json:"legacy_variable_name,omitempty"`
 }
 
 // TemplateVersionParameterOption represents a selectable option for a template parameter.

diff --git a/docs/api/schemas.md b/docs/api/schemas.md
@@ -4201,7 +4201,6 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
   "description_plaintext": "string",
   "display_name": "string",
   "icon": "string",
-  "legacy_variable_name": "string",
   "mutable": true,
   "name": "string",
   "options": [
@@ -4231,7 +4230,6 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
 | `description_plaintext` | string                                                                                      | false    |              |             |
 | `display_name`          | string                                                                                      | false    |              |             |
 | `icon`                  | string                                                                                      | false    |              |             |
-| `legacy_variable_name`  | string                                                                                      | false    |              |             |
 | `mutable`               | boolean                                                                                     | false    |              |             |
 | `name`                  | string                                                                                      | false    |              |             |
 | `options`               | array of [codersdk.TemplateVersionParameterOption](#codersdktemplateversionparameteroption) | false    |              |             |

diff --git a/docs/api/templates.md b/docs/api/templates.md
@@ -2240,7 +2240,6 @@ curl -X GET http://coder-server:8080/api/v2/templateversions/{templateversion}/r
     "description_plaintext": "string",
     "display_name": "string",
     "icon": "string",
-    "legacy_variable_name": "string",
     "mutable": true,
     "name": "string",
     "options": [
@@ -2280,7 +2279,6 @@ Status Code **200**
 | `» description_plaintext` | string                                                                           | false    |              |             |
 | `» display_name`          | string                                                                           | false    |              |             |
 | `» icon`                  | string                                                                           | false    |              |             |
-| `» legacy_variable_name`  | string                                                                           | false    |              |             |
 | `» mutable`               | boolean                                                                          | false    |              |             |
 | `» name`                  | string                                                                           | false    |              |             |
 | `» options`               | array                                                                            | false    |              |             |

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.11.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
@@ -358,4 +358,10 @@ require (
 	inet.af/peercred v0.0.0-20210906144145-0893ea02156a // indirect
 )
 
-require github.com/bep/godartsass/v2 v2.0.0 // indirect
+require (
+	github.com/bep/godartsass/v2 v2.0.0 // indirect
+	github.com/hashicorp/go-plugin v1.4.4 // indirect
+	github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c // indirect
+	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
+	github.com/oklog/run v1.0.0 // indirect
+)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE template_version_parameters DROP COLUMN legacy_variable_name;
Copy link Member mafredri Jul 7, 2023 • edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. What could happen if legacy variables are still present when we upgrade? Should we somehow prevent this migration if any column has a non-empty value here? I'm not sure what we should do, but perhaps something like this (granted the condition is needed). DO $$ BEGIN RAISE 'Bad things will happen!'; END; $$ LANGUAGE plpgsql; Copy link Member Author mtojek Jul 7, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Legacy variable names are not used since 2 minor releases (v0.24.0, v0.25.0). I would assume that we can just drop the column :) Users who forgot to migrate workspaces will not benefit from the `legacy_variable_name` property.