feat: support dynamic parameters on create template request

Emyrk · Emyrk · commit 5002abf9e6d9 · 2025-06-27T10:04:51.000-05:00
diff --git a/coderd/coderdtest/dynamicparameters.go b/coderd/coderdtest/dynamicparameters.go
@@ -50,22 +50,25 @@ func DynamicParameterTemplate(t *testing.T, client *codersdk.Client, org uuid.UU
 	})
 	AwaitTemplateVersionJobCompleted(t, client, version.ID)
 
-	tplID := args.TemplateID
+	var tpl codersdk.Template
+	var err error
+
 	if args.TemplateID == uuid.Nil {
-		tpl := CreateTemplate(t, client, org, version.ID)
-		tplID = tpl.ID
+		tpl = CreateTemplate(t, client, org, version.ID, func(request *codersdk.CreateTemplateRequest) {
+			request.UseClassicParameterFlow = ptr.Ref(false)
+		})
+	} else {
+		tpl, err = client.UpdateTemplateMeta(t.Context(), args.TemplateID, codersdk.UpdateTemplateMeta{
+			UseClassicParameterFlow: ptr.Ref(false),
+		})
+		require.NoError(t, err)
 	}
 
-	var err error
-	tpl, err := client.UpdateTemplateMeta(t.Context(), tplID, codersdk.UpdateTemplateMeta{
-		UseClassicParameterFlow: ptr.Ref(false),
-	})
-	require.NoError(t, err)
-
 	err = client.UpdateActiveTemplateVersion(t.Context(), tpl.ID, codersdk.UpdateActiveTemplateVersion{
 		ID: version.ID,
 	})
 	require.NoError(t, err)
+	require.Equal(t, tpl.UseClassicParameterFlow, false, "template should use dynamic parameters")
 
 	return tpl, version
 }
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -100,6 +100,7 @@ func Template(t testing.TB, db database.Store, seed database.Template) database.
 		DisplayName:                  takeFirst(seed.DisplayName, testutil.GetRandomName(t)),
 		AllowUserCancelWorkspaceJobs: seed.AllowUserCancelWorkspaceJobs,
 		MaxPortSharingLevel:          takeFirst(seed.MaxPortSharingLevel, database.AppSharingLevelOwner),
+		UseClassicParameterFlow:      takeFirst(seed.UseClassicParameterFlow, true),
 	})
 	require.NoError(t, err, "insert template")
 
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templates.sql b/coderd/database/queries/templates.sql
@@ -98,10 +98,11 @@ INSERT INTO
 		group_acl,
 		display_name,
 		allow_user_cancel_workspace_jobs,
-		max_port_sharing_level
+		max_port_sharing_level,
+		use_classic_parameter_flow
 	)
 VALUES
-	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15);
+	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16);
 
 -- name: UpdateTemplateActiveVersionByID :exec
 UPDATE
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -197,16 +197,20 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
 		return
 	}
 
+	// Default is true until dynamic parameters are promoted to stable.
+	useClassicParameterFlow := ptr.NilToDefault(createTemplate.UseClassicParameterFlow, true)
+
 	// Make a temporary struct to represent the template. This is used for
 	// auditing if any of the following checks fail. It will be overwritten when
 	// the template is inserted into the db.
 	templateAudit.New = database.Template{
-		OrganizationID: organization.ID,
-		Name:           createTemplate.Name,
-		Description:    createTemplate.Description,
-		CreatedBy:      apiKey.UserID,
-		Icon:           createTemplate.Icon,
-		DisplayName:    createTemplate.DisplayName,
+		OrganizationID:          organization.ID,
+		Name:                    createTemplate.Name,
+		Description:             createTemplate.Description,
+		CreatedBy:               apiKey.UserID,
+		Icon:                    createTemplate.Icon,
+		DisplayName:             createTemplate.DisplayName,
+		UseClassicParameterFlow: useClassicParameterFlow,
 	}
 
 	_, err := api.Database.GetTemplateByOrganizationAndName(ctx, database.GetTemplateByOrganizationAndNameParams{
@@ -404,6 +408,7 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
 			Icon:                         createTemplate.Icon,
 			AllowUserCancelWorkspaceJobs: allowUserCancelWorkspaceJobs,
 			MaxPortSharingLevel:          maxPortShareLevel,
+			UseClassicParameterFlow:      useClassicParameterFlow,
 		})
 		if err != nil {
 			return xerrors.Errorf("insert template: %s", err)
diff --git a/coderd/templates_test.go b/coderd/templates_test.go
@@ -77,6 +77,7 @@ func TestPostTemplateByOrganization(t *testing.T) {
 		assert.Equal(t, expected.Name, got.Name)
 		assert.Equal(t, expected.Description, got.Description)
 		assert.Equal(t, expected.ActivityBumpMillis, got.ActivityBumpMillis)
+		assert.Equal(t, expected.UseClassicParameterFlow, true) // Current default is true
 
 		require.Len(t, auditor.AuditLogs(), 3)
 		assert.Equal(t, database.AuditActionCreate, auditor.AuditLogs()[0].Action)
diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -200,6 +200,12 @@ type CreateTemplateRequest struct {
 	// MaxPortShareLevel allows optionally specifying the maximum port share level
 	// for workspaces created from the template.
 	MaxPortShareLevel *WorkspaceAgentPortShareLevel `json:"max_port_share_level"`
+
+	// UseClassicParameterFlow allows optionally specifying whether
+	// the template should use the classic parameter flow. The default if unset is
+	// true, and is why `*bool` is used here. When dynamic parameters becomes
+	// the default, this will default to false.
+	UseClassicParameterFlow *bool `json:"template_use_classic_parameter_flow"`
 }
 
 // CreateWorkspaceRequest provides options for creating a new workspace.
