Merge remote-tracking branch 'origin/main' into stevenmasley/soft_del…

…ete_versions
coder · Emyrk · Oct 5, 2023 · Oct 5, 2023 · Oct 5, 2023 · Oct 5, 2023
commit 92007799c28dad3d4a25cc7798d0d67a1deb0cef
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -1040,6 +1040,21 @@ func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Reque
 		})
 		return
 	}
+	job, err := api.Database.GetProvisionerJobByID(ctx, version.JobID)
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Internal error fetching template version job status.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+	if job.JobStatus != database.ProvisionerJobStatusSucceeded {
+		httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{
+			Message: "Only versions that have been built successfully can be promoted.",
+			Detail:  fmt.Sprintf("Attempted to promote a version with a %s build", job.JobStatus),
+		})
+		return
+	}
 	if version.Deleted {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 			Message: "The provided template version is deleted.",
@@ -1390,7 +1405,6 @@ func convertTemplateVersion(version database.TemplateVersion, job codersdk.Provi
 		Message:        version.Message,
 		Job:            job,
 		Readme:         version.Readme,
-		Deleted:        version.Deleted,
 		CreatedBy: codersdk.MinimalUser{
 			ID:        version.CreatedBy,
 			Username:  version.CreatedByUsername,