fix: use principal.username (#1232)

awslabs · Oct 16, 2023 · e21163f · e21163f
1 parent de56ffc
commit e21163f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/...services/lib/data-source/access-strategy/roles-only/__tests__/vpce-policy-service.test.js b/...services/lib/data-source/access-strategy/roles-only/__tests__/vpce-policy-service.test.js
@@ -87,7 +87,7 @@ describe('VPCE Policy Service', () => {
   let awsAccountsService;
   let aws;
   let awsCfnService;
-  const requestContext = { principalIdentifier: { username: 'sampleUsername' } };
+  const requestContext = { principal: { username: 'sampleUsername' } };
   const studyEntity = { id: 'sampleBYOBstudyId' };
   const projectId = 'sampleProjectId';
   const awsAccountId = 'sampleAwsAccountId';
@@ -147,7 +147,7 @@ describe('VPCE Policy Service', () => {
       // CHECK
       expect(mockAssumeRole).toHaveBeenCalledWith({
         RoleArn: roleArn,
-        RoleSessionName: `RaaS-${requestContext.principalIdentifier.username}`,
+        RoleSessionName: `RaaS-${requestContext.principal.username}`,
         ExternalId: externalId,
       });
     });
@@ -157,7 +157,7 @@ describe('VPCE Policy Service', () => {
       studyService.mustFind = jest.fn().mockReturnValue(projectId);
       projectService.getAccountForProjectId = jest.fn().mockReturnValue(awsAccountId);
       awsAccountsService.mustFind = jest.fn().mockReturnValue({ roleArn, externalId });
-      requestContext.principalIdentifier.username = undefined;
+      requestContext.principal.username = undefined;
 
       // OPERATE n CHECK
       await expect(service.getEc2ServiceForStudy(requestContext, studyEntity)).rejects.toThrow();

diff --git a/...ages/base-raas-services/lib/data-source/access-strategy/roles-only/vpce-policy-service.js b/...ages/base-raas-services/lib/data-source/access-strategy/roles-only/vpce-policy-service.js
@@ -49,15 +49,15 @@ class VpcePolicyService extends Service {
     });
 
     const sts = new this.aws.sdk.STS();
-    if (!requestContext.principalIdentifier.username) {
+    if (!requestContext.principal.username) {
       throw new Error('Username is required');
     }
     const {
       Credentials: { AccessKeyId: accessKeyId, SecretAccessKey: secretAccessKey, SessionToken: sessionToken },
     } = await sts
       .assumeRole({
         RoleArn,
-        RoleSessionName: `RaaS-${requestContext.principalIdentifier.username}`,
+        RoleSessionName: `RaaS-${requestContext.principal.username}`,
         ExternalId,
       })
       .promise();

diff --git a/...environment-sc-workflow-steps/lib/steps/start-ec2-environment/start-ec2-environment-sc.js b/...environment-sc-workflow-steps/lib/steps/start-ec2-environment/start-ec2-environment-sc.js
@@ -106,7 +106,7 @@ class StartEc2EnvironmentSc extends StepBase {
     } = await sts
       .assumeRole({
         RoleArn,
-        RoleSessionName: `RaaS-${requestContext.principalIdentifier.username}`,
+        RoleSessionName: `RaaS-${requestContext.principal.username}`,
         ExternalId,
       })
       .promise();

diff --git a/...ent-sc-workflow-steps/lib/steps/start-rstudio-environment/start-rstudio-environment-sc.js b/...ent-sc-workflow-steps/lib/steps/start-rstudio-environment/start-rstudio-environment-sc.js
@@ -110,7 +110,7 @@ class StartRStudioEnvironmentSc extends StepBase {
     } = await sts
       .assumeRole({
         RoleArn,
-        RoleSessionName: `RaaS-${requestContext.principalIdentifier.username}`,
+        RoleSessionName: `RaaS-${requestContext.principal.username}`,
         ExternalId,
       })
       .promise();

diff --git a/...sc-workflow-steps/lib/steps/start-sagemaker-environment/start-sagemaker-environment-sc.js b/...sc-workflow-steps/lib/steps/start-sagemaker-environment/start-sagemaker-environment-sc.js
@@ -112,7 +112,7 @@ class StartSagemakerEnvironmentSc extends StepBase {
     } = await sts
       .assumeRole({
         RoleArn,
-        RoleSessionName: `RaaS-${requestContext.principalIdentifier.username}`,
+        RoleSessionName: `RaaS-${requestContext.principal.username}`,
         ExternalId,
       })
       .promise();

diff --git a/...s/environment-sc-workflow-steps/lib/steps/stop-ec2-environment/stop-ec2-environment-sc.js b/...s/environment-sc-workflow-steps/lib/steps/stop-ec2-environment/stop-ec2-environment-sc.js
@@ -110,7 +110,7 @@ class StopEc2EnvironmentSc extends StepBase {
     } = await sts
       .assumeRole({
         RoleArn,
-        RoleSessionName: `RaaS-${requestContext.principalIdentifier.username}`,
+        RoleSessionName: `RaaS-${requestContext.principal.username}`,
         ExternalId,
       })
       .promise();

diff --git a/...t-sc-workflow-steps/lib/steps/stop-sagemaker-environment/stop-sagemaker-environment-sc.js b/...t-sc-workflow-steps/lib/steps/stop-sagemaker-environment/stop-sagemaker-environment-sc.js
@@ -113,7 +113,7 @@ class StopSagemakerEnvironmentSc extends StepBase {
     } = await sts
       .assumeRole({
         RoleArn,
-        RoleSessionName: `RaaS-${requestContext.principalIdentifier.username}`,
+        RoleSessionName: `RaaS-${requestContext.principal.username}`,
         ExternalId,
       })
       .promise();