Update to version v1.61.0

awslabs · Aug 27, 2020 · 2740df7 · 2740df7
1 parent d7e39df
commit 2740df7
Show file tree

Hide file tree

Showing 139 changed files with 3,581 additions and 634 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ 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.61.0] - 2020-08-27
+
+### Changed
+- Upgraded all patterns to CDK v1.61.0
+- [All *-lambda-* and *-apigateway-* patterns] Enable X-Ray tracing ([#36](https://github.com/awslabs/aws-solutions-constructs/issues/36))
+
 ## [1.60.0] - 2020-08-24
 
 ### Changed

diff --git a/source/lerna.json b/source/lerna.json
@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "1.60.0"
+  "version": "1.61.0"
 }
diff --git a/source/package.json b/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-solutions-constructs",
-  "version": "1.60.0",
+  "version": "1.61.0",
   "description": "AWS Solutions Constructs Library",
   "repository": {
     "type": "git",
@@ -23,10 +23,10 @@
     "eslint-plugin-license-header": "^0.2.0",
     "fs-extra": "^8.1.0",
     "jest": "^24.9.0",
-    "jsii": "^1.7.0",
-    "jsii-pacmak": "^1.7.0",
+    "jsii": "^1.11.0",
+    "jsii-pacmak": "^1.11.0",
     "tslint": "^5.20.1",
-    "typescript": "~3.9.5"
+    "typescript": "~3.9.7"
   },
   "devDependencies": {
     "lerna": "^3.22.1"

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/README.md b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/README.md
@@ -81,6 +81,7 @@ Out of the box implementation of the Construct without any override will set the
 * Enable CloudWatch logging for API Gateway
 * Configure least privilege access IAM role for API Gateway
 * Set the default authorizationType for all API methods to IAM
+* Enable X-Ray Tracing
 
 ### Amazon DynamoDB Table
 * Set the billing mode for DynamoDB Table to On-Demand (Pay per request)

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-solutions-constructs/aws-apigateway-dynamodb",
-  "version": "1.60.0",
+  "version": "1.61.0",
   "description": "CDK Constructs for AWS API Gateway and Amazon DynamoDB integration.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -53,16 +53,16 @@
     }
   },
   "dependencies": {
-    "@aws-cdk/core": "~1.60.0",
-    "@aws-cdk/aws-apigateway": "~1.60.0",
-    "@aws-cdk/aws-iam": "~1.60.0",
-    "@aws-cdk/aws-dynamodb": "~1.60.0",
-    "@aws-cdk/aws-logs": "~1.60.0",
-    "@aws-solutions-constructs/core": "~1.60.0",
-    "constructs": "^3.0.2"
+    "@aws-cdk/core": "~1.61.0",
+    "@aws-cdk/aws-apigateway": "~1.61.0",
+    "@aws-cdk/aws-iam": "~1.61.0",
+    "@aws-cdk/aws-dynamodb": "~1.61.0",
+    "@aws-cdk/aws-logs": "~1.61.0",
+    "@aws-solutions-constructs/core": "~1.61.0",
+    "constructs": "^3.0.4"
   },
   "devDependencies": {
-    "@aws-cdk/assert": "~1.60.0",
+    "@aws-cdk/assert": "~1.61.0",
     "@types/jest": "^24.0.23",
     "@types/node": "^10.3.0"
   },
@@ -72,12 +72,12 @@
     ]
   },
   "peerDependencies": {
-    "@aws-cdk/core": "~1.60.0",
-    "@aws-cdk/aws-apigateway": "~1.60.0",
-    "@aws-cdk/aws-iam": "~1.60.0",
-    "@aws-cdk/aws-dynamodb": "~1.60.0",
-    "@aws-solutions-constructs/core": "~1.60.0",
-    "constructs": "^3.0.2",
-    "@aws-cdk/aws-logs": "~1.60.0"
+    "@aws-cdk/core": "~1.61.0",
+    "@aws-cdk/aws-apigateway": "~1.61.0",
+    "@aws-cdk/aws-iam": "~1.61.0",
+    "@aws-cdk/aws-dynamodb": "~1.61.0",
+    "@aws-solutions-constructs/core": "~1.61.0",
+    "constructs": "^3.0.4",
+    "@aws-cdk/aws-logs": "~1.61.0"
   }
 }
diff --git a/...ns-constructs/aws-apigateway-dynamodb/test/__snapshots__/apigateway-dynamodb.test.js.snap b/...ns-constructs/aws-apigateway-dynamodb/test/__snapshots__/apigateway-dynamodb.test.js.snap
@@ -191,6 +191,7 @@ Object {
           "Ref": "testapigatewaydynamodbdefaultRestApi9102FDF9",
         },
         "StageName": "prod",
+        "TracingEnabled": true,
       },
       "Type": "AWS::ApiGateway::Stage",
     },

diff --git a/...ions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.expected.json b/...ions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-CRUD.expected.json
@@ -95,7 +95,8 @@
             "ResourcePath": "/*"
           }
         ],
