Merge branch 'main' into appsync-merged-api

.github/workflows/request-cli-integ-test.yml

@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
       - name: Find changed cli files
         id: changed-cli-files
-        uses: tj-actions/changed-files@a0585ff9904b77d046192a7846e59783d6ea287b
+        uses: tj-actions/changed-files@c860b5c47fa71f461da850094ef2f6e3d6514e44
         with:
           base_sha: ${{ github.event.pull_request.base.sha }}
           files_yaml: |

.github/workflows/update-contributors.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.repository == 'aws/aws-cdk'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: minicli/action-contributors@v3.3
         name: "Update a projects CONTRIBUTORS file"
         env:

CONTRIBUTING.md

@@ -1139,6 +1139,7 @@ Most build issues can be solved by doing a full clean rebuild:
 
 ```shell
 $ git clean -fqdx .
+$ yarn install
 $ yarn build
 ```
 

nx.json

@@ -11,7 +11,8 @@
         "!{workspaceRoot}/**/tsconfig.json",
         "!{workspaceRoot}/**/tsconfig.json",
         "!{workspaceRoot}/tsconfig.base.json",
-        "!{workspaceRoot}/**/tsconfig.tsbuildinfo"
+        "!{workspaceRoot}/**/tsconfig.tsbuildinfo",
+        "!{workspaceRoot}/**/jest.config.js"
       ],
       "outputs": [
         "{projectRoot}/**/*.integ.*.js.snapshot/*",

package.json

@@ -33,6 +33,7 @@
     "patch-package": "^6.5.1",
     "semver": "^7.5.4",
     "standard-version": "^9.5.0",
+    "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
     "typescript": "~5.1.6"
   },

packages/@aws-cdk-testing/cli-integ/lib/aws.ts

@@ -129,6 +129,7 @@ async function awsCall<
   Svc extends AWS.Service,
   Calls extends ServiceCalls<Svc>,
   Call extends keyof Calls,
