Skip to content

Commit 4b00f45

Browse files
ammarioammario
committed
Address marcin comments
1 parent e4ad149 commit 4b00f45

File tree

20 files changed

+245
-200
lines changed

20 files changed

+245
-200
lines changed

‎coderd/apidoc/docs.go

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

‎coderd/apidoc/swagger.json

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

‎coderd/coderd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ func New(options *Options) *API {
823823
r.Post("/convert-login", api.postConvertLoginType)
824824
r.Delete("/", api.deleteUser)
825825
r.Get("/", api.userByName)
826-
r.Get("/parameters", api.userParameters)
826+
r.Get("/autofill-parameters", api.userAutofillParameters)
827827
r.Get("/login-type", api.userLoginType)
828828
r.Put("/profile", api.putUserProfile)
829829
r.Route("/status", func(r chi.Router) {

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,8 +1754,8 @@ func (q *querier) GetUserLinksByUserID(ctx context.Context, userID uuid.UUID) ([
17541754
return q.db.GetUserLinksByUserID(ctx, userID)
17551755
}
17561756

1757-
func (q *querier) GetUserWorkspaceBuildParameters(ctx context.Context, ownerID uuid.UUID) ([]database.GetUserWorkspaceBuildParametersRow, error) {
1758-
u, err := q.db.GetUserByID(ctx, ownerID)
1757+
func (q *querier) GetUserWorkspaceBuildParameters(ctx context.Context, params database.GetUserWorkspaceBuildParametersParams) ([]database.GetUserWorkspaceBuildParametersRow, error) {
1758+
u, err := q.db.GetUserByID(ctx, params.OwnerID)
17591759
if err != nil {
17601760
return nil, err
17611761
}
@@ -1764,7 +1764,7 @@ func (q *querier) GetUserWorkspaceBuildParameters(ctx context.Context, ownerID u
17641764
if err := q.authorizeContext(ctx, rbac.ActionUpdate, u.UserDataRBACObject()); err != nil {
17651765
return nil, err
17661766
}
1767-
return q.db.GetUserWorkspaceBuildParameters(ctx, ownerID)
1767+
return q.db.GetUserWorkspaceBuildParameters(ctx, params)
17681768
}
17691769

17701770
func (q *querier) GetUsers(ctx context.Context, arg database.GetUsersParams) ([]database.GetUsersRow, error) {

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,12 @@ func (s *MethodTestSuite) TestUser() {
10541054
}))
10551055
s.Run("GetUserWorkspaceBuildParameters", s.Subtest(func(db database.Store, check *expects) {
10561056
u := dbgen.User(s.T(), db, database.User{})
1057-
check.Args(u.ID).Asserts(u.UserDataRBACObject(), rbac.ActionUpdate).Returns(
1057+
check.Args(
1058+
database.GetUserWorkspaceBuildParametersParams{
1059+
OwnerID: u.ID,
1060+
TemplateID: uuid.UUID{},
1061+
},
1062+
).Asserts(u.UserDataRBACObject(), rbac.ActionUpdate).Returns(
10581063
[]database.GetUserWorkspaceBuildParametersRow{},
10591064
)
10601065
}))

‎coderd/database/dbmem/dbmem.go

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3758,36 +3758,26 @@ func (q *FakeQuerier) GetUserLinksByUserID(_ context.Context, userID uuid.UUID)
37583758
return uls, nil
37593759
}
37603760

3761-
func (q *FakeQuerier) GetUserWorkspaceBuildParameters(_ context.Context, ownerID uuid.UUID) ([]database.GetUserWorkspaceBuildParametersRow, error) {
3761+
func (q *FakeQuerier) GetUserWorkspaceBuildParameters(_ context.Context, params database.GetUserWorkspaceBuildParametersParams) ([]database.GetUserWorkspaceBuildParametersRow, error) {
37623762
q.mutex.RLock()
37633763
defer q.mutex.RUnlock()
37643764

37653765
userWorkspaceIDs := make(map[uuid.UUID]struct{})
37663766
for _, ws := range q.workspaces {
3767-
if ws.OwnerID != ownerID {
3767+
if ws.OwnerID != params.OwnerID {
37683768
continue
37693769
}
3770-
userWorkspaceIDs[ws.ID] = struct{}{}
3771-
}
3772-
3773-
userWorkspaceBuilds := make(map[uuid.UUID]database.WorkspaceBuildTable)
3774-
for _, wb := range q.workspaceBuilds {
3775-
if _, ok := userWorkspaceIDs[wb.WorkspaceID]; !ok {
3770+
if ws.TemplateID != params.TemplateID {
37763771
continue
37773772
}
3778-
userWorkspaceBuilds[wb.ID] = wb
3773+
userWorkspaceIDs[ws.ID] = struct{}{}
37793774
}
37803775

37813776
userWorkspaceBuildParameters := make([]database.GetUserWorkspaceBuildParametersRow, 0)
37823777
for _, wbp := range q.workspaceBuildParameters {
3783-
wb, ok := userWorkspaceBuilds[wbp.WorkspaceBuildID]
3784-
if !ok {
3785-
continue
3786-
}
37873778
userWorkspaceBuildParameters = append(userWorkspaceBuildParameters, database.GetUserWorkspaceBuildParametersRow{
3788-
Name: wbp.Name,
3789-
Value: wbp.Value,
3790-
CreatedAt: wb.CreatedAt,
3779+
Name: wbp.Name,
3780+
Value: wbp.Value,
37913781
})
37923782
}
37933783

‎coderd/database/dbmetrics/dbmetrics.go

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

‎coderd/database/dbmock/dbmock.go

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

‎coderd/database/querier.go

Lines changed: 3 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: 18 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)