-        "StageName": "prod"
+        "StageName": "prod",
+        "TracingEnabled": true
       }
     },
     "testapigatewaydynamodbRestApiid78018D34": {

diff --git a/...s/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.expected.json b/...s/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.no-arguments.expected.json
@@ -92,7 +92,8 @@
             "ResourcePath": "/*"
           }
         ],
-        "StageName": "prod"
+        "StageName": "prod",
+        "TracingEnabled": true
       }
     },
     "testapigatewaydynamodbdefaultRestApiidFD6A9E91": {

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/README.md b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/README.md
@@ -79,10 +79,12 @@ Out of the box implementation of the Construct without any override will set the
 * Enable CloudWatch logging for API Gateway
 * Configure least privilege access IAM role for API Gateway
 * Set the default authorizationType for all API methods to IAM
+* Enable X-Ray Tracing
 
 ### AWS Lambda Function
 * Configure least privilege access IAM role for Lambda function
 * Enable reusing connections with Keep-Alive for NodeJs Lambda function
+* Enable X-Ray Tracing
 
 ## Architecture
 ![Architecture Diagram](architecture.png)

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/package.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-solutions-constructs/aws-apigateway-lambda",
-  "version": "1.60.0",
+  "version": "1.61.0",
   "description": "CDK constructs for defining an interaction between an API Gateway and a Lambda function.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -53,16 +53,16 @@
     }
   },
   "dependencies": {
-    "@aws-cdk/aws-apigateway": "~1.60.0",
-    "@aws-cdk/aws-lambda": "~1.60.0",
-    "@aws-cdk/aws-logs": "~1.60.0",
-    "@aws-cdk/core": "~1.60.0",
-    "@aws-cdk/aws-iam": "~1.60.0",
-    "@aws-solutions-constructs/core": "~1.60.0",
-    "constructs": "^3.0.2"
+    "@aws-cdk/aws-apigateway": "~1.61.0",
+    "@aws-cdk/aws-lambda": "~1.61.0",
+    "@aws-cdk/aws-logs": "~1.61.0",
+    "@aws-cdk/core": "~1.61.0",
+    "@aws-cdk/aws-iam": "~1.61.0",
+    "@aws-solutions-constructs/core": "~1.61.0",
+    "constructs": "^3.0.4"
   },
   "devDependencies": {
-    "@aws-cdk/assert": "~1.60.0",
+    "@aws-cdk/assert": "~1.61.0",
     "@types/jest": "^24.0.23",
     "@types/node": "^10.3.0"
   },
@@ -72,12 +72,12 @@
     ]
   },
   "peerDependencies": {
-    "@aws-cdk/aws-apigateway": "~1.60.0",
-    "@aws-cdk/aws-lambda": "~1.60.0",
-    "@aws-cdk/aws-logs": "~1.60.0",
-    "@aws-cdk/core": "~1.60.0",
-    "@aws-solutions-constructs/core": "~1.60.0",
-    "constructs": "^3.0.2",
-    "@aws-cdk/aws-iam": "~1.60.0"
+    "@aws-cdk/aws-apigateway": "~1.61.0",
+    "@aws-cdk/aws-lambda": "~1.61.0",
+    "@aws-cdk/aws-logs": "~1.61.0",
+    "@aws-cdk/core": "~1.61.0",
+    "@aws-solutions-constructs/core": "~1.61.0",
+    "constructs": "^3.0.4",
+    "@aws-cdk/aws-iam": "~1.61.0"
   }
 }
diff --git a/...s-constructs/aws-apigateway-lambda/test/__snapshots__/test.apigateway-lambda.test.js.snap b/...s-constructs/aws-apigateway-lambda/test/__snapshots__/test.apigateway-lambda.test.js.snap
@@ -375,6 +375,7 @@ Object {
           "Ref": "testapigatewaylambdaLambdaRestApiE957E944",
         },
         "StageName": "prod",
+        "TracingEnabled": true,
       },
       "Type": "AWS::ApiGateway::Stage",
     },
@@ -594,6 +595,7 @@ Object {
     },
     "testapigatewaylambdaLambdaFunction18FF222F": Object {
       "DependsOn": Array [
+        "testapigatewaylambdaLambdaFunctionServiceRoleDefaultPolicyA5D0BE32",
         "testapigatewaylambdaLambdaFunctionServiceRole5CD2E9F7",
       ],
       "Metadata": Object {
@@ -658,6 +660,9 @@ Object {
           ],
         },
         "Runtime": "nodejs10.x",
+        "TracingConfig": Object {
+          "Mode": "Active",
+        },
       },
       "Type": "AWS::Lambda::Function",
     },
@@ -712,6 +717,40 @@ Object {
       },
       "Type": "AWS::IAM::Role",
     },
