fix: issue #6131 e2e fix

aws-amplify · Feb 1, 2021 · 32c38f5 · 32c38f5
1 parent b09ccf0
commit 32c38f5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/packages/amplify-category-storage/src/index.js b/packages/amplify-category-storage/src/index.js
@@ -71,14 +71,17 @@ async function getPermissionPolicies(context, resourceOpsMapping) {
 
       if (providerPlugin) {
         const providerController = require(`./provider-utils/${providerPlugin}`);
-        const { policies, attributes } = providerController.getPermissionPolicies(
+        const { policy, attributes } = providerController.getPermissionPolicies(
           context,
           service,
           resourceName,
           resourceOpsMapping[resourceName],
         );
-
-        permissionPolicies.push(...policies);
+        if (Array.isArray(policy)) {
+          permissionPolicies.push(...policy);
+        } else {
+          permissionPolicies.push(policy);
+        }
         resourceAttributes.push({ resourceName, attributes, category });
       } else {
         context.print.error(`Provider not configured for ${category}: ${resourceName}`);

diff --git a/...egory-storage/src/provider-utils/awscloudformation/service-walkthroughs/s3-walkthrough.js b/...egory-storage/src/provider-utils/awscloudformation/service-walkthroughs/s3-walkthrough.js
@@ -1299,7 +1299,7 @@ function convertToCRUD(parameters, answers) {
 }
 
 export const getIAMPolicies = (resourceName, crudOptions) => {
-  let policies = [];
+  let policy = [];
   let actions = new Set();
 
   crudOptions.forEach(crudOption => {
@@ -1323,8 +1323,8 @@ export const getIAMPolicies = (resourceName, crudOptions) => {
   });
 
   actions = Array.from(actions);
-  let listBucketPolicy = {};
   if (actions.includes('s3:ListBucket')) {
+    let listBucketPolicy = {};
     listBucketPolicy = {
       Effect: 'Allow',
       Action: 's3:ListBucket',
@@ -1343,8 +1343,9 @@ export const getIAMPolicies = (resourceName, crudOptions) => {
       ],
     };
     actions = actions.filter(action => action != 's3:ListBucket');
+    policy.push(listBucketPolicy);
   }
-  let policy = {
+  let s3ObjectPolicy = {
     Effect: 'Allow',
     Action: actions,
     Resource: [
@@ -1362,11 +1363,10 @@ export const getIAMPolicies = (resourceName, crudOptions) => {
       },
     ],
   };
-  // push both policies
-  policies.push(policy, listBucketPolicy);
+  policy.push(s3ObjectPolicy);
   const attributes = ['BucketName'];
 
-  return { policies, attributes };
+  return { policy, attributes };
 };
 
 function getTriggersForLambdaConfiguration(protectionLevel, functionName) {