avoid passing in non-nil codersdk.MatchedProvisioners where not necessary

johnstcn · johnstcn · commit 575e772806a0 · 2024-11-29T17:22:14.000Z
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -77,7 +77,7 @@ func (api *API) templateVersion(rw http.ResponseWriter, r *http.Request) {
 		warnings = append(warnings, codersdk.TemplateVersionWarningUnsupportedWorkspaces)
 	}
 
-	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), codersdk.MatchedProvisioners{}, warnings))
+	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), nil, warnings))
 }
 
 // @Summary Patch template version by ID
@@ -173,7 +173,7 @@ func (api *API) patchTemplateVersion(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(updatedTemplateVersion, convertProvisionerJob(jobs[0]), codersdk.MatchedProvisioners{}, nil))
+	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(updatedTemplateVersion, convertProvisionerJob(jobs[0]), nil, nil))
 }
 
 // @Summary Cancel template version by ID
@@ -814,7 +814,7 @@ func (api *API) templateVersionsByTemplate(rw http.ResponseWriter, r *http.Reque
 				return err
 			}
 
-			apiVersions = append(apiVersions, convertTemplateVersion(version, convertProvisionerJob(job), codersdk.MatchedProvisioners{}, nil))
+			apiVersions = append(apiVersions, convertTemplateVersion(version, convertProvisionerJob(job), nil, nil))
 		}
 
 		return nil
@@ -869,7 +869,7 @@ func (api *API) templateVersionByName(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), codersdk.MatchedProvisioners{}, nil))
+	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), nil, nil))
 }
 
 // @Summary Get template version by organization, template, and name
@@ -934,7 +934,7 @@ func (api *API) templateVersionByOrganizationTemplateAndName(rw http.ResponseWri
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), codersdk.MatchedProvisioners{}, nil))
+	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), nil, nil))
 }
 
 // @Summary Get previous template version by organization, template, and name
@@ -1020,7 +1020,7 @@ func (api *API) previousTemplateVersionByOrganizationTemplateAndName(rw http.Res
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(previousTemplateVersion, convertProvisionerJob(jobs[0]), codersdk.MatchedProvisioners{}, nil))
+	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(previousTemplateVersion, convertProvisionerJob(jobs[0]), nil, nil))
 }
 
 // @Summary Archive template unused versions by template id
@@ -1633,7 +1633,7 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 			ProvisionerJob: provisionerJob,
 			QueuePosition:  0,
 		}),
-		matchedProvisioners,
+		&matchedProvisioners,
 		warnings))
 }
 
@@ -1701,7 +1701,7 @@ func (api *API) templateVersionLogs(rw http.ResponseWriter, r *http.Request) {
 	api.provisionerJobLogs(rw, r, job)
 }
 
-func convertTemplateVersion(version database.TemplateVersion, job codersdk.ProvisionerJob, matchedProvisioners codersdk.MatchedProvisioners, warnings []codersdk.TemplateVersionWarning) codersdk.TemplateVersion {
+func convertTemplateVersion(version database.TemplateVersion, job codersdk.ProvisionerJob, matchedProvisioners *codersdk.MatchedProvisioners, warnings []codersdk.TemplateVersionWarning) codersdk.TemplateVersion {
 	return codersdk.TemplateVersion{
 		ID:             version.ID,
 		TemplateID:     &version.TemplateID.UUID,
@@ -1719,7 +1719,7 @@ func convertTemplateVersion(version database.TemplateVersion, job codersdk.Provi
 		},
 		Archived:            version.Archived,
 		Warnings:            warnings,
-		MatchedProvisioners: &matchedProvisioners,
+		MatchedProvisioners: matchedProvisioners,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func (api API) templateVersion(rw http.ResponseWriter, r http.Request) {`
`77`	`77`	`warnings = append(warnings, codersdk.TemplateVersionWarningUnsupportedWorkspaces)`
`78`	`78`	`}`
`79`	`79`
`80`		`- httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), codersdk.MatchedProvisioners{}, warnings))`
	`80`	`+ httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), nil, warnings))`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// @Summary Patch template version by ID`
`@@ -173,7 +173,7 @@ func (api API) patchTemplateVersion(rw http.ResponseWriter, r http.Request) {`
`173`	`173`	`return`
`174`	`174`	`}`
`175`	`175`
`176`		`- httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(updatedTemplateVersion, convertProvisionerJob(jobs[0]), codersdk.MatchedProvisioners{}, nil))`
	`176`	`+ httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(updatedTemplateVersion, convertProvisionerJob(jobs[0]), nil, nil))`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`// @Summary Cancel template version by ID`
