Merge pull request #5 from aws-solutions/release/v1.0.2

Release v1.0.2

Author: mobri2a

.gitignore

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.2] - 2021-12-31
+### Fixed
+- Custom Resource Lambda function failing to publish a new version of the Lambda edge function.
+
 ## [1.0.1] - 2021-09-01
 ### Changed
 - Update Lambda versions to Node.js 14.

CHANGELOG.md

@@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution.
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check existing open, or recently closed, issues to make sure somebody else hasn't already
+When filing an issue, please check [existing open](https://github.com/aws-solutions/operations-conductor/issues), or [recently closed](https://github.com/aws-solutions/operations-conductor/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
@@ -41,7 +41,7 @@ GitHub provides additional document on [forking a repository](https://help.githu
 
 
 ## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start.
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws-solutions/operations-conductor/labels/help%20wanted) issues is a great place to start.
 
 
 ## Code of Conduct
@@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-See the [LICENSE](LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/aws-solutions/operations-conductor/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

CONTRIBUTING.md

@@ -49,7 +49,6 @@ aws s3 cp $OPS_CO_PATH/deployment/regional-s3-assets/ s3://$DIST_OUTPUT_BUCKET-$
 ## Collection of operational metrics
 This solution collects anonymous operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/operations-conductor/appendix-f.html).
 
-
 ***
 
 Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -58,4 +57,4 @@ Licensed under the Apache License, Version 2.0 (the "License"). You may not use
 
     http://www.apache.org/licenses/LICENSE-2.0
 
-or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

README.md

@@ -9,7 +9,7 @@
 # Parameters:
 #  - source-bucket-base-name: Name for the S3 bucket location where the template will source the Lambda
 #    code from. The template will append '-[region_name]' to this bucket name.
-#    For example: ./build-s3-dist.sh solutions my-solution v1.0.1
+#    For example: ./build-s3-dist.sh solutions my-solution v1.0.2
 #    The template will then expect the source code to be located in the solutions-[region_name] bucket
 #
 #  - trademarked-solution-name: name of the solution for consistency
@@ -19,7 +19,7 @@
 # Check to see if input has been provided:
 if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
     echo "Please provide the base source bucket name, trademark approved solution name and version where the lambda code will eventually reside."
-    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.0.1"
+    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.0.2"
     exit 1
 fi
 

deployment/build-s3-dist.sh

@@ -252,6 +252,7 @@ Resources:
                             - "lambda:CreateFunction"
                             - "lambda:PublishVersion"
                             - "lambda:UpdateFunctionConfiguration"
+                            - "lambda:GetFunctionConfiguration"
                         Resource:
                             - !Sub "arn:aws:lambda:us-east-1:${AWS::AccountId}:function:${AWS::StackName}-Lambda-Edge"
                     # To create/delete UserPoolClient by custom resource

deployment/operations-conductor.template

@@ -1,7 +1,7 @@
 {
     "name": "operations-conductor-console",
     "description": "The Operations Conductor Web console",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "private": true,
     "dependencies": {
         "aws-amplify": "^1.2.3",

source/console/package.json

@@ -186,12 +186,30 @@ export const handler = async (event: any, context: Context, callback: Callback)
                     LOGGER.error('Creating Edge Lambda failed.', error);
                     throw Error('Creating Edge Lambda failed.');
                 }
-
+                
                 // Publishes Edge Lambda version
                 try {
+                    let isFunctionStateActive = false
+                    let retry = 0
+                    let delayinMilliseconds = 5000;
+                    while (!isFunctionStateActive) {
+                        let response = await lambda.getFunctionConfiguration({
+                            FunctionName: functionArn
+                        }).promise();
+                        LOGGER.debug(`Response from get function configuration ${JSON.stringify(response)}`)
+                        if(response.State === 'Active' || retry > 10) {
+                            isFunctionStateActive = true
+                        } else {
+                            await waitForTime(delayinMilliseconds)
+                            retry++
+                            delayinMilliseconds += 5000;
+                        }
+                    }
+
                     let params: AWS.Lambda.PublishVersionRequest = {
                         FunctionName: functionArn
                     };
+
                     let result = await lambda.publishVersion(params).promise();
                     responseData = {
                         FunctionArn: `${functionArn}:${result.Version}`
@@ -220,9 +238,27 @@ export const handler = async (event: any, context: Context, callback: Callback)
                 }
                 // Publishes Edge Lambda version
                 try {
+                    let isFunctionStateActive = false
+                    let retry = 0
+                    let delayinMilliseconds = 5000
+                    while (!isFunctionStateActive) {
+                        let response = await lambda.getFunctionConfiguration({
+                            FunctionName: functionArn
+                        }).promise();
+                        LOGGER.debug(`Response from get function configuration ${JSON.stringify(response)}`)
+                        if(response.State === 'Active' || retry > 10) {
+                            isFunctionStateActive = true
+                        } else {
+                            await waitForTime(delayinMilliseconds)
+                            retry++
+                            delayinMilliseconds += 5000;
+                        }
+                    }
+
                     let params: AWS.Lambda.PublishVersionRequest = {
                         FunctionName: functionArn
                     };
+                    
                     let result = await lambda.publishVersion(params).promise();
                     responseData = {
                         FunctionArn: `${functionArn}:${result.Version}`
@@ -498,4 +534,11 @@ const sendResponse = async (event: any, callback: Function, logStreamName: strin
         LOGGER.error('Custom resource sendResponse error', error);
         callback(error);
     }
+};
+
+/** Function to add delay for waiting on process. 
+ * @param ms time in milliseconds
+*/
+const waitForTime = async (ms: number) => {
+    return new Promise(resolve => setTimeout(resolve, ms));
 };

source/services/custom-resource/index.ts

@@ -1,6 +1,6 @@
 {
     "name": "operations-conductor-services",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "Operations Conductor solution services Lambda function package",
     "main": "index.js",
     "scripts": {