+// eslint-disable-next-line @typescript-eslint/no-shadow
 >(ctor: new (config: any) => Svc, config: any, call: Call, request: First<Calls[Call]>): Promise<Second<Calls[Call]>> {
   const cfn = new ctor(config);
   const response = ((cfn as any)[call] as any)(request);
@@ -156,6 +157,7 @@ type AwsCaller<A> = <B extends keyof ServiceCalls<A>>(call: B, request: First<Se
  * }
  * ```
  */
+// eslint-disable-next-line @typescript-eslint/no-shadow
 function makeAwsCaller<A extends AWS.Service>(ctor: new (config: any) => A, config: any): AwsCaller<A> {
   return <B extends keyof ServiceCalls<A>>(call: B, request: First<ServiceCalls<A>[B]>): Promise<Second<ServiceCalls<A>[B]>> => {
     return awsCall(ctor, config, call, request);

packages/@aws-cdk-testing/cli-integ/test/resource-pool.test.ts

@@ -1,6 +1,8 @@
 import { sleep } from '../lib';
 import { ResourcePool } from '../lib/resource-pool';
 
+jest.setTimeout(30_000);
+
 const POOL_NAME = 'resource-pool.test';
 
 test('take and dispose', async () => {

packages/@aws-cdk-testing/framework-integ/.gitignore

@@ -14,4 +14,6 @@ nyc.config.js
 
 !**/*.snapshot/**/asset.*/**
 
-**/*.ts.snapshot
+**/*.ts.snapshot
+
+!jest.config.js

packages/@aws-cdk-testing/framework-integ/jest.config.js

@@ -0,0 +1,14 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  // Purposely only run .js files, not .ts files. This is so that the unit tests
+  // here will use the jsii-compiled version of `aws-cdk-lib`, and not the live-interpreted
+  // .ts files.
+  moduleFileExtensions: [
+    'js',
+  ],
+  testMatch: [
+    '<rootDir>/test/**/?(*.)+(test).js',
+  ],
+
+  testEnvironment: 'node',
+};

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.realtime-log-config.js.snapshot/cdk.out

@@ -0,0 +1 @@
+{"version":"33.0.0"}

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.realtime-log-config.js.snapshot/integ-realtime-config.assets.json

@@ -0,0 +1,19 @@
+{
+  "version": "33.0.0",
+  "files": {
+    "065ae19c4c6accff85009f33f18e0ec2e2ed000b2cd704aed4eaa1778b943256": {
+      "source": {
+        "path": "integ-realtime-config.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "065ae19c4c6accff85009f33f18e0ec2e2ed000b2cd704aed4eaa1778b943256.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.realtime-log-config.js.snapshot/integ-realtime-config.template.json

@@ -0,0 +1,128 @@
+{
+ "Resources": {
+  "Role1ABCC5F0": {
+   "Type": "AWS::IAM::Role",
+   "Properties": {
+    "AssumeRolePolicyDocument": {
+     "Statement": [
+      {
+       "Action": "sts:AssumeRole",
+       "Effect": "Allow",
+       "Principal": {
+        "Service": "cloudfront.amazonaws.com"
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    }
+   }
+  },
+  "RoleDefaultPolicy5FFB7DAB": {
+   "Type": "AWS::IAM::Policy",
+   "Properties": {
+    "PolicyDocument": {
+     "Statement": [
+      {
+       "Action": [
+        "kinesis:DescribeStream",
+        "kinesis:DescribeStreamSummary",
+        "kinesis:PutRecord",
+        "kinesis:PutRecords"
+       ],
+       "Effect": "Allow",
+       "Resource": {
+        "Fn::GetAtt": [
+         "stream19075594",
+         "Arn"
+        ]
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "PolicyName": "RoleDefaultPolicy5FFB7DAB",
+    "Roles": [
+     {
+      "Ref": "Role1ABCC5F0"
+     }
+    ]
+   }
+  },
+  "stream19075594": {
+   "Type": "AWS::Kinesis::Stream",
+   "Properties": {
+    "RetentionPeriodHours": 24,
+    "StreamEncryption": {
+     "EncryptionType": "KMS",
+     "KeyId": "alias/aws/kinesis"
+    },
+    "StreamModeDetails": {
+     "StreamMode": "ON_DEMAND"
+    }
+   }
+  },
+  "RealtimeLog31F8FA14": {
+   "Type": "AWS::CloudFront::RealtimeLogConfig",
+   "Properties": {
+    "EndPoints": [
+     {
+      "KinesisStreamConfig": {
+       "RoleArn": {
+        "Fn::GetAtt": [
+         "Role1ABCC5F0",
+         "Arn"
+        ]
+       },
+       "StreamArn": {
+        "Fn::GetAtt": [
+         "stream19075594",
+         "Arn"
+        ]
+       }
+      },
+      "StreamType": "Kinesis"
+     }
+    ],
+    "Fields": [
+     "timestamp"
+    ],
+    "Name": "testing",
+    "SamplingRate": 1
+   }
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.realtime-log-config.js.snapshot/integ.json

@@ -0,0 +1,12 @@
+{
+  "version": "33.0.0",
+  "testCases": {
+    "integ-realtime-config/realtime-log-config/DefaultTest": {
+      "stacks": [
+        "integ-realtime-config"
+      ],
+      "assertionStack": "integ-realtime-config/realtime-log-config/DefaultTest/DeployAssert",
+      "assertionStackName": "integrealtimeconfigrealtimelogconfigDefaultTestDeployAssert02ABDB2F"
+    }
+  }
+}

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.realtime-log-config.js.snapshot/integrealtimeconfigrealtimelogconfigDefaultTestDeployAssert02ABDB2F.assets.json

@@ -0,0 +1,19 @@
+{
+  "version": "33.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "integrealtimeconfigrealtimelogconfigDefaultTestDeployAssert02ABDB2F.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.realtime-log-config.js.snapshot/integrealtimeconfigrealtimelogconfigDefaultTestDeployAssert02ABDB2F.template.json

@@ -0,0 +1,36 @@
+{
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}