`@@ -814,7 +814,7 @@ func (api API) templateVersionsByTemplate(rw http.ResponseWriter, r http.Reque`
`814`	`814`	`return err`
`815`	`815`	`}`
`816`	`816`
`817`		`- apiVersions = append(apiVersions, convertTemplateVersion(version, convertProvisionerJob(job), codersdk.MatchedProvisioners{}, nil))`
	`817`	`+ apiVersions = append(apiVersions, convertTemplateVersion(version, convertProvisionerJob(job), nil, nil))`
`818`	`818`	`}`
`819`	`819`
`820`	`820`	`return nil`
`@@ -869,7 +869,7 @@ func (api API) templateVersionByName(rw http.ResponseWriter, r http.Request) {`
`869`	`869`	`return`
`870`	`870`	`}`
`871`	`871`
`872`		`- httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), codersdk.MatchedProvisioners{}, nil))`
	`872`	`+ httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), nil, nil))`
`873`	`873`	`}`
`874`	`874`
`875`	`875`	`// @Summary Get template version by organization, template, and name`
`@@ -934,7 +934,7 @@ func (api *API) templateVersionByOrganizationTemplateAndName(rw http.ResponseWri`
`934`	`934`	`return`
`935`	`935`	`}`
`936`	`936`
`937`		`- httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), codersdk.MatchedProvisioners{}, nil))`
	`937`	`+ httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(jobs[0]), nil, nil))`
`938`	`938`	`}`
`939`	`939`
`940`	`940`	`// @Summary Get previous template version by organization, template, and name`
`@@ -1020,7 +1020,7 @@ func (api *API) previousTemplateVersionByOrganizationTemplateAndName(rw http.Res`
`1020`	`1020`	`return`
`1021`	`1021`	`}`
`1022`	`1022`
`1023`		`- httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(previousTemplateVersion, convertProvisionerJob(jobs[0]), codersdk.MatchedProvisioners{}, nil))`
	`1023`	`+ httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(previousTemplateVersion, convertProvisionerJob(jobs[0]), nil, nil))`
`1024`	`1024`	`}`
`1025`	`1025`
`1026`	`1026`	`// @Summary Archive template unused versions by template id`
`@@ -1633,7 +1633,7 @@ func (api API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r ht`
`1633`	`1633`	`ProvisionerJob: provisionerJob,`
`1634`	`1634`	`QueuePosition: 0,`
`1635`	`1635`	`}),`
`1636`		`- matchedProvisioners,`
	`1636`	`+ &matchedProvisioners,`
`1637`	`1637`	`warnings))`
`1638`	`1638`	`}`
`1639`	`1639`
`@@ -1701,7 +1701,7 @@ func (api API) templateVersionLogs(rw http.ResponseWriter, r http.Request) {`
`1701`	`1701`	`api.provisionerJobLogs(rw, r, job)`
`1702`	`1702`	`}`
`1703`	`1703`
`1704`		`-func convertTemplateVersion(version database.TemplateVersion, job codersdk.ProvisionerJob, matchedProvisioners codersdk.MatchedProvisioners, warnings []codersdk.TemplateVersionWarning) codersdk.TemplateVersion {`
	`1704`	`+func convertTemplateVersion(version database.TemplateVersion, job codersdk.ProvisionerJob, matchedProvisioners *codersdk.MatchedProvisioners, warnings []codersdk.TemplateVersionWarning) codersdk.TemplateVersion {`
`1705`	`1705`	`return codersdk.TemplateVersion{`
`1706`	`1706`	`ID: version.ID,`
`1707`	`1707`	`TemplateID: &version.TemplateID.UUID,`
`@@ -1719,7 +1719,7 @@ func convertTemplateVersion(version database.TemplateVersion, job codersdk.Provi`
`1719`	`1719`	`},`
`1720`	`1720`	`Archived: version.Archived,`
`1721`	`1721`	`Warnings: warnings,`
`1722`		`- MatchedProvisioners: &matchedProvisioners,`
	`1722`	`+ MatchedProvisioners: matchedProvisioners,`
`1723`	`1723`	`}`
`1724`	`1724`	`}`
`1725`	`1725`