Skip to content

feat: add template version creator #3001

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 8 commits into from
Jul 15, 2022
Merged

feat: add template version creator #3001

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
73932da
feat: add template version creator
AbhineetJain Jul 14, 2022
e032275
rename method
AbhineetJain Jul 14, 2022
4dcde2f
use the right database
AbhineetJain Jul 14, 2022
c98f87b
wrap migration for a single txn
AbhineetJain Jul 15, 2022
08b6b5d
remove scoping from migration
AbhineetJain Jul 15, 2022
202421e
make template version created_by nullable
AbhineetJain Jul 15, 2022
c8d0d45
use nullable created_by
AbhineetJain Jul 15, 2022
c017a30
fix unit tests
AbhineetJain Jul 15, 2022
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
Prev Previous commit
Next Next commit
rename method
  • Loading branch information
@AbhineetJain
AbhineetJain committed Jul 15, 2022
commit e032275a8f339572f112077446f95bceea9f521b
17 changes: 9 additions & 8 deletions coderd/templateversions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (api *API) templateVersion(rw http.ResponseWriter, r *http.Request) {
return
}

createdByName, err := getCreatedByNameByTemplateVersionID(r.Context(), api.Database, templateVersion)
createdByName, err := getUsernameByUserID(r.Context(), api.Database, templateVersion.CreatedBy)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error fetching creator name.",
Expand Down Expand Up @@ -486,10 +486,11 @@ func (api *API) templateVersionsByTemplate(rw http.ResponseWriter, r *http.Reque
})
return err
}
createdByName, err := getCreatedByNameByTemplateVersionID(r.Context(), api.Database, version)
createdByName, err := getUsernameByUserID(r.Context(), api.Database, version.CreatedBy)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
Message: fmt.Sprintf("Internal error fetching creator name (user %q) for version %q.", version.CreatedBy, version.ID),
Message: "Internal error fetching creator name.",
Detail: err.Error(),
})
return err
}
Expand Down Expand Up @@ -542,7 +543,7 @@ func (api *API) templateVersionByName(rw http.ResponseWriter, r *http.Request) {
return
}

createdByName, err := getCreatedByNameByTemplateVersionID(r.Context(), api.Database, templateVersion)
createdByName, err := getUsernameByUserID(r.Context(), api.Database, templateVersion.CreatedBy)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error fetching creator name.",
Expand Down Expand Up @@ -775,7 +776,7 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
return
}

createdByName, err := getCreatedByNameByTemplateVersionID(r.Context(), api.Database, templateVersion)
createdByName, err := getUsernameByUserID(r.Context(), api.Database, templateVersion.CreatedBy)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error fetching creator name.",
Expand Down Expand Up @@ -832,12 +833,12 @@ func (api *API) templateVersionLogs(rw http.ResponseWriter, r *http.Request) {
api.provisionerJobLogs(rw, r, job)
}

func getCreatedByNameByTemplateVersionID(ctx context.Context, db database.Store, templateVersion database.TemplateVersion) (string, error) {
creator, err := db.GetUserByID(ctx, templateVersion.CreatedBy)
func getUsernameByUserID(ctx context.Context, db database.Store, userID uuid.UUID) (string, error) {
user, err := db.GetUserByID(ctx, userID)
if err != nil {
return "", err
}
return creator.Username, nil
return user.Username, nil
}

func convertTemplateVersion(version database.TemplateVersion, job codersdk.ProvisionerJob, createdByName string) codersdk.TemplateVersion {
Expand Down