fix: addressed pr comments

aws-amplify · Oct 7, 2021 · 5e962ef · 5e962ef
1 parent 5600064
commit 5e962ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/amplify-category-api/src/provider-utils/awscloudformation/base-api-stack.ts b/packages/amplify-category-api/src/provider-utils/awscloudformation/base-api-stack.ts
@@ -498,17 +498,19 @@ export abstract class ContainersStack extends cdk.Stack {
     return `https://${region}.console.aws.amazon.com/codesuite/codepipeline/pipelines/${pipelineName}/view`;
   }
   toCloudFormation() {
-    this.node.findAll().forEach(construct => {
-      if (construct instanceof CfnFunction) {
-        const lambdaFunction = construct as CfnFunction;
+    this.node
+      .findAll()
+      .filter(construct => construct instanceof CfnFunction)
+      .map(construct => construct as CfnFunction)
+      .forEach(lambdaFunction => {
         if (lambdaFunction.logicalId.includes('AwaiterMyProvider')) {
           lambdaFunction.code = {
             s3Bucket: this.deploymentBucketName,
             s3Key: this.awaiterS3Key,
           };
         }
-      }
-    });
+      });
+
     prepareApp(this);
 
     const cfn = this._toCloudFormation();

diff --git a/packages/amplify-provider-awscloudformation/src/push-resources.ts b/packages/amplify-provider-awscloudformation/src/push-resources.ts
@@ -1012,7 +1012,7 @@ async function formNestedStack(
           }
         }
 
-        if (category === 'api' && resourceDetails.service === ApiServiceNameElasticContainer) {
+        if ((category === 'api' || category === 'hosting') && resourceDetails.service === ApiServiceNameElasticContainer) {
           parameters['deploymentBucketName'] = Fn.Ref('DeploymentBucketName');
           parameters['rootStackName'] = Fn.Ref('AWS::StackName');
         }