Merge pull request #520 from awslabs/issue-519

Fix Issue 519

Author: philcaixeta

cloudformation/template.yaml

@@ -1832,6 +1832,7 @@ Resources:
             Action:
               - lambda:CreateFunction
               - lambda:GetFunction
+              - lambda:GetFunctionConfiguration
               - lambda:UpdateFunctionCode
               - lambda:PublishVersion
             Resource: arn:aws:lambda:*:*:*

lambdas/cloudfront-security/replicator.js

@@ -63,7 +63,8 @@ exports.handler = async (event, context) => {
           Runtime: 'nodejs12.x',
           Timeout: 1
         }).promise()
-
+        await lambdaEdge.waitFor('functionExists', { FunctionName: functionName }).promise()
+        await lambdaEdge.waitFor('functionActive', { FunctionName: functionName, $waiter: { delay: 2, maxAttempts: 5 } }).promise()
         console.log('Publishing initial version')
         versionResult = await lambdaEdge.publishVersion({
           FunctionName: createResult.FunctionArn
@@ -75,6 +76,7 @@ exports.handler = async (event, context) => {
           FunctionName: functionName,
           Publish: true
         }).promise()
+        await lambdaEdge.waitFor('functionUpdated', { FunctionName: functionName }).promise()
       }
 
       console.log('Saving to S3')