8000 feat(coderd): support ephemeral parameters by mtojek · Pull Request #8367 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat(coderd): support ephemeral parameters #8367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jul 10, 2023
Merged

feat(coderd): support ephemeral parameters #8367

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ef50c35
WIP
mtojek Jul 7, 2023
de38911
WIP2
mtojek Jul 7, 2023
3239d07
Merge branch 'main' into 6828-support-ephemeral-parameters
mtojek Jul 7, 2023
469fcc2
fix
mtojek Jul 7, 2023
712519f
fix
mtojek Jul 7, 2023
ec04dc5
cleanup
mtojek Jul 7, 2023
f1f3a0a
Refs to ephemeral
mtojek Jul 7, 2023
533dde3
fix: frontend
mtojek Jul 7, 2023
97df39f
fmt
mtojek Jul 7, 2023
4ff2705
make gen
mtojek Jul 7, 2023
f826d99
resolver: if not ephemeral
mtojek Jul 7, 2023
cc20564
Merge branch 'main' into 6828-support-ephemeral-parameters
mtojek Jul 10, 2023
35321fc
ParameterResolver tests
mtojek Jul 10, 2023< 8000 /relative-time>
feceec3
WIP
mtojek Jul 10, 2023
e8cd16d
Tests: resources
mtojek Jul 10, 2023
ffb7b94
fmt
mtojek Jul 10, 2023
85044d3
Long ephemeral test
mtojek Jul 10, 2023
3636b70
Merge branch 'main' into 6828-support-ephemeral-parameters
mtojek Jul 10, 2023
343c87e
remove debug
mtojek Jul 10, 2023
38eacbf
fix: go.mod
mtojek Jul 10, 2023
8e73da8
go mod tidy
mtojek Jul 10, 2023
dffefb6
Merge branch 'main' into 6828-support-ephemeral-parameters
mtojek Jul 10, 2023
69e46ee
rename to ephemeralParameter
mtojek Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into 6828-support-ephemeral-parameters
  • Loading branch information
@mtojek
mtojek committed Jul 7, 2023
commit 3239d07bc15d7fa510cbc1fb70c4e8f3d5b1b586
3 changes: 3 additions & 0 deletions coderd/database/dbfake/dbfake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3966,8 +3966,11 @@ func (q *fakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
ValidationMonotonic: arg.ValidationMonotonic,
Required: arg.Required,
DisplayOrder: arg.DisplayOrder,
<<<<<<< HEAD
LegacyVariableName: arg.LegacyVariableName,
Ephemeral: arg.Ephemeral,
=======
>>>>>>> main
}
q.templateVersionParameters = append(q.templateVersionParameters, param)
return param, nil
Expand Down
0 ...ions/000135_ephemeral_parameters.down.sql → ...ions/000136_ephemeral_parameters.down.sql
View file
Open in desktop
File renamed without changes.
0 ...ations/000135_ephemeral_parameters.up.sql → ...ations/000136_ephemeral_parameters.up.sql
View file
Open in desktop
File renamed without changes.
279 changes: 0 additions & 279 deletions coderd/database/querier.go
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions coderd/database/queries/templateversionparameters.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ INSERT INTO
required,
display_name,
display_order,
ephemeral
ephemeral
)
VALUES
(
Expand All @@ -37,8 +37,7 @@ VALUES
$14,
$15,
$16,
$17,
$18
$17
) RETURNING *;

-- name: GetTemplateVersionParameters :many
Expand Down
10 changes: 2 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.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
Expand Down Expand Up @@ -358,10 +358,4 @@ require (
inet.af/peercred v0.0.0-20210906144145-0893ea02156a // 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 Is this related to your change?

Copy link
Member Author
@mtojek mtojek Jul 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned too, but if you copy go.mod and go.sum from main here, and then run go mod tidy, this is the result.

EDIT:

Actually it looks the main branch requires go mod tidy?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we should add tidy as a lint/gen check?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds about right, but rather in a separate PR.

)
require github.com/bep/godartsass/v2 v2.0.0 // indirect
125 changes: 2 additions & 123 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

219 changes: 219 additions & 0 deletions provisionersdk/proto/provisioner.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

You are viewing a condensed version of this merge commit. You can view the full changes here.
0