Update to version v1.0.1

aws-solutions · Sep 1, 2021 · b34da87 · b34da87
1 parent 27af406
commit b34da87
Show file tree

Hide file tree

Showing 47 changed files with 550 additions and 451 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ 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.1] - 2021-09-01
+### Changed
+- Update Lambda versions to Node.js 14.
+- Update to the node depdendencies.
+
 ## [1.0.0] - 2019-11-13
 ### Added
-- Operations Conductor release
+- Operations Conductor release
diff --git a/LICENSE.MIT-0 b/LICENSE.MIT-0
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,16 +1,18 @@
 Operations Conductor Reference Architecture
-Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License").
 You may not use this file except in compliance with the License.
-A copy of the License is located at
+You may obtain a copy of the License at
 
     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 lithe Massachusetts Institute of Technology (MIT) licenseations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License 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.
 
 **********************
 THIRD PARTY COMPONENTS

diff --git a/README.md b/README.md
@@ -46,8 +46,16 @@ aws s3 cp $OPS_CO_PATH/deployment/regional-s3-assets/ s3://$DIST_OUTPUT_BUCKET-$
 * Get the link of the operations-conductor.template uploaded to your Amazon S3 bucket.
 * Deploy the Operations Conductor solution to your account by launching a new AWS CloudFormation stack using the link of the operations-conductor.template.
 
+## 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.
 
-This project is licensed under the terms of the Apache 2.0 license. See LICENSE. Included AWS Lambda functions are licensed under the MIT-0 license. See LICENSE.MIT-0.
+Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the License. A copy of the License is located at
+
+    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.
diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh
@@ -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.0
+#    For example: ./build-s3-dist.sh solutions my-solution v1.0.1
 #    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.0"
+    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.0.1"
     exit 1
 fi
 

diff --git a/deployment/operations-conductor.template b/deployment/operations-conductor.template
@@ -1,15 +1,16 @@
-# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License").
 # You may not use this file except in compliance with the License.
-# A copy of the License is located at
+# You may obtain a copy of the License is located at
 #
 #     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.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License 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.
 
 AWSTemplateFormatVersion: "2010-09-09"
 Description: "(SO0065) - The AWS CloudFormation template for deployment of the %%SOLUTION_NAME%% Solution. Version %%VERSION%%"
@@ -250,6 +251,7 @@ Resources:
                         Action:
                             - "lambda:CreateFunction"
                             - "lambda:PublishVersion"
+                            - "lambda:UpdateFunctionConfiguration"
                         Resource:
                             - !Sub "arn:aws:lambda:us-east-1:${AWS::AccountId}:function:${AWS::StackName}-Lambda-Edge"
                     # To create/delete UserPoolClient by custom resource
@@ -1338,9 +1340,10 @@ Resources:
         Metadata:
             cfn_nag:
                 rules_to_suppress:
-                    -
-                        id: W45
-                        reason: "This solution does not require API Gateway access logging."
+                    - id: W45
+                      reason: "This solution does not require API Gateway access logging."
+                    - id: W68
+                      reason: "The solution has a very small footprint in the API gateway, only the solution's UI uses the end points which have limited usage scenarios."
 
     # Lambda Functions
     CustomResourceLambda:
@@ -1352,12 +1355,21 @@ Resources:
                 S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"],  "operations-conductor-services.zip"]]
             Handler: custom-resource/index.handler
             Role: !GetAtt CustomResourceRole.Arn
-            Runtime: nodejs10.x
+            Runtime: nodejs14.x
             MemorySize: 256
             Timeout: 300
             Environment:
                 Variables:
                     LogLevel: !Ref LogLevel
+        Metadata:
+            cfn_nag:
+                rules_to_suppress:
+                - id: W58
+                  reason: "Lambda functions have permission to write to logs in CustomResourcePolicy."
+                - id: W89
+                  reason: "This Lambda function does not need to access any resource provisioned within a VPC."
+                - id: W92
+                  reason: "This Lambda function does not need to reserved concurrency."
 
     UserServiceLambda:
         Type: AWS::Lambda::Function
@@ -1368,7 +1380,7 @@ Resources:
                 S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"],  "operations-conductor-services.zip"]]
             Handler: users/index.handler
             Role: !GetAtt UserServiceRole.Arn
