Merge branch 'main' into merge-back/2.66.1

Author: mergify[bot]

.github/workflows/issue-label-assign.yml

@@ -137,7 +137,6 @@ env:
             {"area":"@aws-cdk/aws-dms","keywords":["aws-dms","dms"],"labels":["@aws-cdk/aws-dms"]},
             {"area":"@aws-cdk/aws-docdb","keywords":["aws-docdb","docdb"],"labels":["@aws-cdk/aws-docdb"]},
             {"area":"@aws-cdk/aws-dynamodb","keywords":["aws-dynamodb","dynamo-db"],"labels":["@aws-cdk/aws-dynamodb"]},
-            {"area":"@aws-cdk/aws-dynamodb-global","keywords":["aws-dynamodb-global","dynamodb-global"],"labels":["@aws-cdk/aws-dynamodb-global"]},
             {"area":"@aws-cdk/aws-ec2","keywords":["aws-ec2","ec2","vpc","privatesubnet","publicsubnet","vpngateway","vpnconnection","networkacl"],"labels":["@aws-cdk/aws-ec2"]},
             {"area":"@aws-cdk/aws-ecr","keywords":["aws-ecr","ecr"],"labels":["@aws-cdk/aws-ecr"]},
             {"area":"@aws-cdk/aws-ecr-assets","keywords":["aws-ecr-assets","ecrassets"],"labels":["@aws-cdk/aws-ecr-assets"]},

.gitignore

@@ -48,3 +48,6 @@ yarn-error.log
 
 /.versionrc.json
 RELEASE_NOTES.md
+
+# Produced by integ tests
+read*lock

packages/@aws-cdk-testing/cli-integ/README.md

@@ -33,6 +33,7 @@ tests/
 ├── init-python
 ├── init-typescript-app
 ├── init-typescript-lib
