fix(rbac): move admin creation to the admin-permissions directory

janus-idp · Oct 21, 2024 · dcb9437 · dcb9437
1 parent c3325e2
commit dcb9437
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/...c/file-permissions/admin-creation.test.ts → .../admin-permissions/admin-creation.test.ts b/...c/file-permissions/admin-creation.test.ts → .../admin-permissions/admin-creation.test.ts
diff --git a/...nd/src/file-permissions/admin-creation.ts → ...d/src/admin-permissions/admin-creation.ts b/...nd/src/file-permissions/admin-creation.ts → ...d/src/admin-permissions/admin-creation.ts
diff --git a/plugins/rbac-backend/src/file-permissions/csv-file-watcher.test.ts b/plugins/rbac-backend/src/file-permissions/csv-file-watcher.test.ts
@@ -16,12 +16,12 @@ import type { Source } from '@janus-idp/backstage-plugin-rbac-common';
 
 import { resolve } from 'path';
 
+import { ADMIN_ROLE_AUTHOR } from '../admin-permissions/admin-creation';
 import { CasbinDBAdapterFactory } from '../database/casbin-adapter-factory';
 import {
   RoleMetadataDao,
   RoleMetadataStorage,
 } from '../database/role-metadata';
-import { ADMIN_ROLE_AUTHOR } from '../file-permissions/admin-creation';
 import { BackstageRoleManager } from '../role-manager/role-manager';
 import { EnforcerDelegate } from '../service/enforcer-delegate';
 import { MODEL } from '../service/permission-model';

diff --git a/plugins/rbac-backend/src/helper.test.ts b/plugins/rbac-backend/src/helper.test.ts
@@ -1,5 +1,5 @@
+import { ADMIN_ROLE_AUTHOR } from './admin-permissions/admin-creation';
 import { RoleMetadataDao } from './database/role-metadata';
-import { ADMIN_ROLE_AUTHOR } from './file-permissions/admin-creation';
 import {
   deepSortedEqual,
   isPermissionAction,

diff --git a/plugins/rbac-backend/src/service/enforcer-delegate.ts b/plugins/rbac-backend/src/service/enforcer-delegate.ts
@@ -3,11 +3,11 @@ import { Knex } from 'knex';
 
 import EventEmitter from 'events';
 
+import { ADMIN_ROLE_NAME } from '../admin-permissions/admin-creation';
 import {
   RoleMetadataDao,
   RoleMetadataStorage,
 } from '../database/role-metadata';
-import { ADMIN_ROLE_NAME } from '../file-permissions/admin-creation';
 import { mergeRoleMetadata, policiesToString, policyToString } from '../helper';
 import { MODEL } from './permission-model';
 

diff --git a/plugins/rbac-backend/src/service/permission-policy.test.ts b/plugins/rbac-backend/src/service/permission-policy.test.ts
@@ -25,13 +25,13 @@ import type { RoleMetadata } from '@janus-idp/backstage-plugin-rbac-common';
 
 import { resolve } from 'path';
 
+import { ADMIN_ROLE_NAME } from '../admin-permissions/admin-creation';
 import { CasbinDBAdapterFactory } from '../database/casbin-adapter-factory';
 import { ConditionalStorage } from '../database/conditional-storage';
 import {
   RoleMetadataDao,
   RoleMetadataStorage,
 } from '../database/role-metadata';
-import { ADMIN_ROLE_NAME } from '../file-permissions/admin-creation';
 import { BackstageRoleManager } from '../role-manager/role-manager';
 import { EnforcerDelegate } from './enforcer-delegate';
 import { MODEL } from './permission-model';

diff --git a/plugins/rbac-backend/src/service/permission-policy.ts b/plugins/rbac-backend/src/service/permission-policy.ts
@@ -29,6 +29,10 @@ import {
   toPermissionAction,
 } from '@janus-idp/backstage-plugin-rbac-common';
 
+import {
+  setAdminPermissions,
+  useAdminsFromConfig,
+} from '../admin-permissions/admin-creation';
 import {
   createPermissionEvaluationOptions,
   EVALUATE_PERMISSION_ACCESS_STAGE,
@@ -37,10 +41,6 @@ import {
 import { replaceAliases } from '../conditional-aliases/alias-resolver';
 import { ConditionalStorage } from '../database/conditional-storage';
 import { RoleMetadataStorage } from '../database/role-metadata';
-import {
-  setAdminPermissions,
-  useAdminsFromConfig,
-} from '../file-permissions/admin-creation';
 import { CSVFileWatcher } from '../file-permissions/csv-file-watcher';
 import { YamlConditinalPoliciesFileWatcher } from '../file-permissions/yaml-conditional-file-watcher';
 import { EnforcerDelegate } from './enforcer-delegate';