-            Runtime: nodejs10.x
+            Runtime: nodejs14.x
             MemorySize: 256
             Timeout: 60
             Environment:
@@ -1379,6 +1391,15 @@ Resources:
                     SolutionVersion: !FindInMap ["Solution", "Data", "Version"]
                     SolutionUuid: !GetAtt CustomResourceAppUuid.UUID
                     LogLevel: !Ref LogLevel
+        Metadata:
+            cfn_nag:
+                rules_to_suppress:
+                - id: W58
+                  reason: "Lambda functions have permission to write to logs in UserServicePolicy."
+                - id: W89
+                  reason: "This Lambda function does not need to access any resource provisioned within a VPC."
+                - id: W92
+                  reason: "This Lambda function does not need to reserved concurrency."
 
     TaskServiceLambda:
         Type: AWS::Lambda::Function
@@ -1389,7 +1410,7 @@ Resources:
                 S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"],  "operations-conductor-services.zip"]]
             Handler: tasks/index.handler
             Role: !GetAtt TaskServiceRole.Arn
-            Runtime: nodejs10.x
+            Runtime: nodejs14.x
             MemorySize: 256
             Timeout: 60
             Environment:
@@ -1408,6 +1429,15 @@ Resources:
                     MasterKmsArn: !GetAtt SnsEncryptionKey.Arn
                     Region: !Ref "AWS::Region"
                     LogLevel: !Ref LogLevel
+        Metadata:
+            cfn_nag:
+                rules_to_suppress:
+                - id: W58
+                  reason: "Lambda functions have permission to write to logs in TaskServicePolicy."
+                - id: W89
+                  reason: "This Lambda function does not need to access any resource provisioned within a VPC."
+                - id: W92
+                  reason: "This Lambda function does not need to reserved concurrency." 
 
     ActionServiceLambda:
         Type: AWS::Lambda::Function
@@ -1418,14 +1448,23 @@ Resources:
                 S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"],  "operations-conductor-services.zip"]]
             Handler: actions/index.handler
             Role: !GetAtt ActionServiceRole.Arn
-            Runtime: nodejs10.x
+            Runtime: nodejs14.x
             MemorySize: 128
             Timeout: 15
             Environment:
                 Variables:
                     FilterTagKey: !Ref DocumentTagKey
                     FilterTagValue: !Ref DocumentTagValue
                     LogLevel: !Ref LogLevel
+        Metadata:
+            cfn_nag:
+                rules_to_suppress:
+                    - id: W58
+                      reason: "Lambda functions have permission to write to logs in ActionServicePolicy."
+                    - id: W89
+                      reason: "This Lambda function does not need to access any resource provisioned within a VPC."
+                    - id: W92
+                      reason: "This Lambda function does not need to reserved concurrency."
 
     ConsumerLambda:
         Type: AWS::Lambda::Function
@@ -1436,12 +1475,21 @@ Resources:
                 S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"],  "operations-conductor-services.zip"]]
             Handler: queue-consumer/index.handler
             Role: !GetAtt ConsumerLambdaExecutionRole.Arn
-            Runtime: nodejs10.x
+            Runtime: nodejs14.x
             Timeout: 15
             MemorySize: 128
             Environment:
                 Variables:
                     LogLevel: !Ref LogLevel
+        Metadata:
+            cfn_nag:
+                rules_to_suppress:
+                    - id: W58
+                      reason: "Lambda functions have permission to write to logs in ConsumerLambdaExecutionPolicy."
+                    - id: W89
+                      reason: "This Lambda function does not need to access any resource provisioned within a VPC."
+                    - id: W92
+                      reason: "This Lambda function does not need to reserved concurrency."
 
     ResourceSelectorLambda:
         Type: AWS::Lambda::Function
@@ -1452,7 +1500,7 @@ Resources:
                 S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"],  "operations-conductor-services.zip"]]
             Handler: resource-selector/index.handler
             Role: !GetAtt ResourceSelectorExecutionRole.Arn
-            Runtime: nodejs10.x
+            Runtime: nodejs14.x
             Timeout: 15
             MemorySize: 128
             Environment:
