Skip to content

Commit 6c250a3

Browse files
aslilacaslilac
committed
this all makes the diff so weird
1 parent c652969 commit 6c250a3

File tree

10 files changed

+76
-78
lines changed

10 files changed

+76
-78
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3966,9 +3966,9 @@ func (q *querier) UpdateTemplateScheduleByID(ctx context.Context, arg database.U
39663966
return update(q.log, q.auth, fetch, q.db.UpdateTemplateScheduleByID)(ctx, arg)
39673967
}
39683968

3969-
func (q *querier) UpdateTemplateVersionByCompletedJobID(ctx context.Context, arg database.UpdateTemplateVersionByCompletedJobIDParams) error {
3970-
// An actor is allowed to update the template version external auth providers if they are authorized to update the template.
3971-
tv, err := q.db.GetTemplateVersionByJobID(ctx, arg.JobID)
3969+
func (q *querier) UpdateTemplateVersionByID(ctx context.Context, arg database.UpdateTemplateVersionByIDParams) error {
3970+
// An actor is allowed to update the template version if they are authorized to update the template.
3971+
tv, err := q.db.GetTemplateVersionByID(ctx, arg.ID)
39723972
if err != nil {
39733973
return err
39743974
}
@@ -3985,12 +3985,12 @@ func (q *querier) UpdateTemplateVersionByCompletedJobID(ctx context.Context, arg
39853985
if err := q.authorizeContext(ctx, policy.ActionUpdate, obj); err != nil {
39863986
return err
39873987
}
3988-
return q.db.UpdateTemplateVersionByCompletedJobID(ctx, arg)
3988+
return q.db.UpdateTemplateVersionByID(ctx, arg)
39893989
}
39903990

3991-
func (q *querier) UpdateTemplateVersionByID(ctx context.Context, arg database.UpdateTemplateVersionByIDParams) error {
3992-
// An actor is allowed to update the template version if they are authorized to update the template.
3993-
tv, err := q.db.GetTemplateVersionByID(ctx, arg.ID)
3991+
func (q *querier) UpdateTemplateVersionDescriptionByJobID(ctx context.Context, arg database.UpdateTemplateVersionDescriptionByJobIDParams) error {
3992+
// An actor is allowed to update the template version description if they are authorized to update the template.
3993+
tv, err := q.db.GetTemplateVersionByJobID(ctx, arg.JobID)
39943994
if err != nil {
39953995
return err
39963996
}
@@ -4007,11 +4007,11 @@ func (q *querier) UpdateTemplateVersionByID(ctx context.Context, arg database.Up
40074007
if err := q.authorizeContext(ctx, policy.ActionUpdate, obj); err != nil {
40084008
return err
40094009
}
4010-
return q.db.UpdateTemplateVersionByID(ctx, arg)
4010+
return q.db.UpdateTemplateVersionDescriptionByJobID(ctx, arg)
40114011
}
40124012

4013-
func (q *querier) UpdateTemplateVersionDescriptionByJobID(ctx context.Context, arg database.UpdateTemplateVersionDescriptionByJobIDParams) error {
4014-
// An actor is allowed to update the template version description if they are authorized to update the template.
4013+
func (q *querier) UpdateTemplateVersionExternalAuthProvidersByJobID(ctx context.Context, arg database.UpdateTemplateVersionExternalAuthProvidersByJobIDParams) error {
4014+
// An actor is allowed to update the template version external auth providers if they are authorized to update the template.
40154015
tv, err := q.db.GetTemplateVersionByJobID(ctx, arg.JobID)
40164016
if err != nil {
40174017
return err
@@ -4029,7 +4029,7 @@ func (q *querier) UpdateTemplateVersionDescriptionByJobID(ctx context.Context, a
40294029
if err := q.authorizeContext(ctx, policy.ActionUpdate, obj); err != nil {
40304030
return err
40314031
}
4032-
return q.db.UpdateTemplateVersionDescriptionByJobID(ctx, arg)
4032+
return q.db.UpdateTemplateVersionExternalAuthProvidersByJobID(ctx, arg)
40334033
}
40344034

40354035
func (q *querier) UpdateTemplateWorkspacesLastUsedAt(ctx context.Context, arg database.UpdateTemplateWorkspacesLastUsedAtParams) error {

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,7 +1364,7 @@ func (s *MethodTestSuite) TestTemplate() {
13641364
Readme: "foo",
13651365
}).Asserts(t1, policy.ActionUpdate).Returns()
13661366
}))
1367-
s.Run("UpdateTemplateVersionByCompletedJobID", s.Subtest(func(db database.Store, check *expects) {
1367+
s.Run("UpdateTemplateVersionExternalAuthProvidersByJobID", s.Subtest(func(db database.Store, check *expects) {
13681368
jobID := uuid.New()
13691369
u := dbgen.User(s.T(), db, database.User{})
13701370
o := dbgen.Organization(s.T(), db, database.Organization{})
@@ -1378,7 +1378,7 @@ func (s *MethodTestSuite) TestTemplate() {
13781378
OrganizationID: o.ID,
13791379
JobID: jobID,
13801380
})
1381-
check.Args(database.UpdateTemplateVersionByCompletedJobIDParams{
1381+
check.Args(database.UpdateTemplateVersionExternalAuthProvidersByJobIDParams{
13821382
JobID: jobID,
13831383
ExternalAuthProviders: json.RawMessage("{}"),
13841384
}).Asserts(t1, policy.ActionUpdate).Returns()

‎coderd/database/dbmem/dbmem.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10454,7 +10454,7 @@ func (q *FakeQuerier) UpdateTemplateScheduleByID(_ context.Context, arg database
1045410454
return sql.ErrNoRows
1045510455
}
1045610456

10457-
func (q *FakeQuerier) UpdateTemplateVersionByCompletedJobID(_ context.Context, arg database.UpdateTemplateVersionByCompletedJobIDParams) error {
10457+
func (q *FakeQuerier) UpdateTemplateVersionByID(_ context.Context, arg database.UpdateTemplateVersionByIDParams) error {
1045810458
if err := validateDatabaseType(arg); err != nil {
1045910459
return err
1046010460
}
@@ -10463,19 +10463,20 @@ func (q *FakeQuerier) UpdateTemplateVersionByCompletedJobID(_ context.Context, a
1046310463
defer q.mutex.Unlock()
1046410464

1046510465
for index, templateVersion := range q.templateVersions {
10466-
if templateVersion.JobID != arg.JobID {
10466+
if templateVersion.ID != arg.ID {
1046710467
continue
1046810468
}
10469-
templateVersion.ExternalAuthProviders = arg.ExternalAuthProviders
10470-
templateVersion.ImportGraph = arg.ImportGraph
10469+
templateVersion.TemplateID = arg.TemplateID
1047110470
templateVersion.UpdatedAt = arg.UpdatedAt
10471+
templateVersion.Name = arg.Name
10472+
templateVersion.Message = arg.Message
1047210473
q.templateVersions[index] = templateVersion
1047310474
return nil
1047410475
}
1047510476
return sql.ErrNoRows
1047610477
}
1047710478

10478-
func (q *FakeQuerier) UpdateTemplateVersionByID(_ context.Context, arg database.UpdateTemplateVersionByIDParams) error {
10479+
func (q *FakeQuerier) UpdateTemplateVersionDescriptionByJobID(_ context.Context, arg database.UpdateTemplateVersionDescriptionByJobIDParams) error {
1047910480
if err := validateDatabaseType(arg); err != nil {
1048010481
return err
1048110482
}
@@ -10484,20 +10485,18 @@ func (q *FakeQuerier) UpdateTemplateVersionByID(_ context.Context, arg database.
1048410485
defer q.mutex.Unlock()
1048510486

1048610487
for index, templateVersion := range q.templateVersions {
10487-
if templateVersion.ID != arg.ID {
10488+
if templateVersion.JobID != arg.JobID {
1048810489
continue
1048910490
}
10490-
templateVersion.TemplateID = arg.TemplateID
10491+
templateVersion.Readme = arg.Readme
1049110492
templateVersion.UpdatedAt = arg.UpdatedAt
10492-
templateVersion.Name = arg.Name
10493-
templateVersion.Message = arg.Message
1049410493
q.templateVersions[index] = templateVersion
1049510494
return nil
1049610495
}
1049710496
return sql.ErrNoRows
1049810497
}
1049910498

10500-
func (q *FakeQuerier) UpdateTemplateVersionDescriptionByJobID(_ context.Context, arg database.UpdateTemplateVersionDescriptionByJobIDParams) error {
10499+
func (q *FakeQuerier) UpdateTemplateVersionExternalAuthProvidersByJobID(_ context.Context, arg database.UpdateTemplateVersionExternalAuthProvidersByJobIDParams) error {
1050110500
if err := validateDatabaseType(arg); err != nil {
1050210501
return err
1050310502
}
@@ -10509,7 +10508,7 @@ func (q *FakeQuerier) UpdateTemplateVersionDescriptionByJobID(_ context.Context,
1050910508
if templateVersion.JobID != arg.JobID {
1051010509
continue
1051110510
}
10512-
templateVersion.Readme = arg.Readme
10511+
templateVersion.ExternalAuthProviders = arg.ExternalAuthProviders
1051310512
templateVersion.UpdatedAt = arg.UpdatedAt
1051410513
q.templateVersions[index] = templateVersion
1051510514
return nil

‎coderd/database/dbmetrics/querymetrics.go

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

‎coderd/database/dump.sql

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

‎coderd/database/querier.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/queries.sql.go

Lines changed: 28 additions & 28 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ SET
113113
WHERE
114114
job_id = $1;
115115

116-
-- name: UpdateTemplateVersionByCompletedJobID :exec
116+
-- name: UpdateTemplateVersionExternalAuthProvidersByJobID :exec
117117
UPDATE
118118
template_versions
119119
SET

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
14051405
return nil, xerrors.Errorf("failed to serialize external_auth_providers value: %w", err)
14061406
}
14071407

1408-
err = s.Database.UpdateTemplateVersionByCompletedJobID(ctx, database.UpdateTemplateVersionByCompletedJobIDParams{
1408+
err = s.Database.UpdateTemplateVersionExternalAuthProvidersByJobID(ctx, database.UpdateTemplateVersionExternalAuthProvidersByJobIDParams{
14091409
JobID: jobID,
14101410
ExternalAuthProviders: json.RawMessage(externalAuthProvidersMessage),
14111411
ImportGraph: jobType.TemplateImport.Graph,

0 commit comments

Comments
 (0)