Skip to content

Commit 680e24a

Browse files
coadlercoadler
authored
Revert "feat: add template version creator (coder#2991)" (coder#2999)
This reverts commit aea3b3b.
1 parent 1033e02 commit 680e24a

14 files changed

+16
-106
lines changed

‎coderd/audit/diff_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,12 @@ func TestDiff(t *testing.T) {
114114
UpdatedAt: time.Now(),
115115
OrganizationID: uuid.UUID{3},
116116
Name: "rust",
117-
CreatedBy: uuid.UUID{4},
118117
},
119118
exp: audit.Map{
120119
"id": uuid.UUID{1}.String(),
121120
"template_id": uuid.UUID{2}.String(),
122121
"organization_id": uuid.UUID{3}.String(),
123122
"name": "rust",
124-
"created_by": uuid.UUID{4}.String(),
125123
},
126124
},
127125
{
@@ -134,13 +132,11 @@ func TestDiff(t *testing.T) {
134132
UpdatedAt: time.Now(),
135133
OrganizationID: uuid.UUID{3},
136134
Name: "rust",
137-
CreatedBy: uuid.UUID{4},
138135
},
139136
exp: audit.Map{
140137
"id": uuid.UUID{1}.String(),
141138
"organization_id": uuid.UUID{3}.String(),
142139
"name": "rust",
143-
"created_by": uuid.UUID{4}.String(),
144140
},
145141
},
146142
})

‎coderd/audit/table.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ var AuditableResources = auditMap(map[any]map[string]Action{
8383
"name": ActionTrack,
8484
"readme": ActionTrack,
8585
"job_id": ActionIgnore, // Not helpful in a diff because jobs aren't tracked in audit logs.
86-
"created_by": ActionTrack,
8786
},
8887
&database.User{}: {
8988
"id": ActionTrack,

‎coderd/database/databasefake/databasefake.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,6 @@ func (q *fakeQuerier) InsertTemplateVersion(_ context.Context, arg database.Inse
15111511
Name: arg.Name,
15121512
Readme: arg.Readme,
15131513
JobID: arg.JobID,
1514-
CreatedBy: arg.CreatedBy,
15151514
}
15161515
q.templateVersions = append(q.templateVersions, version)
15171516
return version, nil

‎coderd/database/dump.sql

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000030_template_version_created_by.down.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎coderd/database/migrations/000030_template_version_created_by.up.sql

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎coderd/database/models.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 7 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/templateversions.sql

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ INSERT INTO
7070
updated_at,
7171
"name",
7272
readme,
73-
job_id,
74-
created_by
73+
job_id
7574
)
7675
VALUES
77-
($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING *;
76+
($1, $2, $3, $4, $5, $6, $7, $8) RETURNING *;
7877

7978
-- name: UpdateTemplateVersionByID :exec
8079
UPDATE

‎coderd/templates.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
209209
UUID: dbTemplate.ID,
210210
Valid: true,
211211
},
212-
UpdatedAt: database.Now(),
213212
})
214213
if err != nil {
215214
return xerrors.Errorf("insert template version: %s", err)

‎coderd/templateversions.go

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package coderd
22

33
import (
4-
"context"
54
"database/sql"
65
"encoding/json"
76
"errors"
@@ -37,16 +36,7 @@ func (api *API) templateVersion(rw http.ResponseWriter, r *http.Request) {
3736
return
3837
}
3938

40-
createdByName, err := getUsernameByUserID(r.Context(), api.Database, templateVersion.CreatedBy)
41-
if err != nil {
42-
httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
43-
Message: "Internal error fetching creator name.",
44-
Detail: err.Error(),
45-
})
46-
return
47-
}
48-
49-
httpapi.Write(rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job), createdByName))
39+
httpapi.Write(rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job)))
5040
}
5141

5242
func (api *API) patchCancelTemplateVersion(rw http.ResponseWriter, r *http.Request) {
@@ -486,15 +476,7 @@ func (api *API) templateVersionsByTemplate(rw http.ResponseWriter, r *http.Reque
486476
})
487477
return err
488478
}
489-
createdByName, err := getUsernameByUserID(r.Context(), store, version.CreatedBy)
490-
if err != nil {
491-
httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
492-
Message: "Internal error fetching creator name.",
493-
Detail: err.Error(),
494-
})
495-
return err
496-
}
497-
apiVersions = append(apiVersions, convertTemplateVersion(version, convertProvisionerJob(job), createdByName))
479+
apiVersions = append(apiVersions, convertTemplateVersion(version, convertProvisionerJob(job)))
498480
}
499481

