implement GetDeploymentDAUs, fix recursion in InsertParameterValue and GetWorkspaceOwnerCountsByTemplateIDs

johnstcn · johnstcn · commit 69510dffac0e · 2023-01-27T12:09:27.000Z
diff --git a/coderd/authzquery/authz_test.go b/coderd/authzquery/authz_test.go
@@ -10,9 +10,10 @@ import (
 
 	"github.com/coder/coder/testutil"
 
-	"github.com/coder/coder/coderd/database"
 	"github.com/stretchr/testify/require"
 
+	"github.com/coder/coder/coderd/database"
+
 	"github.com/google/uuid"
 
 	"github.com/coder/coder/coderd/authzquery"
diff --git a/coderd/authzquery/methods.go b/coderd/authzquery/methods.go
@@ -8,6 +8,7 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/rbac"
 )
 
 func (q *AuthzQuerier) GetProvisionerDaemons(ctx context.Context) ([]database.ProvisionerDaemon, error) {
@@ -33,6 +34,8 @@ func (q *AuthzQuerier) GetProvisionerLogsByIDBetween(ctx context.Context, arg da
 }
 
 func (q *AuthzQuerier) GetDeploymentDAUs(ctx context.Context) ([]database.GetDeploymentDAUsRow, error) {
-	//TODO implement me
-	panic("implement me")
+	if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceUser.All()); err != nil {
+		return nil, err
+	}
+	return q.database.GetDeploymentDAUs(ctx)
 }
diff --git a/coderd/authzquery/parameters.go b/coderd/authzquery/parameters.go
@@ -52,7 +52,7 @@ func (q *AuthzQuerier) InsertParameterValue(ctx context.Context, arg database.In
 		return database.ParameterValue{}, err
 	}
 
-	return q.InsertParameterValue(ctx, arg)
+	return q.database.InsertParameterValue(ctx, arg)
 }
 
 func (q *AuthzQuerier) ParameterValue(ctx context.Context, id uuid.UUID) (database.ParameterValue, error) {
diff --git a/coderd/authzquery/workspace.go b/coderd/authzquery/workspace.go
@@ -221,7 +221,7 @@ func (q *AuthzQuerier) GetWorkspaceOwnerCountsByTemplateIDs(ctx context.Context,
 		allowed = append(allowed, tpl.ID)
 	}
 
-	return q.GetWorkspaceOwnerCountsByTemplateIDs(ctx, allowed)
+	return q.database.GetWorkspaceOwnerCountsByTemplateIDs(ctx, allowed)
 }
 
 func (q *AuthzQuerier) GetWorkspaceResourceByID(ctx context.Context, id uuid.UUID) (database.WorkspaceResource, error) {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"github.com/google/uuid"`
`9`	`9`
`10`	`10`	`"github.com/coder/coder/coderd/database"`
	`11`	`+ "github.com/coder/coder/coderd/rbac"`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`func (q *AuthzQuerier) GetProvisionerDaemons(ctx context.Context) ([]database.ProvisionerDaemon, error) {`
`@@ -33,6 +34,8 @@ func (q *AuthzQuerier) GetProvisionerLogsByIDBetween(ctx context.Context, arg da`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`func (q *AuthzQuerier) GetDeploymentDAUs(ctx context.Context) ([]database.GetDeploymentDAUsRow, error) {`
`36`		`- //TODO implement me`
`37`		`- panic("implement me")`
	`37`	`+ if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceUser.All()); err != nil {`
	`38`	`+ return nil, err`
	`39`	`+ }`
	`40`	`+ return q.database.GetDeploymentDAUs(ctx)`
`38`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func (q *AuthzQuerier) InsertParameterValue(ctx context.Context, arg database.In`
`52`	`52`	`return database.ParameterValue{}, err`
`53`	`53`	`}`
`54`	`54`
`55`		`- return q.InsertParameterValue(ctx, arg)`
	`55`	`+ return q.database.InsertParameterValue(ctx, arg)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`func (q *AuthzQuerier) ParameterValue(ctx context.Context, id uuid.UUID) (database.ParameterValue, error) {`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ func (q *AuthzQuerier) GetWorkspaceOwnerCountsByTemplateIDs(ctx context.Context,`
`221`	`221`	`allowed = append(allowed, tpl.ID)`
`222`	`222`	`}`
`223`	`223`
`224`		`- return q.GetWorkspaceOwnerCountsByTemplateIDs(ctx, allowed)`
	`224`	`+ return q.database.GetWorkspaceOwnerCountsByTemplateIDs(ctx, allowed)`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`func (q *AuthzQuerier) GetWorkspaceResourceByID(ctx context.Context, id uuid.UUID) (database.WorkspaceResource, error) {`