Skip to content

Commit

Permalink
Merge branch 'improvement/ARSN-400-scuba-admin' into q/7.10
Browse files Browse the repository at this point in the history
  • Loading branch information
bert-e committed Feb 26, 2024
2 parents f189185 + 2c3bfb1 commit 9bf1bcc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/policyEvaluator/RequestContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function _buildArn(
}
case 'scuba': {
return `arn:scality:scuba::${requesterInfo!.accountid}:` +
`${generalResource}/${specificResource || ''}`;
`${generalResource}${specificResource ? '/' + specificResource : ''}`;
}
default:
return undefined;
Expand Down
4 changes: 4 additions & 0 deletions lib/policyEvaluator/utils/actionMaps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ const actionMapMetadata = {

const actionMapScuba = {
GetMetrics: 'scuba:GetMetrics',
AdminStartIngest: 'scuba:AdminStartIngest',
AdminStopIngest: 'scuba:AdminStopIngest',
AdminReadRaftCseq: 'scuba:AdminReadRaftCseq',
AdminTriggerRepair: 'scuba:AdminTriggerRepair',
};

export {
Expand Down

0 comments on commit 9bf1bcc

Please sign in to comment.