rearrange

mtojek · mtojek · commit ac1040eb3eb6 · 2024-05-23T09:43:48.000+02:00
diff --git a/coderd/wsbuilder/wsbuilder.go b/coderd/wsbuilder/wsbuilder.go
@@ -652,27 +652,28 @@ func (b *Builder) getLastBuildJob() (*database.ProvisionerJob, error) {
 }
 
 func (b *Builder) getProvisionerTags() (map[string]string, error) {
-	// Step 1: Fetch required data
-	workspaceTags, err := b.getTemplateVersionWorkspaceTags()
-	if err != nil {
-		return nil, BuildError{http.StatusInternalServerError, "failed to fetch template version workspace tags", err}
-	}
-	parameterNames, parameterValues, err := b.getParameters()
-	if err != nil {
-		return nil, err // already wrapped BuildError
-	}
+	// Step 1: Mutate template version tags
 	templateVersionJob, err := b.getTemplateVersionJob()
 	if err != nil {
 		return nil, BuildError{http.StatusInternalServerError, "failed to fetch template version job", err}
 	}
 	annotationTags := provisionersdk.MutateTags(b.workspace.OwnerID, templateVersionJob.Tags)
 
-	// Step 2: Evaluate provisioner tags
 	tags := map[string]string{}
 	for name, value := range annotationTags {
 		tags[name] = value
 	}
 
+	// Step 2: Mutate workspace tags
+	workspaceTags, err := b.getTemplateVersionWorkspaceTags()
+	if err != nil {
+		return nil, BuildError{http.StatusInternalServerError, "failed to fetch template version workspace tags", err}
+	}
+	parameterNames, parameterValues, err := b.getParameters()
+	if err != nil {
+		return nil, err // already wrapped BuildError
+	}
+
 	evalCtx := buildParametersEvalContext(parameterNames, parameterValues)
 	for _, workspaceTag := range workspaceTags {
 		expr, diags := hclsyntax.ParseExpression([]byte(workspaceTag.Value), "expression.hcl", hcl.InitialPos)
