Skip to content

Commit 866bed8

Browse files
sreyasreya
committed
fix conflicts
1 parent 68b8002 commit 866bed8

File tree

3 files changed

+44
-33
lines changed

3 files changed

+44
-33
lines changed

‎coderd/database/dbfake/dbfake.go

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -560,27 +560,6 @@ func isNotNull(v interface{}) bool {
560560
// these methods remain unimplemented in the FakeQuerier.
561561
var ErrUnimplemented = xerrors.New("unimplemented")
562562

563-
func (q *FakeQuerier) UpdateWorkspaceLockedAt(_ context.Context, arg database.UpdateWorkspaceLockedAtParams) error {
564-
if err := validateDatabaseType(arg); err != nil {
565-
return err
566-
}
567-
568-
q.mutex.Lock()
569-
defer q.mutex.Unlock()
570-
571-
for index, workspace := range q.workspaces {
572-
if workspace.ID != arg.ID {
573-
continue
574-
}
575-
workspace.LockedAt = arg.LockedAt
576-
workspace.LastUsedAt = database.Now()
577-
q.workspaces[index] = workspace
578-
return nil
579-
}
580-
581-
return sql.ErrNoRows
582-
}
583-
584563
func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
585564
return xerrors.New("AcquireLock must only be called within a transaction")
586565
}
@@ -4851,13 +4830,31 @@ func (q *FakeQuerier) UpdateWorkspaceLastUsedAt(_ context.Context, arg database.
48514830
return sql.ErrNoRows
48524831
}
48534832

4854-
func (q *FakeQuerier) UpdateWorkspaceLockedDeletingAt(ctx context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) error {
4855-
err := validateDatabaseType(arg)
4856-
if err != nil {
4833+
func (q *FakeQuerier) UpdateWorkspaceLockedDeletingAt(_ context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) error {
4834+
if err := validateDatabaseType(arg); err != nil {
48574835
return err
48584836
}
4859-
4860-
panic("not implemented")
4837+
q.mutex.Lock()
4838+
defer q.mutex.Unlock()
4839+
for index, workspace := range q.workspaces {
4840+
if workspace.ID != arg.ID {
4841+
continue
4842+
}
4843+
workspace.LockedAt = arg.LockedAt
4844+
if workspace.LockedAt.Time.IsZero() {
4845+
workspace.LastUsedAt = database.Now()
4846+
workspace.DeletingAt = sql.NullTime{}
4847+
}
4848+
if arg.LockedTtlMs > 0 && !workspace.LockedAt.Time.IsZero() {
4849+
workspace.DeletingAt = sql.NullTime{
4850+
Valid: true,
4851+
Time: workspace.LockedAt.Time.Add(time.Duration(arg.LockedTtlMs) * time.Millisecond),
4852+
}
4853+
}
4854+
q.workspaces[index] = workspace
4855+
return nil
4856+
}
4857+
return sql.ErrNoRows
48614858
}
48624859

48634860
func (q *FakeQuerier) UpdateWorkspaceProxy(_ context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {
@@ -4940,13 +4937,30 @@ func (q *FakeQuerier) UpdateWorkspaceTTLToBeWithinTemplateMax(_ context.Context,
49404937
return nil
49414938
}
49424939

4943-
func (q *FakeQuerier) UpdateWorkspacesDeletingAtByTemplateID(ctx context.Context, arg database.UpdateWorkspacesDeletingAtByTemplateIDParams) error {
4940+
func (q *FakeQuerier) UpdateWorkspacesDeletingAtByTemplateID(_ context.Context, arg database.UpdateWorkspacesDeletingAtByTemplateIDParams) error {
4941+
q.mutex.Lock()
4942+
defer q.mutex.Unlock()
4943+
49444944
err := validateDatabaseType(arg)
49454945
if err != nil {
49464946
return err
49474947
}
49484948

4949-
panic("not implemented")
4949+
for i, ws := range q.workspaces {
4950+
if ws.LockedAt.Time.IsZero() {
4951+
continue
4952+
}
4953+
deletingAt := sql.NullTime{
4954+
Valid: arg.LockedTtlMs > 0,
4955+
}
4956+
if arg.LockedTtlMs > 0 {
4957+
deletingAt.Time = ws.LockedAt.Time.Add(time.Duration(arg.LockedTtlMs) * time.Millisecond)
4958+
}
4959+
ws.DeletingAt = deletingAt
4960+
q.workspaces[i] = ws
4961+
}
4962+
4963+
return nil
49504964
}
49514965

49524966
func (q *FakeQuerier) UpsertAppSecurityKey(_ context.Context, data string) error {

‎enterprise/coderd/templates_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,11 @@ func TestTemplates(t *testing.T) {
260260
t.Parallel()
261261

262262
ctx := testutil.Context(t, testutil.WaitMedium)
263-
client := coderdenttest.New(t, &coderdenttest.Options{
263+
client, user := coderdenttest.New(t, &coderdenttest.Options{
264264
Options: &coderdtest.Options{
265265
IncludeProvisionerDaemon: true,
266266
},
267267
})
268-
user := coderdtest.CreateFirstUser(t, client)
269268
_ = coderdenttest.AddFullLicense(t, client)
270269

271270
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)

‎enterprise/coderd/workspaces_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,6 @@ func TestWorkspacesFiltering(t *testing.T) {
634634
IncludeProvisionerDaemon: true,
635635
},
636636
})
637-
user := coderdtest.CreateFirstUser(t, client)
638637
_ = coderdenttest.AddFullLicense(t, client)
639638

640639
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@@ -680,14 +679,13 @@ func TestWorkspaceLock(t *testing.T) {
680679
t.Run("TemplateLockedTTL", func(t *testing.T) {
681680
t.Parallel()
682681
var (
683-
client = coderdenttest.New(t, &coderdenttest.Options{
682+
client, user = coderdenttest.New(t, &coderdenttest.Options{
684683
Options: &coderdtest.Options{
685684
IncludeProvisionerDaemon: true,
686685
TemplateScheduleStore: &coderd.EnterpriseTemplateScheduleStore{},
687686
},
688687
})
689688

690-
user = coderdtest.CreateFirstUser(t, client)
691689
_ = coderdenttest.AddFullLicense(t, client)
692690
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
693691
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)

0 commit comments

Comments
 (0)