Merge branch 'main' into mrgrain/chore/test-with-all-ts-versions

package.json

@@ -18,15 +18,15 @@
   "devDependencies": {
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
-    "cdk-generate-synthetic-examples": "^0.1.71",
+    "cdk-generate-synthetic-examples": "^0.1.85",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.10",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "1.71.0",
-    "jsii-pacmak": "1.71.0",
-    "jsii-reflect": "1.71.0",
-    "jsii-rosetta": "1.71.0",
+    "jsii-diff": "1.72.0",
+    "jsii-pacmak": "1.72.0",
+    "jsii-reflect": "1.72.0",
+    "jsii-rosetta": "1.72.0",
     "lerna": "^4.0.0",
     "patch-package": "^6.5.0",
     "semver": "^6.3.0",
@@ -36,7 +36,8 @@
   "resolutions": {
     "colors": "1.4.0",
     "markdown-it": "^12.3.2",
-    "string-width": "^4.2.3"
+    "string-width": "^4.2.3",
+    "@types/babel__traverse": "7.18.2"
   },
   "repository": {
     "type": "git",

packages/@aws-cdk/assertions/lib/template.ts

@@ -97,7 +97,7 @@ export class Template {
    * Assert that a resource of the given type and properties exists in the
    * CloudFormation template.
    * By default, performs partial matching on the `Properties` key of the resource, via the
-   * `Match.objectLike()`. To configure different behavour, use other matchers in the `Match` class.
+   * `Match.objectLike()`. To configure different behavior, use other matchers in the `Match` class.
    * @param type the resource type; ex: `AWS::S3::Bucket`
    * @param props the 'Properties' section of the resource as should be expected in the template.
    */
@@ -112,7 +112,7 @@ export class Template {
    * Assert that a resource of the given type and given definition exists in the
    * CloudFormation template.
    * By default, performs partial matching on the resource, via the `Match.objectLike()`.
-   * To configure different behavour, use other matchers in the `Match` class.
+   * To configure different behavior, use other matchers in the `Match` class.
    * @param type the resource type; ex: `AWS::S3::Bucket`
    * @param props the entire definition of the resource as should be expected in the template.
    */
@@ -138,7 +138,7 @@ export class Template {
    * Assert that all resources of the given type contain the given definition in the
    * CloudFormation template.
    * By default, performs partial matching on the resource, via the `Match.objectLike()`.
-   * To configure different behavour, use other matchers in the `Match` class.
+   * To configure different behavior, use other matchers in the `Match` class.
    * @param type the resource type; ex: `AWS::S3::Bucket`
    * @param props the entire definition of the resources as they should be expected in the template.
    */
@@ -153,7 +153,7 @@ export class Template {
    * Assert that all resources of the given type contain the given properties
    * CloudFormation template.
    * By default, performs partial matching on the `Properties` key of the resource, via the
-   * `Match.objectLike()`. To configure different behavour, use other matchers in the `Match` class.
+   * `Match.objectLike()`. To configure different behavior, use other matchers in the `Match` class.
    * @param type the resource type; ex: `AWS::S3::Bucket`
    * @param props the 'Properties' section of the resource as should be expected in the template.
    */
@@ -192,7 +192,7 @@ export class Template {
   /**
    * Assert that an Output with the given properties exists in the CloudFormation template.
    * By default, performs partial matching on the resource, via the `Match.objectLike()`.
-   * To configure different behavour, use other matchers in the `Match` class.
+   * To configure different behavior, use other matchers in the `Match` class.
    * @param logicalId the name of the output. Provide `'*'` to match all outputs in the template.
    * @param props the output as should be expected in the template.
    */
@@ -217,7 +217,7 @@ export class Template {
   /**
    * Assert that a Mapping with the given properties exists in the CloudFormation template.
    * By default, performs partial matching on the resource, via the `Match.objectLike()`.
-   * To configure different behavour, use other matchers in the `Match` class.
+   * To configure different behavior, use other matchers in the `Match` class.
    * @param logicalId the name of the mapping. Provide `'*'` to match all mappings in the template.
    * @param props the output as should be expected in the template.
    */
@@ -242,7 +242,7 @@ export class Template {
   /**
    * Assert that a Condition with the given properties exists in the CloudFormation template.
    * By default, performs partial matching on the resource, via the `Match.objectLike()`.
-   * To configure different behavour, use other matchers in the `Match` class.
+   * To configure different behavior, use other matchers in the `Match` class.
    * @param logicalId the name of the mapping. Provide `'*'` to match all conditions in the template.
    * @param props the output as should be expected in the template.
    */

packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json

@@ -85,7 +85,7 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/aws-lambda": "^8.10.108",
+    "@types/aws-lambda": "^8.10.109",
     "@aws-cdk/integ-tests": "0.0.0",
     "@types/jest": "^27.5.2"
   },

packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json

@@ -29,7 +29,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/aws-lambda": "^8.10.108",
+    "@types/aws-lambda": "^8.10.109",
     "@types/sinon": "^9.0.11",
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "aws-sdk": "^2.596.0",

packages/@aws-cdk/aws-cloudformation/package.json

@@ -88,7 +88,7 @@
     "@aws-cdk/integ-tests": "0.0.0",
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/aws-lambda": "^8.10.108",
+    "@types/aws-lambda": "^8.10.109",
     "@types/jest": "^27.5.2",
     "jest": "^27.5.1"
   },

packages/@aws-cdk/aws-codepipeline-actions/package.json

@@ -87,7 +87,7 @@
     "@aws-cdk/cx-api": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.5.2",
-    "@types/lodash": "^4.14.189",
+    "@types/lodash": "^4.14.191",
     "jest": "^27.5.1",
     "lodash": "^4.17.21"
   },

packages/@aws-cdk/aws-dynamodb/package.json

@@ -86,7 +86,7 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/integ-tests": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/aws-lambda": "^8.10.108",
+    "@types/aws-lambda": "^8.10.109",
     "@types/jest": "^27.5.2",
     "@types/sinon": "^9.0.11",
     "aws-sdk": "^2.1211.0",

packages/@aws-cdk/aws-ec2/lib/vpc-flow-logs.ts

@@ -676,7 +676,7 @@ export class FlowLog extends FlowLogBase {
     }
 
     const flowLog = new CfnFlowLog(this, 'FlowLog', {
-      destinationOptions: destinationConfig.destinationOptions,
+      destinationOptions: renderDestinationOptions(destinationConfig.destinationOptions),
       deliverLogsPermissionArn: this.iamRole ? this.iamRole.roleArn : undefined,
       logDestinationType: destinationConfig.logDestinationType,
       logGroupName: this.logGroup ? this.logGroup.logGroupName : undefined,
@@ -694,3 +694,13 @@ export class FlowLog extends FlowLogBase {
     this.node.defaultChild = flowLog;
   }
 }
+
+function renderDestinationOptions(opts: DestinationOptions | undefined): CfnFlowLog.DestinationOptionsProperty | undefined {
+  if (opts === undefined) { return undefined; }
+
+  return {
+    fileFormat: opts.fileFormat ?? 'plain-text',
+    hiveCompatiblePartitions: opts.hiveCompatiblePartitions ?? false,
+    perHourPartition: opts.perHourPartition ?? false,
+  };
+}

packages/@aws-cdk/aws-ec2/package.json

@@ -88,7 +88,7 @@
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/aws-lambda": "^8.10.108",
+    "@types/aws-lambda": "^8.10.109",
     "@types/jest": "^27.5.2",
     "jest": "^27.5.1"
   },

packages/@aws-cdk/aws-ec2/test/integ.vpc-flow-logs.js.snapshot/FlowLogsDefaultTestDeployAssert6AFD1854.assets.json

@@ -1,28 +1,28 @@
 {
   "version": "21.0.0",
   "files": {
-    "b54b99043c35bd080b9d9d1afce31e3541cf15b679799ba980ed40c837dcb03b": {
+    "3074b79e05e7b98930b6449e01baa3e68b32ecff86328933c2542f7b7fe6fdac": {
       "source": {
-        "path": "asset.b54b99043c35bd080b9d9d1afce31e3541cf15b679799ba980ed40c837dcb03b.bundle",
+        "path": "asset.3074b79e05e7b98930b6449e01baa3e68b32ecff86328933c2542f7b7fe6fdac.bundle",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "b54b99043c35bd080b9d9d1afce31e3541cf15b679799ba980ed40c837dcb03b.zip",
+          "objectKey": "3074b79e05e7b98930b6449e01baa3e68b32ecff86328933c2542f7b7fe6fdac.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     },
-    "1dcf759cd2c8928f5b1acfbf439f1751e25367a5ac61ba5e640ff8b78fdf89f7": {
+    "dd951509b1e22484b40a66a661cb8cebce3087b8cb381e3dcf02e641e5eb08cd": {
       "source": {
         "path": "FlowLogsDefaultTestDeployAssert6AFD1854.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "1dcf759cd2c8928f5b1acfbf439f1751e25367a5ac61ba5e640ff8b78fdf89f7.json",
+          "objectKey": "dd951509b1e22484b40a66a661cb8cebce3087b8cb381e3dcf02e641e5eb08cd.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

packages/@aws-cdk/aws-ec2/test/integ.vpc-flow-logs.js.snapshot/FlowLogsDefaultTestDeployAssert6AFD1854.template.json

@@ -31,7 +31,7 @@
      }
     },
     "flattenResponse": "false",
-    "salt": "1666810703150"
+    "salt": "1668693953813"
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -115,7 +115,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "b54b99043c35bd080b9d9d1afce31e3541cf15b679799ba980ed40c837dcb03b.zip"
+     "S3Key": "3074b79e05e7b98930b6449e01baa3e68b32ecff86328933c2542f7b7fe6fdac.zip"
     },
     "Timeout": 120,
     "Handler": "index.handler",

packages/@aws-cdk/aws-ec2/test/integ.vpc-flow-logs.js.snapshot/FlowLogsFeatureFlag.assets.json

@@ -1,15 +1,15 @@
 {
   "version": "21.0.0",
   "files": {
-    "2db53e096625b4b167fb15dd7bdc246692b381f45e28c509614fef7d41c20bc9": {
+    "8f4f8db3ea3ad2d5f5678275c75dce7d9b67b46d8df7d92c62913bdc5a03cd3f": {
       "source": {
         "path": "FlowLogsFeatureFlag.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "2db53e096625b4b167fb15dd7bdc246692b381f45e28c509614fef7d41c20bc9.json",
+          "objectKey": "8f4f8db3ea3ad2d5f5678275c75dce7d9b67b46d8df7d92c62913bdc5a03cd3f.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

packages/@aws-cdk/aws-ec2/test/integ.vpc-flow-logs.js.snapshot/FlowLogsFeatureFlag.template.json

@@ -524,7 +524,6 @@
      "Ref": "VPCB9E5F0B4"
     },
     "ResourceType": "VPC",
-    "TrafficType": "ALL",
     "LogDestination": {
      "Fn::GetAtt": [
       "VPCFlowLogsS3BucketFB7DC2BE",
@@ -537,7 +536,8 @@
       "Key": "Name",
       "Value": "FlowLogsFeatureFlag/VPC"
      }
-    ]
+    ],
+    "TrafficType": "ALL"
    }
   },
   "VPCFlowLogsS3WithDestinationOptionsBucket1B7AC456": {
@@ -673,11 +673,10 @@
      "Ref": "VPCB9E5F0B4"
     },
     "ResourceType": "VPC",
-    "TrafficType": "ALL",
     "DestinationOptions": {
-     "fileFormat": "plain-text",
-     "perHourPartition": false,
-     "hiveCompatiblePartitions": true
+     "FileFormat": "plain-text",
+     "HiveCompatiblePartitions": true,
+     "PerHourPartition": false
     },
     "LogDestination": {
      "Fn::GetAtt": [
@@ -691,7 +690,8 @@
       "Key": "Name",
       "Value": "FlowLogsFeatureFlag/VPC"
      }
-    ]
+    ],
+    "TrafficType": "ALL"
    }
   },
   "FlowLogsInstanceInstanceSecurityGroupF61782E0": {

packages/@aws-cdk/aws-ec2/test/integ.vpc-flow-logs.js.snapshot/FlowLogsTestStack.assets.json

@@ -1,28 +1,28 @@
 {
   "version": "21.0.0",
   "files": {
-    "bb426cfb5fed5237e5928f871893b243ddf86a591a592b558bd29f60e28bad9d": {
+    "33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c": {
       "source": {
-        "path": "asset.bb426cfb5fed5237e5928f871893b243ddf86a591a592b558bd29f60e28bad9d",
+        "path": "asset.33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c",
         "packaging": "zip"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "bb426cfb5fed5237e5928f871893b243ddf86a591a592b558bd29f60e28bad9d.zip",
+          "objectKey": "33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c.zip",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     },
-    "2090a74d484bc155b48d7511b99e4921b8f55e488c3fe1500cffede0cdfd33b7": {
+    "23955aa16c5d59106d93ecce9cedd43aa5782fbf23bb2ef8549b2119345a6f79": {
       "source": {
         "path": "FlowLogsTestStack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "2090a74d484bc155b48d7511b99e4921b8f55e488c3fe1500cffede0cdfd33b7.json",
+          "objectKey": "23955aa16c5d59106d93ecce9cedd43aa5782fbf23bb2ef8549b2119345a6f79.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

packages/@aws-cdk/aws-ec2/test/integ.vpc-flow-logs.js.snapshot/FlowLogsTestStack.template.json

@@ -524,7 +524,6 @@
      "Ref": "VPCB9E5F0B4"
     },
     "ResourceType": "VPC",
-    "TrafficType": "ALL",
     "LogDestination": {
      "Fn::GetAtt": [
       "VPCFlowLogsS3BucketFB7DC2BE",
@@ -537,7 +536,8 @@
       "Key": "Name",
       "Value": "FlowLogsTestStack/VPC"
      }
-    ]
+    ],
+    "TrafficType": "ALL"
    }
   },
   "VPCFlowLogsS3KeyPrefixFlowLogB57F1746": {
@@ -547,7 +547,6 @@
      "Ref": "VPCB9E5F0B4"
     },
     "ResourceType": "VPC",
-    "TrafficType": "ALL",
     "LogDestination": {
      "Fn::Join": [
       "",
@@ -568,7 +567,8 @@
       "Key": "Name",
       "Value": "FlowLogsTestStack/VPC"
      }
-    ]
+    ],
+    "TrafficType": "ALL"
    }
   },
   "FlowLogsCWIAMRole017AD736": {
@@ -643,7 +643,6 @@
      "Ref": "VPCB9E5F0B4"
     },
     "ResourceType": "VPC",
-    "TrafficType": "ALL",
     "DeliverLogsPermissionArn": {
      "Fn::GetAtt": [
       "FlowLogsCWIAMRole017AD736",
@@ -653,7 +652,8 @@
     "LogDestinationType": "cloud-watch-logs",
     "LogGroupName": {
      "Ref": "FlowLogsCWLogGroup0398E8F8"
-    }
+    },
+    "TrafficType": "ALL"
    }
   },
   "Bucket83908E77": {
@@ -888,7 +888,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "bb426cfb5fed5237e5928f871893b243ddf86a591a592b558bd29f60e28bad9d.zip"
+     "S3Key": "33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c.zip"
     },
     "Timeout": 900,
     "MemorySize": 128,