Skip to content

fix: improve duplicate template version name error #14572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2024
Merged

fix: improve duplicate template version name error #14572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: improve duplicate template version name error
  • Loading branch information
@ethanndickson
ethanndickson committed Sep 6, 2024
commit 5fd8943af5b82cf53b7a9731092fcb9e2d890d04
44 changes: 36 additions & 8 deletions coderd/templateversions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,11 +1448,19 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
UserVariableValues: req.UserVariableValues,
})
if err != nil {
return xerrors.Errorf("marshal job input: %w", err)
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error creating template version.",
Detail: xerrors.Errorf("marshal job input: %w", err).Error(),
})
return err
}
traceMetadataRaw, err := json.Marshal(tracing.MetadataFromContext(ctx))
if err != nil {
return xerrors.Errorf("marshal job metadata: %w", err)
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error creating template version.",
Detail: xerrors.Errorf("marshal job metadata: %w", err).Error(),
})
return err
}

provisionerJob, err = tx.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
Expand All @@ -1473,7 +1481,11 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
},
})
if err != nil {
return xerrors.Errorf("insert provisioner job: %w", err)
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error creating template version.",
Detail: xerrors.Errorf("insert provisioner job: %w", err).Error(),
})
return err
}

var templateID uuid.NullUUID
Expand Down Expand Up @@ -1501,20 +1513,36 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
CreatedBy: apiKey.UserID,
})
if err != nil {
return xerrors.Errorf("insert template version: %w", err)
if database.IsUniqueViolation(err, database.UniqueTemplateVersionsTemplateIDNameKey) {
httpapi.Write(ctx, rw, http.StatusConflict, codersdk.Response{
Message: fmt.Sprintf("A template version with name %q already exists for this template.", req.Name),
Validations: []codersdk.ValidationError{{
Field: "name",
Detail: "This value is already in use and should be unique.",
}},
})
return err
}
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error creating template version.",
Detail: xerrors.Errorf("insert template version: %w", err).Error(),
})
return err
}

templateVersion, err = tx.GetTemplateVersionByID(ctx, templateVersionID)
if err != nil {
return xerrors.Errorf("fetched inserted template version: %w", err)
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error creating template version.",
Detail: xerrors.Errorf("fetched inserted template version: %w", err).Error(),
})
return err
}

return nil
}, nil)
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: err.Error(),
})
// Each failure case in the tx should have already written a response.
return
}
aReq.New = templateVersion
Expand Down
2 changes: 1 addition & 1 deletion provisionerd/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ func (r *Runner) Run() {
err := r.sender.CompleteJob(ctx, r.completedJob)
if err != nil {
r.logger.Error(ctx, "sending CompletedJob failed", slog.Error(err))
err = r.sender.FailJob(ctx, r.failedJobf("internal provisionerserver error"))
err = r.sender.FailJob(ctx, r.failedJobf("internal provisionerserver error: %s", err))
if err != nil {
r.logger.Error(ctx, "sending FailJob failed (while CompletedJob)", slog.Error(err))
}
Expand Down
Loading