add resolvers for optional target service account and team instead of…

… returning ID/slug
nais · Feb 8, 2024 · 50105f9 · 50105f9
1 parent 7ba5cd3
commit 50105f9
Show file tree

Hide file tree

Showing 21 changed files with 465 additions and 138 deletions.
diff --git a/internal/database/gensql/mock_querier.go b/internal/database/gensql/mock_querier.go
diff --git a/internal/database/gensql/querier.go b/internal/database/gensql/querier.go
diff --git a/internal/database/gensql/service_accounts.sql.go b/internal/database/gensql/service_accounts.sql.go
diff --git a/internal/database/mock_database.go b/internal/database/mock_database.go
diff --git a/internal/database/queries/service_accounts.sql b/internal/database/queries/service_accounts.sql
@@ -24,3 +24,8 @@ WHERE id = @id;
 SELECT * FROM service_account_roles
 WHERE service_account_id = @service_account_id
 ORDER BY role_name ASC;
+
+-- name: GetServiceAccountsByIDs :many
+SELECT * FROM service_accounts
+WHERE id = ANY(@ids::uuid[])
+ORDER BY name ASC;
diff --git a/internal/database/service_accounts.go b/internal/database/service_accounts.go
@@ -17,6 +17,7 @@ type ServiceAccountRepo interface {
 	GetServiceAccountByName(ctx context.Context, name string) (*ServiceAccount, error)
 	GetServiceAccountRoles(ctx context.Context, serviceAccountID uuid.UUID) ([]*authz.Role, error)
 	GetServiceAccounts(ctx context.Context) ([]*ServiceAccount, error)
+	GetServiceAccountsByIDs(ctx context.Context, ids []uuid.UUID) ([]*ServiceAccount, error)
 	RemoveAllServiceAccountRoles(ctx context.Context, serviceAccountID uuid.UUID) error
 	RemoveApiKeysFromServiceAccount(ctx context.Context, serviceAccountID uuid.UUID) error
 }
@@ -78,6 +79,20 @@ func (d *database) GetServiceAccounts(ctx context.Context) ([]*ServiceAccount, e
 	return serviceAccounts, nil
 }
 
+func (d *database) GetServiceAccountsByIDs(ctx context.Context, ids []uuid.UUID) ([]*ServiceAccount, error) {
+	rows, err := d.querier.GetServiceAccountsByIDs(ctx, ids)
+	if err != nil {
+		return nil, err
+	}
+
+	serviceAccounts := make([]*ServiceAccount, 0)
+	for _, row := range rows {
+		serviceAccounts = append(serviceAccounts, &ServiceAccount{ServiceAccount: row})
+	}
+
+	return serviceAccounts, nil
+}
+
 func (d *database) DeleteServiceAccount(ctx context.Context, serviceAccountID uuid.UUID) error {
 	return d.querier.DeleteServiceAccount(ctx, serviceAccountID)
 }

diff --git a/internal/graph/authentication.resolvers.go b/internal/graph/authentication.resolvers.go