@@ -13,6 +13,7 @@ import (
1313"github.com/coder/coder/v2/coderd/database"
1414"github.com/coder/coder/v2/coderd/database/dbgen"
1515"github.com/coder/coder/v2/coderd/database/dbtestutil"
16+ "github.com/coder/coder/v2/coderd/rbac"
1617"github.com/coder/coder/v2/codersdk"
1718"github.com/coder/coder/v2/provisioner/echo"
1819"github.com/coder/coder/v2/provisionersdk/proto"
@@ -22,32 +23,14 @@ import (
2223func TestProvisionerJobs (t * testing.T ) {
2324t .Parallel ()
2425
25- // encode := func(v interface{}) []byte {
26- // b, err := json.Marshal(v)
27- // require.NoError(t, err)
28- // return b
29- // }
30-
31- // db, ps := dbtestutil.NewDB(t,
32- // dbtestutil.WithDumpOnFailure(),
33- // //nolint:gocritic // Use UTC for consistent timestamp length in golden files.
34- // dbtestutil.WithTimezone("UTC"),
35- // )
36- // client, _, coderdAPI := coderdtest.NewWithAPI(t, &coderdtest.Options{
37- // IncludeProvisionerDaemon: true,
38- // Database: db,
39- // Pubsub: ps,
40- // })
41- // owner := coderdtest.CreateFirstUser(t, client)
42- // _, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
43-
4426db ,ps := dbtestutil .NewDB (t ,dbtestutil .WithDumpOnFailure ())
4527client := coderdtest .New (t ,& coderdtest.Options {
4628IncludeProvisionerDaemon :true ,
4729Database :db ,
4830Pubsub :ps ,
4931})
5032owner := coderdtest .CreateFirstUser (t ,client )
33+ templateAdminClient ,_ := coderdtest .CreateAnotherUser (t ,client ,owner .OrganizationID ,rbac .RoleTemplateAdmin ())
5134memberClient ,member := coderdtest .CreateAnotherUser (t ,client ,owner .OrganizationID )
5235
5336// client, db := coderdtest.NewWithDatabase(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
@@ -83,33 +66,41 @@ func TestProvisionerJobs(t *testing.T) {
8366t .Run ("All" ,func (t * testing.T ) {
8467t .Parallel ()
8568ctx := testutil .Context (t ,testutil .WaitMedium )
86- jobs ,err := memberClient .OrganizationProvisionerJobs (ctx ,owner .OrganizationID ,nil )
69+ jobs ,err := templateAdminClient .OrganizationProvisionerJobs (ctx ,owner .OrganizationID ,nil )
8770require .NoError (t ,err )
8871require .Len (t ,jobs ,3 )
8972})
9073
9174t .Run ("Pending" ,func (t * testing.T ) {
9275t .Parallel ()
9376ctx := testutil .Context (t ,testutil .WaitMedium )
94- jobs ,err := memberClient .OrganizationProvisionerJobs (ctx ,owner .OrganizationID ,& codersdk.OrganizationProvisionerJobsOptions {
77+ jobs ,err := templateAdminClient .OrganizationProvisionerJobs (ctx ,owner .OrganizationID ,& codersdk.OrganizationProvisionerJobsOptions {
9578Status : []codersdk.ProvisionerJobStatus {codersdk .ProvisionerJobPending },
9679})
97- for _ ,job := range jobs {
98- t .Logf ("job: %#v" ,job )
99- }
10080require .NoError (t ,err )
10181require .Len (t ,jobs ,1 )
10282})
10383
10484t .Run ("Limit" ,func (t * testing.T ) {
10585t .Parallel ()
10686ctx := testutil .Context (t ,testutil .WaitMedium )
107- jobs ,err := memberClient .OrganizationProvisionerJobs (ctx ,owner .OrganizationID ,& codersdk.OrganizationProvisionerJobsOptions {
87+ jobs ,err := templateAdminClient .OrganizationProvisionerJobs (ctx ,owner .OrganizationID ,& codersdk.OrganizationProvisionerJobsOptions {
10888Limit :1 ,
10989})
11090require .NoError (t ,err )
11191require .Len (t ,jobs ,1 )
11292})
93+
94+ // For now, this is not allowed even though the member has created a
95+ // workspace. Once member-level permissions for jobs are supported
96+ // by RBAC, this test should be updated.
97+ t .Run ("MemberDenied" ,func (t * testing.T ) {
98+ t .Parallel ()
99+ ctx := testutil .Context (t ,testutil .WaitMedium )
100+ jobs ,err := memberClient .OrganizationProvisionerJobs (ctx ,owner .OrganizationID ,nil )
101+ require .Error (t ,err )
102+ require .Len (t ,jobs ,0 )
103+ })
113104}
114105
115106func TestProvisionerJobLogs (t * testing.T ) {