coder · mtojek · Jan 17, 2023 · Jan 13, 2023 · Jan 13, 2023 · Jan 13, 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/coderd.go b/coderd/coderd.go
@@ -435,6 +435,7 @@ func New(options *Options) *API {
 			r.Patch("/cancel", api.patchCancelTemplateVersion)
 			r.Get("/schema", api.templateVersionSchema)
 			r.Get("/parameters", api.templateVersionParameters)
+			r.Get("/rich-parameters", api.templateVersionRichParameters)
 			r.Get("/resources", api.templateVersionResources)
 			r.Get("/logs", api.templateVersionLogs)
 			r.Route("/dry-run", func(r chi.Router) {

diff --git a/coderd/coderdtest/authorize.go b/coderd/coderdtest/authorize.go
@@ -177,6 +177,10 @@ func AGPLRoutes(a *AuthTester) (map[string]string, map[string]RouteCheck) {
 			AssertAction: rbac.ActionRead,
 			AssertObject: rbac.ResourceTemplate.InOrg(a.Template.OrganizationID),
 		},
+		"GET:/api/v2/templateversions/{templateversion}/rich-parameters": {
+			AssertAction: rbac.ActionRead,
+			AssertObject: rbac.ResourceTemplate.InOrg(a.Template.OrganizationID),
+		},
 		"GET:/api/v2/templateversions/{templateversion}/resources": {
 			AssertAction: rbac.ActionRead,
 			AssertObject: rbac.ResourceTemplate.InOrg(a.Template.OrganizationID),

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -111,10 +111,12 @@ type data struct {
 	provisionerJobs           []database.ProvisionerJob
 	replicas                  []database.Replica
 	templateVersions          []database.TemplateVersion
+	templateVersionParameters []database.TemplateVersionParameter
 	templates                 []database.Template
 	workspaceAgents           []database.WorkspaceAgent
 	workspaceApps             []database.WorkspaceApp
 	workspaceBuilds           []database.WorkspaceBuild
+	workspaceBuildParameters  []database.WorkspaceBuildParameter
 	workspaceResourceMetadata []database.WorkspaceResourceMetadatum
 	workspaceResources        []database.WorkspaceResource
 	workspaces                []database.Workspace
@@ -1365,6 +1367,20 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndBuildNumber(_ context.Con
 	return database.WorkspaceBuild{}, sql.ErrNoRows
 }
 
+func (q *fakeQuerier) GetWorkspaceBuildParameters(_ context.Context, workspaceBuildID uuid.UUID) ([]database.WorkspaceBuildParameter, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	params := make([]database.WorkspaceBuildParameter, 0)
+	for _, param := range params {
+		if param.WorkspaceBuildID != workspaceBuildID {
+			continue
+		}
+		params = append(params, param)
+	}
+	return params, nil
+}
+
 func (q *fakeQuerier) GetWorkspaceBuildsCreatedAfter(_ context.Context, after time.Time) ([]database.WorkspaceBuild, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
@@ -1656,6 +1672,20 @@ func (q *fakeQuerier) GetTemplateVersionByTemplateIDAndName(_ context.Context, a
 	return database.TemplateVersion{}, sql.ErrNoRows
 }
 
+func (q *fakeQuerier) GetTemplateVersionParameters(_ context.Context, templateVersionID uuid.UUID) ([]database.TemplateVersionParameter, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	parameters := make([]database.TemplateVersionParameter, 0)
+	for _, param := range q.templateVersionParameters {
+		if param.TemplateVersionID != templateVersionID {
+			continue
+		}
+		parameters = append(parameters, param)
+	}
+	return parameters, nil
+}
+
 func (q *fakeQuerier) GetTemplateVersionByOrganizationAndName(_ context.Context, arg database.GetTemplateVersionByOrganizationAndNameParams) (database.TemplateVersion, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
@@ -2398,6 +2428,28 @@ func (q *fakeQuerier) InsertTemplateVersion(_ context.Context, arg database.Inse
 	return version, nil
 }
 
+func (q *fakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg database.InsertTemplateVersionParameterParams) (database.TemplateVersionParameter, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	//nolint:gosimple
+	param := database.TemplateVersionParameter{
+		TemplateVersionID: arg.TemplateVersionID,
+		Name:              arg.Name,
+		Description:       arg.Description,
+		Type:              arg.Type,
+		Mutable:           arg.Mutable,
+		DefaultValue:      arg.DefaultValue,
+		Icon:              arg.Icon,
+		Options:           arg.Options,
+		ValidationRegex:   arg.ValidationRegex,
+		ValidationMin:     arg.ValidationMin,
+		ValidationMax:     arg.ValidationMax,
+	}
+	q.templateVersionParameters = append(q.templateVersionParameters, param)
+	return param, nil
+}
+
 func (q *fakeQuerier) InsertProvisionerJobLogs(_ context.Context, arg database.InsertProvisionerJobLogsParams) ([]database.ProvisionerJobLog, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
@@ -2723,6 +2775,20 @@ func (q *fakeQuerier) InsertWorkspaceBuild(_ context.Context, arg database.Inser
 	return workspaceBuild, nil
 }
 
+func (q *fakeQuerier) InsertWorkspaceBuildParameters(_ context.Context, arg database.InsertWorkspaceBuildParametersParams) error {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for index, name := range arg.Name {
+		q.workspaceBuildParameters = append(q.workspaceBuildParameters, database.WorkspaceBuildParameter{
+			WorkspaceBuildID: arg.WorkspaceBuildID,
+			Name:             name,
+			Value:            arg.Value[index],
+		})
+	}
+	return nil
+}
+
 func (q *fakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertWorkspaceAppParams) (database.WorkspaceApp, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000089_rich_parameters.down.sql b/coderd/database/migrations/000089_rich_parameters.down.sql
@@ -0,0 +1,3 @@
+DROP TABLE template_version_parameters;
+
+DROP TABLE workspace_build_parameters;
diff --git a/coderd/database/migrations/000089_rich_parameters.up.sql b/coderd/database/migrations/000089_rich_parameters.up.sql
@@ -0,0 +1,35 @@
+CREATE TABLE IF NOT EXISTS template_version_parameters (
+    template_version_id uuid not null references template_versions (id) on delete cascade,
+    name text not null,
+    description text not null,
+    type text not null,
+    mutable boolean not null,
+    default_value text not null,
+    icon text not null,
+    options jsonb not null default '[]'::jsonb,
+    validation_regex text not null,
+    validation_min integer not null,
+    validation_max integer not null,
+    unique (template_version_id, name)
+);
+
+COMMENT ON COLUMN template_version_parameters.name IS 'Parameter name';
+COMMENT ON COLUMN template_version_parameters.description IS 'Parameter description';
+COMMENT ON COLUMN template_version_parameters.type IS 'Parameter type';
+COMMENT ON COLUMN template_version_parameters.mutable IS 'Is parameter mutable?';
+COMMENT ON COLUMN template_version_parameters.default_value IS 'Default value';
+COMMENT ON COLUMN template_version_parameters.icon IS 'Icon';
+COMMENT ON COLUMN template_version_parameters.options IS 'Additional options';
+COMMENT ON COLUMN template_version_parameters.validation_regex IS 'Validation: regex pattern';
+COMMENT ON COLUMN template_version_parameters.validation_min IS 'Validation: minimum length of value';
+COMMENT ON COLUMN template_version_parameters.validation_max IS 'Validation: maximum length of value';
+
+CREATE TABLE IF NOT EXISTS workspace_build_parameters (
+    workspace_build_id uuid not null references workspace_builds (id) on delete cascade,
+    name text not null,
+    value text not null,
+    unique (workspace_build_id, name)
+);
+
+COMMENT ON COLUMN workspace_build_parameters.name IS 'Parameter name';
+COMMENT ON COLUMN workspace_build_parameters.value IS 'Parameter value';
diff --git a/coderd/database/migrations/migrate_test.go b/coderd/database/migrations/migrate_test.go
@@ -239,6 +239,8 @@ func TestMigrateUpWithFixtures(t *testing.T) {
 		"group_members",
 		"licenses",
 		"replicas",
+		"template_version_parameters",
+		"workspace_build_parameters",
 	}
 	s := &tableStats{s: make(map[string]int)}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		DROP TABLE template_version_parameters;

		DROP TABLE workspace_build_parameters;