fmt

johnstcn · johnstcn · commit 11c3db77829b · 2025-01-13T17:35:21.000Z
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -1597,10 +1597,8 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 	}
 
 	// Ensure the "owner" tag is properly applied in addition to request tags and coder_workspace_tags.
-	// Tag order precedence:
-	// 1) Tags parsed from coder_workspace_tags data source in template file
-	// 2) User-specified tags in the request
-	// 2 may clobber 1.
+	// User-specified tags in the request will take precedence over tags parsed from `coder_workspace_tags`
+	// data sources defined in the template file.
 	tags := provisionersdk.MutateTags(apiKey.UserID, parsedTags, req.ProvisionerTags)
 
 	var templateVersion database.TemplateVersion
diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
@@ -430,7 +430,7 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
 						}`,
 				},
 				reqTags: map[string]string{"a": "b"},
-				//wantTags: map[string]string{"owner": "", "scope": "organization", "a": "b"},
+				// wantTags: map[string]string{"owner": "", "scope": "organization", "a": "b"},
 				expectError: `provisioner tag "a" evaluated to an empty value`,
 			},
 			{

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {`
`430`	`430`	}`,
`431`	`431`	`},`
`432`	`432`	`reqTags: map[string]string{"a": "b"},`
`433`		`- //wantTags: map[string]string{"owner": "", "scope": "organization", "a": "b"},`
	`433`	`+ // wantTags: map[string]string{"owner": "", "scope": "organization", "a": "b"},`
`434`	`434`	expectError: `provisioner tag "a" evaluated to an empty value`,
`435`	`435`	`},`
`436`	`436`	`{`