Skip to content

Commit e088303

Browse files
mtojekmtojek
authored
feat!: drop LegacyVariableName from coder parameter (#8360)
1 parent 4e42c33 commit e088303

23 files changed

+443
-354
lines changed

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/db2sdk/db2sdk.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ func TemplateVersionParameter(param database.TemplateVersionParameter) (codersdk
7575
ValidationError: param.ValidationError,
7676
ValidationMonotonic: codersdk.ValidationMonotonicOrder(param.ValidationMonotonic),
7777
Required: param.Required,
78-
LegacyVariableName: param.LegacyVariableName,
7978
}, nil
8079
}
8180

‎coderd/database/dbfake/dbfake.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3966,7 +3966,6 @@ func (q *fakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
39663966
ValidationMonotonic: arg.ValidationMonotonic,
39673967
Required: arg.Required,
39683968
DisplayOrder: arg.DisplayOrder,
3969-
LegacyVariableName: arg.LegacyVariableName,
39703969
}
39713970
q.templateVersionParameters = append(q.templateVersionParameters, param)
39723971
return param, nil

‎coderd/database/dump.sql

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000135_drop_rich_parameter_legacy_variable.down.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-- Unfortunately we can't bring back deleted values.
2+
3+
ALTER TABLE template_version_parameters ADD COLUMN legacy_variable_name text NOT NULL DEFAULT '';
4+
5+
COMMENT ON COLUMN template_version_parameters.legacy_variable_name IS 'Name of the legacy variable for migration purposes';

‎coderd/database/migrations/000135_drop_rich_parameter_legacy_variable.up.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE template_version_parameters DROP COLUMN legacy_variable_name;

‎coderd/database/models.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 3 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/templateversionparameters.sql

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ INSERT INTO
1515
validation_error,
1616
validation_monotonic,
1717
required,
18-
legacy_variable_name,
1918
display_name,
2019
display_order
2120
)
@@ -36,8 +35,7 @@ VALUES
3635
$13,
3736
$14,
3837
$15,
39-
$16,
40-
$17
38+
$16
4139
) RETURNING *;
4240

4341
-- name: GetTemplateVersionParameters :many

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,6 @@ func (server *Server) CompleteJob(ctx context.Context, completed *proto.Complete
826826
ValidationMonotonic: richParameter.ValidationMonotonic,
827827
Required: richParameter.Required,
828828
DisplayOrder: richParameter.Order,
829-
LegacyVariableName: richParameter.LegacyVariableName,
830829
})
831830
if err != nil {
832831
return nil, xerrors.Errorf("insert parameter: %w", err)

‎coderd/templateversions.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1484,7 +1484,6 @@ func convertTemplateVersionParameter(param database.TemplateVersionParameter) (c
14841484
ValidationError: param.ValidationError,
14851485
ValidationMonotonic: codersdk.ValidationMonotonicOrder(param.ValidationMonotonic),
14861486
Required: param.Required,
1487-
LegacyVariableName: param.LegacyVariableName,
14881487
}, nil
14891488
}
14901489

‎codersdk/templateversions.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ type TemplateVersionParameter struct {
6363
ValidationMax *int32 `json:"validation_max,omitempty"`
6464
ValidationMonotonic ValidationMonotonicOrder `json:"validation_monotonic,omitempty" enums:"increasing,decreasing"`
6565
Required bool `json:"required"`
66-
LegacyVariableName string `json:"legacy_variable_name,omitempty"`
6766
}
6867

6968
// TemplateVersionParameterOption represents a selectable option for a template parameter.

‎docs/api/schemas.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4201,7 +4201,6 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
42014201
"description_plaintext": "string",
42024202
"display_name": "string",
42034203
"icon": "string",
4204-
"legacy_variable_name": "string",
42054204
"mutable": true,
42064205
"name": "string",
42074206
"options": [
@@ -4231,7 +4230,6 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
42314230
| `description_plaintext` | string | false | | |
42324231
| `display_name` | string | false | | |
42334232
| `icon` | string | false | | |
4234-
| `legacy_variable_name` | string | false | | |
42354233
| `mutable` | boolean | false | | |
42364234
| `name` | string | false | | |
42374235
| `options` | array of [codersdk.TemplateVersionParameterOption](#codersdktemplateversionparameteroption) | false | | |

‎docs/api/templates.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2240,7 +2240,6 @@ curl -X GET http://coder-server:8080/api/v2/templateversions/{templateversion}/r
22402240
"description_plaintext": "string",
22412241
"display_name": "string",
22422242
"icon": "string",
2243-
"legacy_variable_name": "string",
22442243
"mutable": true,
22452244
"name": "string",
22462245
"options": [
@@ -2280,7 +2279,6 @@ Status Code **200**
22802279
| `» description_plaintext` | string | false | | |
22812280
| `» display_name` | string | false | | |
22822281
| `» icon` | string | false | | |
2283-
| `» legacy_variable_name` | string | false | | |
22842282
| `» mutable` | boolean | false | | |
22852283
| `» name` | string | false | | |
22862284
| `» options` | array | false | | |

‎go.mod

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ require (
7575
github.com/codeclysm/extract v2.2.0+incompatible
7676
github.com/coder/flog v1.1.0
7777
github.com/coder/retry v1.4.0
78-
github.com/coder/terraform-provider-coder v0.9.0
78+
github.com/coder/terraform-provider-coder v0.11.0
7979
github.com/coder/wgtunnel v0.1.5
8080
github.com/coreos/go-oidc/v3 v3.6.0
8181
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
@@ -358,4 +358,10 @@ require (
358358
inet.af/peercred v0.0.0-20210906144145-0893ea02156a // indirect
359359
)
360360

361-
require github.com/bep/godartsass/v2 v2.0.0 // indirect
361+
require (
362+
github.com/bep/godartsass/v2 v2.0.0 // indirect
363+
github.com/hashicorp/go-plugin v1.4.4 // indirect
364+
github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c // indirect
365+
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
366+
github.com/oklog/run v1.0.0 // indirect
367+
)

0 commit comments

Comments
 (0)