Skip to content

Commit 8bfa9ad

Browse files
EmyrkEmyrk
committed
fixup! seed template id in test
1 parent 19428fa commit 8bfa9ad

File tree

1 file changed

+32
-8
lines changed

1 file changed

+32
-8
lines changed

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,10 @@ func (s *MethodTestSuite) TestWorkspace() {
10841084
check.Args(agt.AuthInstanceID.String).Asserts(ws, rbac.ActionRead).Returns(agt)
10851085
}))
10861086
s.Run("UpdateWorkspaceAgentLifecycleStateByID", s.Subtest(func(db database.Store, check *expects) {
1087-
ws := dbgen.Workspace(s.T(), db, database.Workspace{})
1087+
tpl := dbgen.Template(s.T(), db, database.Template{})
1088+
ws := dbgen.Workspace(s.T(), db, database.Workspace{
1089+
TemplateID: tpl.ID,
1090+
})
10881091
build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
10891092
res := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: build.JobID})
10901093
agt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: res.ID})
@@ -1094,7 +1097,10 @@ func (s *MethodTestSuite) TestWorkspace() {
10941097
}).Asserts(ws, rbac.ActionUpdate).Returns()
10951098
}))
10961099
s.Run("UpdateWorkspaceAgentLogOverflowByID", s.Subtest(func(db database.Store, check *expects) {
1097-
ws := dbgen.Workspace(s.T(), db, database.Workspace{})
1100+
tpl := dbgen.Template(s.T(), db, database.Template{})
1101+
ws := dbgen.Workspace(s.T(), db, database.Workspace{
1102+
TemplateID: tpl.ID,
1103+
})
10981104
build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
10991105
res := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: build.JobID})
11001106
agt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: res.ID})
@@ -1104,7 +1110,10 @@ func (s *MethodTestSuite) TestWorkspace() {
11041110
}).Asserts(ws, rbac.ActionUpdate).Returns()
11051111
}))
11061112
s.Run("UpdateWorkspaceAgentStartupByID", s.Subtest(func(db database.Store, check *expects) {
1107-
ws := dbgen.Workspace(s.T(), db, database.Workspace{})
1113+
tpl := dbgen.Template(s.T(), db, database.Template{})
1114+
ws := dbgen.Workspace(s.T(), db, database.Workspace{
1115+
TemplateID: tpl.ID,
1116+
})
11081117
build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
11091118
res := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: build.JobID})
11101119
agt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: res.ID})
@@ -1116,7 +1125,10 @@ func (s *MethodTestSuite) TestWorkspace() {
11161125
}).Asserts(ws, rbac.ActionUpdate).Returns()
11171126
}))
11181127
s.Run("GetWorkspaceAgentLogsAfter", s.Subtest(func(db database.Store, check *expects) {
1119-
ws := dbgen.Workspace(s.T(), db, database.Workspace{})
1128+
tpl := dbgen.Template(s.T(), db, database.Template{})
1129+
ws := dbgen.Workspace(s.T(), db, database.Workspace{
1130+
TemplateID: tpl.ID,
1131+
})
11201132
build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
11211133
res := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: build.JobID})
11221134
agt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: res.ID})
@@ -1125,7 +1137,10 @@ func (s *MethodTestSuite) TestWorkspace() {
11251137
}).Asserts(ws, rbac.ActionRead).Returns([]database.WorkspaceAgentLog{})
11261138
}))
11271139
s.Run("GetWorkspaceAppByAgentIDAndSlug", s.Subtest(func(db database.Store, check *expects) {
1128-
ws := dbgen.Workspace(s.T(), db, database.Workspace{})
1140+
tpl := dbgen.Template(s.T(), db, database.Template{})
1141+
ws := dbgen.Workspace(s.T(), db, database.Workspace{
1142+
TemplateID: tpl.ID,
1143+
})
11291144
build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
11301145
res := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: build.JobID})
11311146
agt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: res.ID})
@@ -1137,7 +1152,10 @@ func (s *MethodTestSuite) TestWorkspace() {
11371152
}).Asserts(ws, rbac.ActionRead).Returns(app)
11381153
}))
11391154
s.Run("GetWorkspaceAppsByAgentID", s.Subtest(func(db database.Store, check *expects) {
1140-
ws := dbgen.Workspace(s.T(), db, database.Workspace{})
1155+
tpl := dbgen.Template(s.T(), db, database.Template{})
1156+
ws := dbgen.Workspace(s.T(), db, database.Workspace{
1157+
TemplateID: tpl.ID,
1158+
})
11411159
build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
11421160
res := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: build.JobID})
11431161
agt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: res.ID})
@@ -1178,11 +1196,17 @@ func (s *MethodTestSuite) TestWorkspace() {
11781196
check.Args(database.GetWorkspaceBuildsByWorkspaceIDParams{WorkspaceID: ws.ID}).Asserts(ws, rbac.ActionRead) // ordering
11791197
}))
11801198
s.Run("GetWorkspaceByAgentID", s.Subtest(func(db database.Store, check *expects) {
1181-
ws := dbgen.Workspace(s.T(), db, database.Workspace{})
1199+
tpl := dbgen.Template(s.T(), db, database.Template{})
1200+
ws := dbgen.Workspace(s.T(), db, database.Workspace{
1201+
TemplateID: tpl.ID,
1202+
})
11821203
build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: uuid.New()})
11831204
res := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: build.JobID})
11841205
agt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: res.ID})
1185-
check.Args(agt.ID).Asserts(ws, rbac.ActionRead).Returns(ws)
1206+
check.Args(agt.ID).Asserts(ws, rbac.ActionRead).Returns(database.GetWorkspaceByAgentIDRow{
1207+
Workspace: ws,
1208+
TemplateName: tpl.Name,
1209+
})
11861210
}))
11871211
s.Run("GetWorkspaceByOwnerIDAndName", s.Subtest(func(db database.Store, check *expects) {
11881212
ws := dbgen.Workspace(s.T(), db, database.Workspace{})

0 commit comments

Comments
 (0)