@@ -946,16 +946,16 @@ func (s *MethodTestSuite) TestWorkspace() {
946
946
s .Run ("GetLatestWorkspaceBuildByWorkspaceID" , s .Subtest (func (db database.Store , check * expects ) {
947
947
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
948
948
b := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID })
949
- check .Args (ws .ID ).Asserts (ws , rbac .ActionRead ).Returns (b )
949
+ check .Args (ws .ID ).Asserts (ws , rbac .ActionRead ).Returns (b . WithWorkspace ( ws ) )
950
950
}))
951
951
s .Run ("GetLatestWorkspaceBuildsByWorkspaceIDs" , s .Subtest (func (db database.Store , check * expects ) {
952
952
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
953
- b := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID })
953
+ b := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID }). WithWorkspace ( ws )
954
954
check .Args ([]uuid.UUID {ws .ID }).Asserts (ws , rbac .ActionRead ).Returns (slice .New (b ))
955
955
}))
956
956
s .Run ("GetWorkspaceAgentByID" , s .Subtest (func (db database.Store , check * expects ) {
957
957
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
958
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
958
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
959
959
res := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : build .JobID })
960
960
agt := dbgen .WorkspaceAgent (s .T (), db , database.WorkspaceAgent {ResourceID : res .ID })
961
961
check .Args (agt .ID ).Asserts (ws , rbac .ActionRead ).Returns (agt )
@@ -969,15 +969,15 @@ func (s *MethodTestSuite) TestWorkspace() {
969
969
}))
970
970
s .Run ("GetWorkspaceAgentsByResourceIDs" , s .Subtest (func (db database.Store , check * expects ) {
971
971
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
972
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
972
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
973
973
res := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : build .JobID })
974
974
agt := dbgen .WorkspaceAgent (s .T (), db , database.WorkspaceAgent {ResourceID : res .ID })
975
975
check .Args ([]uuid.UUID {res .ID }).Asserts (ws , rbac .ActionRead ).
976
976
Returns ([]database.WorkspaceAgent {agt })
977
977
}))
978
978
s .Run ("UpdateWorkspaceAgentLifecycleStateByID" , s .Subtest (func (db database.Store , check * expects ) {
979
979
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
980
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
980
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
981
981
res := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : build .JobID })
982
982
agt := dbgen .WorkspaceAgent (s .T (), db , database.WorkspaceAgent {ResourceID : res .ID })
983
983
check .Args (database.UpdateWorkspaceAgentLifecycleStateByIDParams {
@@ -987,7 +987,7 @@ func (s *MethodTestSuite) TestWorkspace() {
987
987
}))
988
988
s .Run ("UpdateWorkspaceAgentStartupByID" , s .Subtest (func (db database.Store , check * expects ) {
989
989
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
990
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
990
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
991
991
res := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : build .JobID })
992
992
agt := dbgen .WorkspaceAgent (s .T (), db , database.WorkspaceAgent {ResourceID : res .ID })
993
993
check .Args (database.UpdateWorkspaceAgentStartupByIDParams {
@@ -996,7 +996,7 @@ func (s *MethodTestSuite) TestWorkspace() {
996
996
}))
997
997
s .Run ("GetWorkspaceAppByAgentIDAndSlug" , s .Subtest (func (db database.Store , check * expects ) {
998
998
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
999
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
999
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
1000
1000
res := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : build .JobID })
1001
1001
agt := dbgen .WorkspaceAgent (s .T (), db , database.WorkspaceAgent {ResourceID : res .ID })
1002
1002
app := dbgen .WorkspaceApp (s .T (), db , database.WorkspaceApp {AgentID : agt .ID })
@@ -1008,7 +1008,7 @@ func (s *MethodTestSuite) TestWorkspace() {
1008
1008
}))
1009
1009
s .Run ("GetWorkspaceAppsByAgentID" , s .Subtest (func (db database.Store , check * expects ) {
1010
1010
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
1011
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
1011
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
1012
1012
res := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : build .JobID })
1013
1013
agt := dbgen .WorkspaceAgent (s .T (), db , database.WorkspaceAgent {ResourceID : res .ID })
1014
1014
a := dbgen .WorkspaceApp (s .T (), db , database.WorkspaceApp {AgentID : agt .ID })
@@ -1018,13 +1018,13 @@ func (s *MethodTestSuite) TestWorkspace() {
1018
1018
}))
1019
1019
s .Run ("GetWorkspaceAppsByAgentIDs" , s .Subtest (func (db database.Store , check * expects ) {
1020
1020
aWs := dbgen .Workspace (s .T (), db , database.Workspace {})
1021
- aBuild := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : aWs .ID , JobID : uuid .New ()})
1021
+ aBuild := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : aWs .ID , JobID : uuid .New ()}). WithWorkspace ( aWs )
1022
1022
aRes := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : aBuild .JobID })
1023
1023
aAgt := dbgen .WorkspaceAgent (s .T (), db , database.WorkspaceAgent {ResourceID : aRes .ID })
1024
1024
a := dbgen .WorkspaceApp (s .T (), db , database.WorkspaceApp {AgentID : aAgt .ID })
1025
1025
1026
1026
bWs := dbgen .Workspace (s .T (), db , database.Workspace {})
1027
- bBuild := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : bWs .ID , JobID : uuid .New ()})
1027
+ bBuild := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : bWs .ID , JobID : uuid .New ()}). WithWorkspace ( bWs )
1028
1028
bRes := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : bBuild .JobID })
1029
1029
bAgt := dbgen .WorkspaceAgent (s .T (), db , database.WorkspaceAgent {ResourceID : bRes .ID })
1030
1030
b := dbgen .WorkspaceApp (s .T (), db , database.WorkspaceApp {AgentID : bAgt .ID })
@@ -1035,17 +1035,17 @@ func (s *MethodTestSuite) TestWorkspace() {
1035
1035
}))
1036
1036
s .Run ("GetWorkspaceBuildByID" , s .Subtest (func (db database.Store , check * expects ) {
1037
1037
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
1038
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID })
1038
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID }). WithWorkspace ( ws )
1039
1039
check .Args (build .ID ).Asserts (ws , rbac .ActionRead ).Returns (build )
1040
1040
}))
1041
1041
s .Run ("GetWorkspaceBuildByJobID" , s .Subtest (func (db database.Store , check * expects ) {
1042
1042
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
1043
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID })
1043
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID }). WithWorkspace ( ws )
1044
1044
check .Args (build .JobID ).Asserts (ws , rbac .ActionRead ).Returns (build )
1045
1045
}))
1046
1046
s .Run ("GetWorkspaceBuildByWorkspaceIDAndBuildNumber" , s .Subtest (func (db database.Store , check * expects ) {
1047
1047
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
1048
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , BuildNumber : 10 })
1048
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , BuildNumber : 10 }). WithWorkspace ( ws )
1049
1049
check .Args (database.GetWorkspaceBuildByWorkspaceIDAndBuildNumberParams {
1050
1050
WorkspaceID : ws .ID ,
1051
1051
BuildNumber : build .BuildNumber ,
@@ -1059,14 +1059,14 @@ func (s *MethodTestSuite) TestWorkspace() {
1059
1059
}))
1060
1060
s .Run ("GetWorkspaceBuildsByWorkspaceID" , s .Subtest (func (db database.Store , check * expects ) {
1061
1061
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
1062
- _ = dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , BuildNumber : 1 })
1063
- _ = dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , BuildNumber : 2 })
1064
- _ = dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , BuildNumber : 3 })
1062
+ _ = dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , BuildNumber : 1 }). WithWorkspace ( ws )
1063
+ _ = dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , BuildNumber : 2 }). WithWorkspace ( ws )
1064
+ _ = dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , BuildNumber : 3 }). WithWorkspace ( ws )
1065
1065
check .Args (database.GetWorkspaceBuildsByWorkspaceIDParams {WorkspaceID : ws .ID }).Asserts (ws , rbac .ActionRead ) // ordering
1066
1066
}))
1067
1067
s .Run ("GetWorkspaceByAgentID" , s .Subtest (func (db database.Store , check * expects ) {
1068
1068
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
1069
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
1069
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
1070
1070
res := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : build .JobID })
1071
1071
agt := dbgen .WorkspaceAgent (s .T (), db , database.WorkspaceAgent {ResourceID : res .ID })
1072
1072
check .Args (agt .ID ).Asserts (ws , rbac .ActionRead ).Returns (ws )
@@ -1081,14 +1081,14 @@ func (s *MethodTestSuite) TestWorkspace() {
1081
1081
}))
1082
1082
s .Run ("GetWorkspaceResourceByID" , s .Subtest (func (db database.Store , check * expects ) {
1083
1083
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
1084
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
1084
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
1085
1085
_ = dbgen .ProvisionerJob (s .T (), db , database.ProvisionerJob {ID : build .JobID , Type : database .ProvisionerJobTypeWorkspaceBuild })
1086
1086
res := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : build .JobID })
1087
1087
check .Args (res .ID ).Asserts (ws , rbac .ActionRead ).Returns (res )
1088
1088
}))
1089
1089
s .Run ("GetWorkspaceResourceMetadataByResourceIDs" , s .Subtest (func (db database.Store , check * expects ) {
1090
1090
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
1091
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
1091
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
1092
1092
_ = dbgen .ProvisionerJob (s .T (), db , database.ProvisionerJob {ID : build .JobID , Type : database .ProvisionerJobTypeWorkspaceBuild })
1093
1093
a := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : build .JobID })
1094
1094
b := dbgen .WorkspaceResource (s .T (), db , database.WorkspaceResource {JobID : build .JobID })
@@ -1097,7 +1097,7 @@ func (s *MethodTestSuite) TestWorkspace() {
1097
1097
}))
1098
1098
s .Run ("Build/GetWorkspaceResourcesByJobID" , s .Subtest (func (db database.Store , check * expects ) {
1099
1099
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
1100
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
1100
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
1101
1101
job := dbgen .ProvisionerJob (s .T (), db , database.ProvisionerJob {ID : build .JobID , Type : database .ProvisionerJobTypeWorkspaceBuild })
1102
1102
check .Args (job .ID ).Asserts (ws , rbac .ActionRead ).Returns ([]database.WorkspaceResource {})
1103
1103
}))
@@ -1113,7 +1113,7 @@ func (s *MethodTestSuite) TestWorkspace() {
1113
1113
tJob := dbgen .ProvisionerJob (s .T (), db , database.ProvisionerJob {ID : v .JobID , Type : database .ProvisionerJobTypeTemplateVersionImport })
1114
1114
1115
1115
ws := dbgen .Workspace (s .T (), db , database.Workspace {})
1116
- build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()})
1116
+ build := dbgen .WorkspaceBuild (s .T (), db , database.WorkspaceBuild {WorkspaceID : ws .ID , JobID : uuid .New ()}). WithWorkspace ( ws )
1117
1117
wJob := dbgen .ProvisionerJob (s .T (), db , database.ProvisionerJob {ID : build .JobID , Type : database .ProvisionerJobTypeWorkspaceBuild })
1118
1118
check .Args ([]uuid.UUID {tJob .ID , wJob .ID }).Asserts (v .RBACObject (tpl ), rbac .ActionRead , ws , rbac .ActionRead ).Returns ([]database.WorkspaceResource {})
1119
1119
}))
0 commit comments