Skip to content

Commit 71cbf73

Browse files
SasSwartSasSwart
authored
feat(coderd): add support for presets to the coder API (#16526)
This pull request builds on the existing migrations and queries to add support for presets to the coder API.
1 parent ec50a35 commit 71cbf73

File tree

18 files changed

+447
-47
lines changed

18 files changed

+447
-47
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ provisioner/terraform/testdata/version:
809809
.PHONY: provisioner/terraform/testdata/version
810810

811811
test:
812-
$(GIT_FLAGS) gotestsum --format standard-quiet -- -v -short -count=1 ./...
812+
$(GIT_FLAGS) gotestsum --format standard-quiet -- -v -short -count=1 ./... $(if $(RUN),-run $(RUN))
813813
.PHONY: test
814814

815815
test-cli:

‎coderd/apidoc/docs.go

Lines changed: 66 additions & 0 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: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/coderd.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,7 @@ func New(options *Options) *API {
10581058
r.Get("/rich-parameters", api.templateVersionRichParameters)
10591059
r.Get("/external-auth", api.templateVersionExternalAuth)
10601060
r.Get("/variables", api.templateVersionVariables)
1061+
r.Get("/presets", api.templateVersionPresets)
10611062
r.Get("/resources", api.templateVersionResources)
10621063
r.Get("/logs", api.templateVersionLogs)
10631064
r.Route("/dry-run", func(r chi.Router) {

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,6 @@ func (s *MethodTestSuite) TestOrganization() {
886886
JobID: job.ID,
887887
})
888888
insertPresetParams := database.InsertPresetParams{
889-
ID: uuid.New(),
890889
TemplateVersionID: workspaceBuild.TemplateVersionID,
891890
Name: "test",
892891
}
@@ -3817,13 +3816,11 @@ func (s *MethodTestSuite) TestSystemFunctions() {
38173816
CreatedBy: user.ID,
38183817
})
38193818
preset, err := db.InsertPreset(ctx, database.InsertPresetParams{
3820-
ID: uuid.New(),
38213819
TemplateVersionID: templateVersion.ID,
38223820
Name: "test",
38233821
})
38243822
require.NoError(s.T(), err)
38253823
_, err = db.InsertPresetParameters(ctx, database.InsertPresetParametersParams{
3826-
ID: uuid.New(),
38273824
TemplateVersionPresetID: preset.ID,
38283825
Names: []string{"test"},
38293826
Values: []string{"test"},

‎coderd/database/dbmem/dbmem.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8149,6 +8149,7 @@ func (q *FakeQuerier) InsertPreset(_ context.Context, arg database.InsertPresetP
81498149
q.mutex.Lock()
81508150
defer q.mutex.Unlock()
81518151

8152+
//nolint:gosimple // arg needs to keep its type for interface reasons and that type is not appropriate for preset below.
81528153
preset := database.TemplateVersionPreset{
81538154
ID: uuid.New(),
81548155
TemplateVersionID: arg.TemplateVersionID,

‎coderd/database/dump.sql

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

‎coderd/database/migrations/000292_generate_default_preset_parameter_ids.down.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ALTER TABLE template_version_presets
2+
ALTER COLUMN id DROP DEFAULT;
3+
4+
ALTER TABLE template_version_preset_parameters
5+
ALTER COLUMN id DROP DEFAULT;

‎coderd/database/migrations/000292_generate_default_preset_parameter_ids.up.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ALTER TABLE template_version_presets
2+
ALTER COLUMN id SET DEFAULT gen_random_uuid();
3+
4+
ALTER TABLE template_version_preset_parameters
5+
ALTER COLUMN id SET DEFAULT gen_random_uuid();

‎coderd/database/queries.sql.go

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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy