diff --git a/src/react/ui-elements/SelectAccountIAMRole.tsx b/src/react/ui-elements/SelectAccountIAMRole.tsx index 1a1a88ec2..5a636818c 100644 --- a/src/react/ui-elements/SelectAccountIAMRole.tsx +++ b/src/react/ui-elements/SelectAccountIAMRole.tsx @@ -1,10 +1,4 @@ -import { - Form, - FormGroup, - FormSection, - Stack, - useToast, -} from '@scality/core-ui'; +import { Form, FormGroup, FormSection, useToast } from '@scality/core-ui'; import { Select } from '@scality/core-ui/dist/next'; import { IAM } from 'aws-sdk'; import { Bucket } from 'aws-sdk/clients/s3'; @@ -26,7 +20,7 @@ import { } from '../next-architecture/ui/AccessibleAccountsAdapterProvider'; import { AccountsLocationsEndpointsAdapterProvider } from '../next-architecture/ui/AccountsLocationsEndpointsAdapterProvider'; import { getListRolesQuery } from '../queries'; -import { SCALITY_INTERNAL_ROLES, regexArn } from '../utils/hooks'; +import { SCALITY_IAM_ROLES, regexArn } from '../utils/hooks'; class NoOpMetricsAdapter implements IMetricsAdapter { async listBucketsLatestUsedCapacity( @@ -234,7 +228,7 @@ const SelectAccountIAMRoleWithAccount = ( const roles = props.filterOutInternalRoles ? allRolesExceptHiddenOnes.filter((role) => { return ( - SCALITY_INTERNAL_ROLES.includes(role.RoleName) || + SCALITY_IAM_ROLES.includes(role.RoleName) || !role.Arn.includes('role/scality-internal') ); }) diff --git a/src/react/utils/hooks.ts b/src/react/utils/hooks.ts index fd4e84486..7b9388187 100644 --- a/src/react/utils/hooks.ts +++ b/src/react/utils/hooks.ts @@ -156,6 +156,12 @@ export const STORAGE_ACCOUNT_OWNER_ROLE = 'storage-account-owner-role'; const DATA_CONSUMER_ROLE = 'data-consumer-role'; const DATA_ACCESSOR_ROLE = 'data-accessor-role'; export const SCALITY_INTERNAL_ROLES = [ + STORAGE_MANAGER_ROLE, + STORAGE_ACCOUNT_OWNER_ROLE, + DATA_CONSUMER_ROLE, + DATA_ACCESSOR_ROLE, +]; +export const SCALITY_IAM_ROLES = [ STORAGE_ACCOUNT_OWNER_ROLE, DATA_CONSUMER_ROLE, DATA_ACCESSOR_ROLE,