coder · SasSwart · Feb 12, 2025 · Feb 11, 2025 · Feb 11, 2025 · Feb 12, 2025
diff --git a/Makefile b/Makefile
@@ -809,7 +809,7 @@ provisioner/terraform/testdata/version:
 .PHONY: provisioner/terraform/testdata/version
 
 test:
-	$(GIT_FLAGS) gotestsum --format standard-quiet -- -v -short -count=1 ./...
+	$(GIT_FLAGS) gotestsum --format standard-quiet -- -v -short -count=1 ./... $(if $(RUN),-run $(RUN))
 .PHONY: test
 
 test-cli:

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/coderd.go b/coderd/coderd.go
@@ -1057,6 +1057,9 @@ func New(options *Options) *API {
 			r.Get("/rich-parameters", api.templateVersionRichParameters)
 			r.Get("/external-auth", api.templateVersionExternalAuth)
 			r.Get("/variables", api.templateVersionVariables)
+			r.Route("/presets", func(r chi.Router) {
+				r.Get("/", api.templateVersionPresets)
+			})
 			r.Get("/resources", api.templateVersionResources)
 			r.Get("/logs", api.templateVersionLogs)
 			r.Route("/dry-run", func(r chi.Router) {

diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -3823,7 +3823,6 @@ func (s *MethodTestSuite) TestSystemFunctions() {
 		})
 		require.NoError(s.T(), err)
 		_, err = db.InsertPresetParameters(ctx, database.InsertPresetParametersParams{
-			ID:                      uuid.New(),
 			TemplateVersionPresetID: preset.ID,
 			Names:                   []string{"test"},
 			Values:                  []string{"test"},

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000292_generate_default_preset_parameter_ids.down.sql b/coderd/database/migrations/000292_generate_default_preset_parameter_ids.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE template_version_preset_parameters
+ALTER COLUMN id DROP DEFAULT;
diff --git a/coderd/database/migrations/000292_generate_default_preset_parameter_ids.up.sql b/coderd/database/migrations/000292_generate_default_preset_parameter_ids.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE template_version_preset_parameters
+ALTER COLUMN id SET DEFAULT gen_random_uuid();
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/presets.sql b/coderd/database/queries/presets.sql
@@ -6,9 +6,8 @@ VALUES
 
 -- name: InsertPresetParameters :many
 INSERT INTO
-	template_version_preset_parameters (id, template_version_preset_id, name, value)
+	template_version_preset_parameters (template_version_preset_id, name, value)
 SELECT
-	@id,
 	@template_version_preset_id,
 	unnest(@names :: TEXT[]),
 	unnest(@values :: TEXT[])

diff --git a/coderd/presets.go b/coderd/presets.go
@@ -0,0 +1,62 @@
+package coderd
+
+import (
+	"net/http"
+
+	"github.com/coder/coder/v2/coderd/httpapi"
+	"github.com/coder/coder/v2/coderd/httpmw"
+	"github.com/coder/coder/v2/codersdk"
+)
+
+// @Summary Get template version presets
+// @ID get-template-version-presets
+// @Security CoderSessionToken
+// @Produce json
+// @Tags Templates
+// @Param templateversion path string true "Template version ID" format(uuid)
+// @Success 200 {array} codersdk.Preset
+// @Router /templateversions/{templateversion}/presets [get]
+func (api *API) templateVersionPresets(rw http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	templateVersion := httpmw.TemplateVersionParam(r)
+
+	presets, err := api.Database.GetPresetsByTemplateVersionID(ctx, templateVersion.ID)
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Internal error fetching template version presets.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
+	// TODO (sasswart): Test case: what if a user tries to read presets or preset parameters from a different org?
+	// TODO (sasswart): Do a prelim auth check here.
+
+	presetParams, err := api.Database.GetPresetParametersByTemplateVersionID(ctx, templateVersion.ID)
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Internal error fetching template version presets.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
+	var res []codersdk.Preset
+	for _, preset := range presets {
+		sdkPreset := codersdk.Preset{
+			ID:   preset.ID,
+			Name: preset.Name,
+		}
+		for _, presetParam := range presetParams {
+			if presetParam.TemplateVersionPresetID == preset.ID {
+				sdkPreset.Parameters = append(sdkPreset.Parameters, codersdk.PresetParameter{
+					Name:  presetParam.Name,
+					Value: presetParam.Value,
+				})
+			}
+		}
+		res = append(res, sdkPreset)
+	}
+
+	httpapi.Write(ctx, rw, http.StatusOK, res)
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE template_version_preset_parameters
		ALTER COLUMN id DROP DEFAULT;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE template_version_preset_parameters
		ALTER COLUMN id SET DEFAULT gen_random_uuid();
SasSwart marked this conversation as resolved. Show resolved Hide resolved