Test all api key methods

Emyrk · Emyrk · commit 0add01a23e75 · 2023-02-02T15:38:15.000-06:00
diff --git a/coderd/authzquery/apikey.go b/coderd/authzquery/apikey.go
@@ -27,14 +27,14 @@ func (q *AuthzQuerier) GetAPIKeysLastUsedAfter(ctx context.Context, lastUsed tim
 
 func (q *AuthzQuerier) InsertAPIKey(ctx context.Context, arg database.InsertAPIKeyParams) (database.APIKey, error) {
 	return authorizedInsertWithReturn(q.logger, q.authorizer,
-		rbac.ActionRead,
+		rbac.ActionCreate,
 		rbac.ResourceAPIKey.WithOwner(arg.UserID.String()),
 		q.database.InsertAPIKey)(ctx, arg)
 }
 
 func (q *AuthzQuerier) UpdateAPIKeyByID(ctx context.Context, arg database.UpdateAPIKeyByIDParams) error {
 	fetch := func(ctx context.Context, arg database.UpdateAPIKeyByIDParams) (database.APIKey, error) {
-		return q.GetAPIKeyByID(ctx, arg.ID)
+		return q.database.GetAPIKeyByID(ctx, arg.ID)
 	}
 	return authorizedUpdate(q.logger, q.authorizer, fetch, q.database.UpdateAPIKeyByID)(ctx, arg)
 }
diff --git a/coderd/authzquery/apikey_test.go b/coderd/authzquery/apikey_test.go
@@ -0,0 +1,60 @@
+package authzquery_test
+
+import (
+	"testing"
+	"time"
+
+	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/dbgen"
+	"github.com/coder/coder/coderd/rbac"
+)
+
+func (suite *MethodTestSuite) TestAPIKey() {
+	suite.Run("DeleteAPIKeyByID", func() {
+		suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
+			key, _ := dbgen.APIKey(t, db, database.APIKey{})
+			return methodCase(inputs(key.ID), asserts(key, rbac.ActionDelete))
+		})
+	})
+	suite.Run("GetAPIKeyByID", func() {
+		suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
+			key, _ := dbgen.APIKey(t, db, database.APIKey{})
+			return methodCase(inputs(key.ID), asserts(key, rbac.ActionRead))
+		})
+	})
+	suite.Run("GetAPIKeysByLoginType", func() {
+		suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
+			a, _ := dbgen.APIKey(t, db, database.APIKey{LoginType: database.LoginTypePassword})
+			b, _ := dbgen.APIKey(t, db, database.APIKey{LoginType: database.LoginTypePassword})
+			_, _ = dbgen.APIKey(t, db, database.APIKey{LoginType: database.LoginTypeGithub})
+			return methodCase(inputs(database.LoginTypePassword), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
+		})
+	})
+	suite.Run("GetAPIKeysLastUsedAfter", func() {
+		suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
+			a, _ := dbgen.APIKey(t, db, database.APIKey{LastUsed: time.Now().Add(time.Hour)})
+			b, _ := dbgen.APIKey(t, db, database.APIKey{LastUsed: time.Now().Add(time.Hour)})
+			_, _ = dbgen.APIKey(t, db, database.APIKey{LastUsed: time.Now().Add(-time.Hour)})
+			return methodCase(inputs(time.Now()), asserts(a, rbac.ActionRead, b, rbac.ActionRead))
+		})
+	})
+	suite.Run("InsertAPIKey", func() {
+		suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
+			u := dbgen.User(t, db, database.User{})
+			return methodCase(inputs(database.InsertAPIKeyParams{
+				UserID:    u.ID,
+				LoginType: database.LoginTypePassword,
+				Scope:     database.APIKeyScopeAll,
+			}), asserts(rbac.ResourceAPIKey.WithOwner(u.ID.String()), rbac.ActionCreate))
+		})
+	})
+	suite.Run("UpdateAPIKeyByID", func() {
+		suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
+			a, _ := dbgen.APIKey(t, db, database.APIKey{})
+			return methodCase(inputs(database.UpdateAPIKeyByIDParams{
+				ID:       a.ID,
+				LastUsed: time.Now(),
+			}), asserts(a, rbac.ActionUpdate))
+		})
+	})
+}

Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,14 @@ func (q *AuthzQuerier) GetAPIKeysLastUsedAfter(ctx context.Context, lastUsed tim`
`27`	`27`
`28`	`28`	`func (q *AuthzQuerier) InsertAPIKey(ctx context.Context, arg database.InsertAPIKeyParams) (database.APIKey, error) {`
`29`	`29`	`return authorizedInsertWithReturn(q.logger, q.authorizer,`
`30`		`- rbac.ActionRead,`
	`30`	`+ rbac.ActionCreate,`
`31`	`31`	`rbac.ResourceAPIKey.WithOwner(arg.UserID.String()),`
`32`	`32`	`q.database.InsertAPIKey)(ctx, arg)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (q *AuthzQuerier) UpdateAPIKeyByID(ctx context.Context, arg database.UpdateAPIKeyByIDParams) error {`
`36`	`36`	`fetch := func(ctx context.Context, arg database.UpdateAPIKeyByIDParams) (database.APIKey, error) {`
`37`		`- return q.GetAPIKeyByID(ctx, arg.ID)`
	`37`	`+ return q.database.GetAPIKeyByID(ctx, arg.ID)`
`38`	`38`	`}`
`39`	`39`	`return authorizedUpdate(q.logger, q.authorizer, fetch, q.database.UpdateAPIKeyByID)(ctx, arg)`
`40`	`40`	`}`