@@ -1464,6 +1512,15 @@ Resources:
                     SolutionVersion: !FindInMap ["Solution", "Data", "Version"]
                     SolutionUuid: !GetAtt CustomResourceAppUuid.UUID
                     LogLevel: !Ref LogLevel
+        Metadata:
+            cfn_nag:
+                rules_to_suppress:
+                    - id: W58
+                      reason: "Lambda functions have permission to write to logs in ResourceSelectorExecutionPolicy."
+                    - id: W89
+                      reason: "This Lambda function does not need to access any resource provisioned within a VPC."
+                    - id: W92
+                      reason: "This Lambda function does not need to reserved concurrency."
 
     # Cognito UserPool
     UserPool:
@@ -1680,9 +1737,10 @@ Resources:
         Metadata:
             cfn_nag:
                 rules_to_suppress:
-                    -
-                        id: W10
-                        reason: "This solution does not require CloudFront distribution access logging."
+                    - id: W10
+                      reason: "This solution does not require CloudFront distribution access logging."
+                    - id: W70
+                      reason: "If the distribution uses the CloudFront domain name such as d111111abcdef8.cloudfront.net (you set CloudFrontDefaultCertificate to true), CloudFront automatically sets the security policy to TLSv1 regardless of the value that you set here. refer https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-viewercertificate.html"
 
     WebsiteOriginAccessIdentity:
         Type: AWS::CloudFront::CloudFrontOriginAccessIdentity
@@ -1706,6 +1764,8 @@ Resources:
                     KeyType: "HASH"
             SSESpecification:
                 SSEEnabled: true
+            PointInTimeRecoverySpecification:
+                PointInTimeRecoveryEnabled: true
 
     TaskExecutionsTable:
         Type: AWS::DynamoDB::Table
@@ -1743,6 +1803,8 @@ Resources:
                         ProjectionType: "ALL"
             SSESpecification:
                 SSEEnabled: true
+            PointInTimeRecoverySpecification:
+                PointInTimeRecoveryEnabled: true
 
     AutomationExecutionsTable:
         Type: AWS::DynamoDB::Table
@@ -1765,6 +1827,8 @@ Resources:
                     KeyType: "RANGE"
             SSESpecification:
                 SSEEnabled: true
+            PointInTimeRecoverySpecification:
+                PointInTimeRecoveryEnabled: true
 
     # SQS
     DeadLetterQueue:

diff --git a/source/console/package.json b/source/console/package.json
@@ -1,26 +1,27 @@
 {
     "name": "operations-conductor-console",
     "description": "The Operations Conductor Web console",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "private": true,
     "dependencies": {
         "aws-amplify": "^1.2.3",
         "aws-amplify-react": "^2.5.3",
+        "bootstrap": "^3.3.7",
+        "node-sass": "^6.0.1",
         "react": "^16.11.0",
-        "react-dom": "^16.11.0",
-        "react-router-dom": "^5.1.2",
-        "react-scripts": "^3.2.0",
         "react-bootstrap": "^0.32.4",
+        "react-dom": "^16.11.0",
         "react-router-bootstrap": "^0.25.0",
-        "bootstrap": "^3.3.7",
-        "node-sass": "^4.12.0"
+        "react-router-dom": "^5.1.2",
+        "react-scripts": "4.0.3",
+        "uuid": "8.3.2"
     },
     "devDependencies": {
         "@types/react": "^16.9.9",
-        "@types/react-dom": "^16.9.2",
-        "@types/react-router-dom": "^5.1.0",
         "@types/react-bootstrap": "^0.32.20",
+        "@types/react-dom": "^16.9.2",
         "@types/react-router-bootstrap": "^0.24.5",
+        "@types/react-router-dom": "^5.1.0",
         "typescript": "3.2.1"
     },
     "scripts": {

diff --git a/source/console/src/App.tsx b/source/console/src/App.tsx
@@ -1,16 +1,17 @@
 /*****************************************************************************
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.   *
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.        *
  *                                                                           *
  * Licensed under the Apache License, Version 2.0 (the "License").           *
  * You may not use this file except in compliance with the License.          *
  * A copy of the License is located at                                       *
  *                                                                           *
  *     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.                            *
+ *  Unless required by applicable law or agreed to in writing, software      *
+ *  distributed under the License 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.                                           *
  ****************************************************************************/
 
 import * as React from 'react';