500482
return nil
@@ -543,16 +525,7 @@ func (api *API) templateVersionByName(rw http.ResponseWriter, r *http.Request) {
543525
return
544526
}
545527

546-
createdByName, err := getUsernameByUserID(r.Context(), api.Database, templateVersion.CreatedBy)
547-
if err != nil {
548-
httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
549-
Message: "Internal error fetching creator name.",
550-
Detail: err.Error(),
551-
})
552-
return
553-
}
554-
555-
httpapi.Write(rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job), createdByName))
528+
httpapi.Write(rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job)))
556529
}
557530

558531
func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Request) {
@@ -762,7 +735,6 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
762735
Name: namesgenerator.GetRandomName(1),
763736
Readme: "",
764737
JobID: provisionerJob.ID,
765-
CreatedBy: apiKey.UserID,
766738
})
767739
if err != nil {
768740
return xerrors.Errorf("insert template version: %w", err)
@@ -776,16 +748,7 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
776748
return
777749
}
778750

779-
createdByName, err := getUsernameByUserID(r.Context(), api.Database, templateVersion.CreatedBy)
780-
if err != nil {
781-
httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
782-
Message: "Internal error fetching creator name.",
783-
Detail: err.Error(),
784-
})
785-
return
786-
}
787-
788-
httpapi.Write(rw, http.StatusCreated, convertTemplateVersion(templateVersion, convertProvisionerJob(provisionerJob), createdByName))
751+
httpapi.Write(rw, http.StatusCreated, convertTemplateVersion(templateVersion, convertProvisionerJob(provisionerJob)))
789752
}
790753

791754
// templateVersionResources returns the workspace agent resources associated
@@ -833,15 +796,7 @@ func (api *API) templateVersionLogs(rw http.ResponseWriter, r *http.Request) {
833796
api.provisionerJobLogs(rw, r, job)
834797
}
835798

836-
func getUsernameByUserID(ctx context.Context, db database.Store, userID uuid.UUID) (string, error) {
837-
user, err := db.GetUserByID(ctx, userID)
838-
if err != nil {
839-
return "", err
840-
}
841-
return user.Username, nil
842-
}
843-
844-
func convertTemplateVersion(version database.TemplateVersion, job codersdk.ProvisionerJob, createdByName string) codersdk.TemplateVersion {
799+
func convertTemplateVersion(version database.TemplateVersion, job codersdk.ProvisionerJob) codersdk.TemplateVersion {
845800
return codersdk.TemplateVersion{
846801
ID: version.ID,
847802
TemplateID: &version.TemplateID.UUID,
@@ -851,7 +806,5 @@ func convertTemplateVersion(version database.TemplateVersion, job codersdk.Provi
851806
Name: version.Name,
852807
Job: job,
853808
Readme: version.Readme,
854-
CreatedByID: version.CreatedBy,
855-
CreatedByName: createdByName,
856809
}
857810
}

‎codersdk/templateversions.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ type TemplateVersion struct {
2020
Name string `json:"name"`
2121
Job ProvisionerJob `json:"job"`
2222
Readme string `json:"readme"`
23-
CreatedByID uuid.UUID `json:"created_by_id"`
24-
CreatedByName string `json:"created_by_name"`
2523
}
2624

2725
// TemplateVersion returns a template version by ID.

‎site/src/api/typesGenerated.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export interface CreateTemplateRequest {
8787
readonly min_autostart_interval_ms?: number
8888
}
8989

90-
// From codersdk/templateversions.go:108:6
90+
// From codersdk/templateversions.go:106:6
9191
export interface CreateTemplateVersionDryRunRequest {
9292
readonly WorkspaceName: string
9393
readonly ParameterValues: CreateParameterRequest[]
@@ -290,8 +290,6 @@ export interface TemplateVersion {
290290
readonly name: string
291291
readonly job: ProvisionerJob
292292
readonly readme: string
293-
readonly created_by_id: string
294-
readonly created_by_name: string
295293
}
296294

297295
// From codersdk/templates.go:100:6

‎site/src/testHelpers/entities.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ name:Template test
112112
You can add instructions here
113113
114114
[Some link info](https://coder.com)`,
115-
created_by_id: "test-creator-id",
116-
created_by_name: "test_creator",
117115
}
118116

119117
export const MockTemplate: TypesGen.Template = {

0 commit comments

Comments
 (0)