+    "testapigatewaylambdaLambdaFunctionServiceRoleDefaultPolicyA5D0BE32": Object {
+      "Metadata": Object {
+        "cfn_nag": Object {
+          "rules_to_suppress": Array [
+            Object {
+              "id": "W12",
+              "reason": "Lambda needs the following minimum required permissions to send trace data to X-Ray.",
+            },
+          ],
+        },
+      },
+      "Properties": Object {
+        "PolicyDocument": Object {
+          "Statement": Array [
+            Object {
+              "Action": Array [
+                "xray:PutTraceSegments",
+                "xray:PutTelemetryRecords",
+              ],
+              "Effect": "Allow",
+              "Resource": "*",
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "PolicyName": "testapigatewaylambdaLambdaFunctionServiceRoleDefaultPolicyA5D0BE32",
+        "Roles": Array [
+          Object {
+            "Ref": "testapigatewaylambdaLambdaFunctionServiceRole5CD2E9F7",
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Policy",
+    },
     "testapigatewaylambdaLambdaRestApiANY1FACA749": Object {
       "Properties": Object {
         "AuthorizationType": "AWS_IAM",
@@ -952,6 +991,7 @@ Object {
           "Ref": "testapigatewaylambdaLambdaRestApiE957E944",
         },
         "StageName": "prod",
+        "TracingEnabled": true,
       },
       "Type": "AWS::ApiGateway::Stage",
     },
@@ -1197,6 +1237,7 @@ Object {
     },
     "pattern1LambdaFunction4AE2BC2A": Object {
       "DependsOn": Array [
+        "pattern1LambdaFunctionServiceRoleDefaultPolicy3DAB9197",
         "pattern1LambdaFunctionServiceRoleEEE9B913",
       ],
       "Metadata": Object {
@@ -1261,9 +1302,46 @@ Object {
           ],
         },
         "Runtime": "nodejs10.x",
+        "TracingConfig": Object {
+          "Mode": "Active",
+        },
       },
       "Type": "AWS::Lambda::Function",
     },
+    "pattern1LambdaFunctionServiceRoleDefaultPolicy3DAB9197": Object {
+      "Metadata": Object {
+        "cfn_nag": Object {
+          "rules_to_suppress": Array [
+            Object {
+              "id": "W12",
+              "reason": "Lambda needs the following minimum required permissions to send trace data to X-Ray.",
+            },
+          ],
+        },
+      },
+      "Properties": Object {
+        "PolicyDocument": Object {
+          "Statement": Array [
+            Object {
+              "Action": Array [
+                "xray:PutTraceSegments",
+                "xray:PutTelemetryRecords",
+              ],
+              "Effect": "Allow",
+              "Resource": "*",
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "PolicyName": "pattern1LambdaFunctionServiceRoleDefaultPolicy3DAB9197",
+        "Roles": Array [
+          Object {
+            "Ref": "pattern1LambdaFunctionServiceRoleEEE9B913",
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Policy",
+    },
     "pattern1LambdaFunctionServiceRoleEEE9B913": Object {
       "Properties": Object {
         "AssumeRolePolicyDocument": Object {
@@ -1566,6 +1644,7 @@ Object {
           "Ref": "pattern1LambdaRestApi6083801A",
         },
         "StageName": "prod",
+        "TracingEnabled": true,
       },
       "Type": "AWS::ApiGateway::Stage",
     },
@@ -1725,6 +1804,7 @@ Object {
     },
     "pattern2LambdaFunction20E7E90C": Object {
       "DependsOn": Array [
+        "pattern2LambdaFunctionServiceRoleDefaultPolicyB413F001",
         "pattern2LambdaFunctionServiceRoleF8D0D0F1",
       ],
       "Metadata": Object {
@@ -1789,9 +1869,46 @@ Object {
           ],
         },
         "Runtime": "nodejs10.x",
+        "TracingConfig": Object {
+          "Mode": "Active",
+        },
       },
       "Type": "AWS::Lambda::Function",
     },
+    "pattern2LambdaFunctionServiceRoleDefaultPolicyB413F001": Object {
+      "Metadata": Object {
+        "cfn_nag": Object {
+          "rules_to_suppress": Array [
+            Object {
+              "id": "W12",
+              "reason": "Lambda needs the following minimum required permissions to send trace data to X-Ray.",
+            },
+          ],
+        },
+      },
+      "Properties": Object {
+        "PolicyDocument": Object {
+          "Statement": Array [
+            Object {
+              "Action": Array [
+                "xray:PutTraceSegments",
+                "xray:PutTelemetryRecords",
+              ],
+              "Effect": "Allow",
+              "Resource": "*",
+            },
+          ],
+          "Version": "2012-10-17",
+        },
+        "PolicyName": "pattern2LambdaFunctionServiceRoleDefaultPolicyB413F001",
+        "Roles": Array [
+          Object {
+            "Ref": "pattern2LambdaFunctionServiceRoleF8D0D0F1",
+          },
+        ],
+      },
+      "Type": "AWS::IAM::Policy",
+    },
     "pattern2LambdaFunctionServiceRoleF8D0D0F1": Object {
       "Properties": Object {
         "AssumeRolePolicyDocument": Object {
@@ -2094,6 +2211,7 @@ Object {
           "Ref": "pattern2LambdaRestApi7106C394",
         },
         "StageName": "prod",
+        "TracingEnabled": true,
       },
       "Type": "AWS::ApiGateway::Stage",
     },