+├── init-go
 └── uberpackage
 ```
 

packages/@aws-cdk-testing/cli-integ/lib/package-sources/release-source.ts

@@ -1,9 +1,9 @@
 import * as os from 'os';
 import * as path from 'path';
 import * as fs from 'fs-extra';
+import { IPackageSourceSetup, IPackageSource } from './source';
 import { copyDirectoryContents } from '../files';
 import { shell, rimraf, addToShellPath } from '../shell';
-import { IPackageSourceSetup, IPackageSource } from './source';
 
 export class ReleasePackageSourceSetup implements IPackageSourceSetup {
   readonly name = 'release';

packages/@aws-cdk-testing/cli-integ/lib/package-sources/repo-source.ts

@@ -1,9 +1,9 @@
 import * as os from 'os';
 import * as path from 'path';
 import * as fs from 'fs-extra';
+import { IPackageSourceSetup, IPackageSource } from './source';
 import { findUp } from '../files';
 import { shell, addToShellPath } from '../shell';
-import { IPackageSourceSetup, IPackageSource } from './source';
 
 export class RepoPackageSourceSetup implements IPackageSourceSetup {
   readonly name = 'repo';

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

@@ -1,10 +1,10 @@
 /* eslint-disable no-console */
 import * as path from 'path';
-import { writeFile } from '../files';
-import { shell } from '../shell';
 import { LoginInformation } from './codeartifact';
 import { parallelShell } from './parallel-shell';
 import { UsageDir } from './usage-dir';
+import { writeFile } from '../files';
+import { shell } from '../shell';
 
 // Do not try to JIT the Maven binary
 const NO_JIT = '-XX:+TieredCompilation -XX:TieredStopAtLevel=1';

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

@@ -1,9 +1,9 @@
 /* eslint-disable no-console */
-import { writeFile } from '../files';
-import { shell } from '../shell';
 import { LoginInformation } from './codeartifact';
 import { parallelShell } from './parallel-shell';
 import { UsageDir } from './usage-dir';
+import { writeFile } from '../files';
+import { shell } from '../shell';
 
 export async function nugetLogin(login: LoginInformation, usageDir: UsageDir) {
   // NuGet.Config MUST live in the current directory or in the home directory, and there is no environment

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

@@ -1,10 +1,10 @@
 /* eslint-disable no-console */
 import * as path from 'path';
-import { writeFile } from '../files';
-import { shell } from '../shell';
 import { LoginInformation } from './codeartifact';
 import { parallelShell } from './parallel-shell';
 import { UsageDir } from './usage-dir';
+import { writeFile } from '../files';
+import { shell } from '../shell';
 
 export async function pypiLogin(login: LoginInformation, usageDir: UsageDir) {
   // Write pip config file and set environment var

packages/@aws-cdk/alexa-ask/package.json

@@ -85,7 +85,8 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/jest": "^27.5.2"
+    "@types/jest": "^27.5.2",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",

packages/@aws-cdk/assert-internal/lib/assertion.ts

@@ -1,3 +1,5 @@
+/* eslint-disable import/order */
+// @TODO: These tests fail if all imports are at the top
 import { Inspector } from './inspector';
 
 export abstract class Assertion<InspectorClass extends Inspector> {

packages/@aws-cdk/assert-internal/lib/assertions/count-resources.ts

@@ -1,6 +1,6 @@
+import { isSuperObject } from './have-resource';
 import { Assertion, JestFriendlyAssertion } from '../assertion';
 import { StackInspector } from '../inspector';
-import { isSuperObject } from './have-resource';
 
 /**
  * An assertion to check whether a resource of a given type and with the given properties exists, disregarding properties

packages/@aws-cdk/assert-internal/lib/assertions/have-resource.ts

@@ -1,6 +1,6 @@
+import { anything, deepObjectLike, match, objectLike } from './have-resource-matchers';
 import { Assertion, JestFriendlyAssertion } from '../assertion';
 import { StackInspector } from '../inspector';
-import { anything, deepObjectLike, match, objectLike } from './have-resource-matchers';
 
 /**
  * Magic value to signify that a certain key should be absent from the property bag.

packages/@aws-cdk/assert-internal/test/have-resource.test.ts

@@ -1,3 +1,4 @@
+import { mkResource, mkStack } from './cloud-artifact';
 import {
   ABSENT,
   arrayWith,
@@ -9,7 +10,6 @@ import {
   anything,
   stringLike,
 } from '../lib/index';
-import { mkResource, mkStack } from './cloud-artifact';
 
 test('support resource with no properties', () => {
   const synthStack = mkStack({

packages/@aws-cdk/assert-internal/test/match-template.test.ts

@@ -1,5 +1,5 @@
-import { MatchStyle } from '../lib';
 import { mkStack } from './cloud-artifact';
+import { MatchStyle } from '../lib';
 import '../jest';
 
 describe('matchTemplate', () => {

packages/@aws-cdk/assertions/lib/private/resources.ts

@@ -1,7 +1,7 @@
-import { Match, Matcher } from '..';
 import { AbsentMatch } from './matchers/absent';
 import { formatAllMismatches, matchSection, formatSectionMatchFailure } from './section';
 import { Resource, Template } from './template';
+import { Match, Matcher } from '..';
 
 export function findResources(template: Template, type: string, props: any = {}): { [key: string]: { [key: string]: any } } {
   const section = template.Resources ?? {};

packages/@aws-cdk/assertions/lib/private/section.ts

@@ -1,6 +1,6 @@
+import { sortKeyComparator } from './sorting';
 import { Match } from '../match';
 import { Matcher, MatchResult } from '../matcher';
-import { sortKeyComparator } from './sorting';
 
 export type MatchSuccess = { match: true, matches: { [key: string]: any }, analyzed: { [key: string]: any }, analyzedCount: number };
 export type MatchFailure = { match: false, closestResults: Record<string, MatchResult>, analyzed: { [key: string]: any }, analyzedCount: number };

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

@@ -86,7 +86,8 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/jest": "^27.5.2"
+    "@types/jest": "^27.5.2",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",

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

@@ -85,7 +85,8 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/jest": "^27.5.2"
+    "@types/jest": "^27.5.2",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",

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

@@ -88,7 +88,8 @@
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.5.2",
-    "aws-sdk": "^2.1317.0"
+    "aws-sdk": "^2.1317.0",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/aws-codebuild": "0.0.0",

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

@@ -89,7 +89,8 @@
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.5.2",
-    "@types/node": "18.11.19"
+    "@types/node": "18.11.19",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",

packages/@aws-cdk/aws-apigateway/lib/integrations/lambda.ts

@@ -1,9 +1,9 @@
 import * as iam from '@aws-cdk/aws-iam';
 import * as lambda from '@aws-cdk/aws-lambda';
 import { Lazy, Names, Token } from '@aws-cdk/core';
+import { AwsIntegration } from './aws';
 import { IntegrationConfig, IntegrationOptions } from '../integration';
 import { Method } from '../method';
-import { AwsIntegration } from './aws';
 
 export interface LambdaIntegrationOptions extends IntegrationOptions {
   /**

packages/@aws-cdk/aws-apigateway/lib/integrations/stepfunctions.ts

@@ -4,10 +4,10 @@ import * as iam from '@aws-cdk/aws-iam';
 import * as sfn from '@aws-cdk/aws-stepfunctions';
 import { Token } from '@aws-cdk/core';
 import { RequestContext } from '.';
+import { AwsIntegration } from './aws';
 import { IntegrationConfig, IntegrationOptions, PassthroughBehavior } from '../integration';
 import { Method } from '../method';
 import { Model } from '../model';
-import { AwsIntegration } from './aws';
 /**
  * Options when configuring Step Functions synchronous integration with Rest API
  */

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

@@ -87,7 +87,8 @@
     "@aws-cdk/pkglint": "0.0.0",
     "@types/aws-lambda": "^8.10.110",
     "@aws-cdk/integ-tests": "0.0.0",
-    "@types/jest": "^27.5.2"
+    "@types/jest": "^27.5.2",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/aws-apigatewayv2": "0.0.0",

packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/jwt.test.ts

@@ -1,8 +1,8 @@
 import { Template } from '@aws-cdk/assertions';
 import { HttpApi } from '@aws-cdk/aws-apigatewayv2';
 import { Stack } from '@aws-cdk/core';
-import { HttpJwtAuthorizer } from '../../lib';
 import { DummyRouteIntegration } from './integration';
+import { HttpJwtAuthorizer } from '../../lib';
 
 describe('HttpJwtAuthorizer', () => {
   test('default', () => {

packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/lambda.test.ts

@@ -2,8 +2,8 @@ import { Match, Template } from '@aws-cdk/assertions';
 import { HttpApi } from '@aws-cdk/aws-apigatewayv2';
 import { Code, Function, Runtime } from '@aws-cdk/aws-lambda';
 import { Duration, Stack } from '@aws-cdk/core';
-import { HttpLambdaAuthorizer, HttpLambdaResponseType } from '../../lib';
 import { DummyRouteIntegration } from './integration';
+import { HttpLambdaAuthorizer, HttpLambdaResponseType } from '../../lib';
 
 describe('HttpLambdaAuthorizer', () => {
 

packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/user-pool.test.ts

@@ -2,8 +2,8 @@ import { Template } from '@aws-cdk/assertions';
 import { HttpApi } from '@aws-cdk/aws-apigatewayv2';
 import { UserPool } from '@aws-cdk/aws-cognito';
 import { Stack } from '@aws-cdk/core';
-import { HttpUserPoolAuthorizer } from '../../lib';
 import { DummyRouteIntegration } from './integration';
+import { HttpUserPoolAuthorizer } from '../../lib';
 
 describe('HttpUserPoolAuthorizer', () => {
   test('default', () => {

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

@@ -83,7 +83,8 @@
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/integ-tests": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/jest": "^27.5.2"
+    "@types/jest": "^27.5.2",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/aws-apigatewayv2": "0.0.0",

packages/@aws-cdk/aws-apigatewayv2/lib/common/api-mapping.ts

@@ -1,9 +1,9 @@
 import { IResource, Resource } from '@aws-cdk/core';
 import { Construct } from 'constructs';
-import { CfnApiMapping, CfnApiMappingProps } from '../apigatewayv2.generated';
 import { IApi } from './api';
 import { IDomainName } from './domain-name';
 import { IStage } from './stage';
+import { CfnApiMapping, CfnApiMappingProps } from '../apigatewayv2.generated';
 
 /**
  * Represents an ApiGatewayV2 ApiMapping resource

packages/@aws-cdk/aws-apigatewayv2/lib/http/api.ts

@@ -1,15 +1,15 @@
 import { Metric, MetricOptions } from '@aws-cdk/aws-cloudwatch';
 import { Duration } from '@aws-cdk/core';
 import { Construct } from 'constructs';
-import { CfnApi, CfnApiProps } from '../apigatewayv2.generated';
-import { IApi } from '../common/api';
-import { ApiBase } from '../common/base';
-import { DomainMappingOptions } from '../common/stage';
 import { IHttpRouteAuthorizer } from './authorizer';
 import { HttpRouteIntegration } from './integration';
 import { BatchHttpRouteOptions, HttpMethod, HttpRoute, HttpRouteKey } from './route';
 import { IHttpStage, HttpStage, HttpStageOptions } from './stage';
 import { VpcLink, VpcLinkProps } from './vpc-link';
+import { CfnApi, CfnApiProps } from '../apigatewayv2.generated';
+import { IApi } from '../common/api';
+import { ApiBase } from '../common/base';
+import { DomainMappingOptions } from '../common/stage';
 
 /**
  * Represents an HTTP API

packages/@aws-cdk/aws-apigatewayv2/lib/http/authorizer.ts

@@ -1,10 +1,10 @@
 import { Duration, Resource } from '@aws-cdk/core';
 import { Construct } from 'constructs';
+import { IHttpApi } from './api';
+import { IHttpRoute } from './route';
 import { CfnAuthorizer } from '../apigatewayv2.generated';
 
 import { IAuthorizer } from '../common';
-import { IHttpApi } from './api';
-import { IHttpRoute } from './route';
 
 /**
  * Supported Authorizer types

packages/@aws-cdk/aws-apigatewayv2/lib/http/integration.ts

@@ -1,11 +1,11 @@
 import { IRole } from '@aws-cdk/aws-iam';
 import { Resource } from '@aws-cdk/core';
 import { Construct } from 'constructs';
+import { IHttpApi } from './api';
+import { HttpMethod, IHttpRoute } from './route';
 import { CfnIntegration } from '../apigatewayv2.generated';
 import { IIntegration } from '../common';
 import { ParameterMapping } from '../parameter-mapping';
-import { IHttpApi } from './api';
-import { HttpMethod, IHttpRoute } from './route';
 
 /**
  * Represents an Integration for an HTTP API.

packages/@aws-cdk/aws-apigatewayv2/lib/http/route.ts

@@ -1,11 +1,11 @@
 import * as iam from '@aws-cdk/aws-iam';
 import { Resource } from '@aws-cdk/core';
 import { Construct } from 'constructs';
-import { CfnRoute, CfnRouteProps } from '../apigatewayv2.generated';
-import { IRoute } from '../common';
 import { IHttpApi } from './api';
 import { HttpRouteAuthorizerConfig, IHttpRouteAuthorizer } from './authorizer';
 import { HttpRouteIntegration } from './integration';
+import { CfnRoute, CfnRouteProps } from '../apigatewayv2.generated';
+import { IRoute } from '../common';
 
 /**
  * Represents a Route for an HTTP API.

packages/@aws-cdk/aws-apigatewayv2/lib/http/stage.ts

@@ -1,11 +1,11 @@
 import { Metric, MetricOptions } from '@aws-cdk/aws-cloudwatch';
 import { Stack } from '@aws-cdk/core';
 import { Construct } from 'constructs';
+import { IHttpApi } from './api';
 import { CfnStage } from '../apigatewayv2.generated';
 import { StageOptions, IStage, StageAttributes } from '../common';
 import { IApi } from '../common/api';
 import { StageBase } from '../common/base';
-import { IHttpApi } from './api';
 
 const DEFAULT_STAGE_NAME = '$default';
 

packages/@aws-cdk/aws-apigatewayv2/lib/websocket/api.ts

@@ -1,10 +1,10 @@
 import { Grant, IGrantable } from '@aws-cdk/aws-iam';
 import { Stack } from '@aws-cdk/core';
 import { Construct } from 'constructs';
+import { WebSocketRoute, WebSocketRouteOptions } from './route';
 import { CfnApi } from '../apigatewayv2.generated';
 import { IApi } from '../common/api';
 import { ApiBase } from '../common/base';
-import { WebSocketRoute, WebSocketRouteOptions } from './route';
 
 /**
  * Represents a WebSocket API

packages/@aws-cdk/aws-apigatewayv2/lib/websocket/authorizer.ts

@@ -1,10 +1,10 @@
 import { Resource } from '@aws-cdk/core';
 import { Construct } from 'constructs';
+import { IWebSocketApi } from './api';
+import { IWebSocketRoute } from './route';
 import { CfnAuthorizer } from '../apigatewayv2.generated';
 
 import { IAuthorizer } from '../common';
-import { IWebSocketApi } from './api';
-import { IWebSocketRoute } from './route';
 
 /**
  * Supported Authorizer types

packages/@aws-cdk/aws-apigatewayv2/lib/websocket/integration.ts

@@ -1,9 +1,9 @@
 import { Resource } from '@aws-cdk/core';
 import { Construct } from 'constructs';
-import { CfnIntegration } from '../apigatewayv2.generated';
-import { IIntegration } from '../common';
 import { IWebSocketApi } from './api';
 import { IWebSocketRoute } from './route';
+import { CfnIntegration } from '../apigatewayv2.generated';
+import { IIntegration } from '../common';
 
 /**
  * Represents an Integration for an WebSocket API.

packages/@aws-cdk/aws-apigatewayv2/lib/websocket/route.ts

@@ -1,10 +1,10 @@
 import { Resource } from '@aws-cdk/core';
 import { Construct } from 'constructs';
-import { CfnRoute, CfnRouteResponse } from '../apigatewayv2.generated';
-import { IRoute } from '../common';
 import { IWebSocketApi } from './api';
 import { IWebSocketRouteAuthorizer, WebSocketNoneAuthorizer } from './authorizer';
 import { WebSocketRouteIntegration } from './integration';
+import { CfnRoute, CfnRouteResponse } from '../apigatewayv2.generated';
+import { IRoute } from '../common';
 
 /**
  * Represents a Route for an WebSocket API.