Merge branch 'master' into nija-at/apigwv2-moveintegrations

.gitallowed

@@ -21,3 +21,4 @@ account: '123456789012'
 account: '772975370895'
 account: '856666278305'
 account: '840364872350'
+account: '422531588944'

CONTRIBUTING.md

@@ -39,7 +39,7 @@ and let us know if it's not up-to-date (even better, submit a PR with your  corr
   - [API Compatibility Checks](#api-compatibility-checks)
   - [Examples](#examples)
   - [Feature Flags](#feature-flags)
-  - [Versioning](#versioning)
+  - [Versioning and Release](#versioning-and-release)
 - [Troubleshooting](#troubleshooting)
 - [Debugging](#debugging)
   - [Connecting the VS Code Debugger](#connecting-the-vs-code-debugger)

allowed-breaking-changes.txt

@@ -3,6 +3,10 @@
 # and that won't typecheck if Manifest.load() adds a union arm and now returns A | B | C.
 change-return-type:@aws-cdk/cloud-assembly-schema.Manifest.load
 
+# Adding any new context queries will add to the ContextQueryProperties type,
+# which changes the signature of MissingContext.
+weakened:@aws-cdk/cloud-assembly-schema.MissingContext
+
 removed:@aws-cdk/core.BootstraplessSynthesizer.DEFAULT_ASSET_PUBLISHING_ROLE_ARN
 removed:@aws-cdk/core.DefaultStackSynthesizer.DEFAULT_ASSET_PUBLISHING_ROLE_ARN
 removed:@aws-cdk/core.DefaultStackSynthesizerProps.assetPublishingExternalId
@@ -47,4 +51,4 @@ incompatible-argument:@aws-cdk/aws-ecs.Ec2TaskDefinition.addVolume
 incompatible-argument:@aws-cdk/aws-ecs.FargateTaskDefinition.<initializer>
 incompatible-argument:@aws-cdk/aws-ecs.FargateTaskDefinition.addVolume
 incompatible-argument:@aws-cdk/aws-ecs.TaskDefinition.<initializer>
-incompatible-argument:@aws-cdk/aws-ecs.TaskDefinition.addVolume
+incompatible-argument:@aws-cdk/aws-ecs.TaskDefinition.addVolume

package.json

@@ -53,6 +53,8 @@
       "**/jszip/**",
       "@aws-cdk/aws-codepipeline-actions/case",
       "@aws-cdk/aws-codepipeline-actions/case/**",
+      "@aws-cdk/aws-cognito/punycode",
+      "@aws-cdk/aws-cognito/punycode/**",
       "@aws-cdk/aws-ecr-assets/minimatch",
       "@aws-cdk/aws-ecr-assets/minimatch/**",
       "@aws-cdk/aws-eks/yaml",
@@ -79,6 +81,8 @@
       "aws-cdk-lib/jsonschema/**",
       "aws-cdk-lib/minimatch",
       "aws-cdk-lib/minimatch/**",
+      "aws-cdk-lib/punycode",
+      "aws-cdk-lib/punycode/**",
       "aws-cdk-lib/semver",
       "aws-cdk-lib/semver/**",
       "aws-cdk-lib/yaml",
@@ -91,6 +95,8 @@
       "monocdk/jsonschema/**",
       "monocdk/minimatch",
       "monocdk/minimatch/**",
+      "monocdk/punycode",
+      "monocdk/punycode/**",
       "monocdk/semver",
       "monocdk/semver/**",
       "monocdk/yaml",

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/appmesh.ts

@@ -276,12 +276,9 @@ export class AppMeshExtension extends ServiceExtension {
     // and other similar behaviors.
     this.virtualRouter = new appmesh.VirtualRouter(this.scope, `${this.parentService.id}-virtual-router`, {
       mesh: this.mesh,
-      listener: {
-        portMapping: {
-          port: containerextension.trafficPort,
-          protocol: this.protocol,
-        },
-      },
+      listeners: [
+        this.virtualRouterListener(containerextension.trafficPort),
+      ],
       virtualRouterName: `${this.parentService.id}`,
     });
 
@@ -331,4 +328,13 @@ export class AppMeshExtension extends ServiceExtension {
     // nodes from the other service.
     this.virtualNode.addBackends(otherAppMesh.virtualService);
   }
+
+  private virtualRouterListener(port: number): appmesh.VirtualRouterListener {
+    switch (this.protocol) {
+      case appmesh.Protocol.HTTP: return appmesh.VirtualRouterListener.http(port);
+      case appmesh.Protocol.HTTP2: return appmesh.VirtualRouterListener.http2(port);
+      case appmesh.Protocol.GRPC: return appmesh.VirtualRouterListener.grpc(port);
+      case appmesh.Protocol.TCP: return appmesh.VirtualRouterListener.tcp(port);
+    }
+  }
 }

packages/@aws-cdk-containers/ecs-service-extensions/test/integ.all-service-addons.expected.json

@@ -3323,7 +3323,7 @@
         "ecrRepo": "840364872350"
       },
       "eu-south-1": {
-        "ecrRepo": "840364872350"
+        "ecrRepo": "422531588944"
       },
       "eu-west-1": {
         "ecrRepo": "840364872350"
@@ -3382,7 +3382,7 @@
         "ecrRepo": "840364872350"
       },
       "eu-south-1": {
-        "ecrRepo": "840364872350"
+        "ecrRepo": "422531588944"
       },
       "eu-west-1": {
         "ecrRepo": "840364872350"
@@ -3441,7 +3441,7 @@
         "ecrRepo": "840364872350"
       },
       "eu-south-1": {
-        "ecrRepo": "840364872350"
+        "ecrRepo": "422531588944"
       },
       "eu-west-1": {
         "ecrRepo": "840364872350"
@@ -3491,4 +3491,4 @@
       }
     }
   }
-}
+}

packages/@aws-cdk-containers/ecs-service-extensions/test/integ.multiple-environments.expected.json

@@ -2142,7 +2142,7 @@
         "ecrRepo": "840364872350"
       },
       "eu-south-1": {
-        "ecrRepo": "840364872350"
+        "ecrRepo": "422531588944"
       },
       "eu-west-1": {
         "ecrRepo": "840364872350"
@@ -2201,7 +2201,7 @@
         "ecrRepo": "840364872350"
       },
       "eu-south-1": {
-        "ecrRepo": "840364872350"
+        "ecrRepo": "422531588944"
       },
       "eu-west-1": {
         "ecrRepo": "840364872350"
@@ -2235,4 +2235,4 @@
       }
     }
   }
-}
+}

packages/@aws-cdk/app-delivery/package.json

@@ -63,7 +63,7 @@
     "@types/nodeunit": "^0.0.31",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
-    "fast-check": "^2.6.0",
+    "fast-check": "^2.6.1",
     "nodeunit": "^0.11.3",
     "pkglint": "0.0.0"
   },

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

@@ -25,7 +25,7 @@
     "cdk-build-tools": "0.0.0",
     "jest": "^26.6.3",
     "pkglint": "0.0.0",
-    "ts-jest": "^26.4.3"
+    "ts-jest": "^26.4.4"
   },
   "dependencies": {
     "@aws-cdk/cloud-assembly-schema": "0.0.0",

packages/@aws-cdk/aws-apigateway/lib/api-key.ts

@@ -3,7 +3,7 @@ import { IResource as IResourceBase, Resource, Stack } from '@aws-cdk/core';
 import { Construct } from 'constructs';
 import { CfnApiKey } from './apigateway.generated';
 import { ResourceOptions } from './resource';
-import { RestApi } from './restapi';
+import { IRestApi } from './restapi';
 import { QuotaSettings, ThrottleSettings, UsagePlan, UsagePlanPerApiStage } from './usage-plan';
 
 /**
@@ -47,11 +47,10 @@ export interface ApiKeyOptions extends ResourceOptions {
  */
 export interface ApiKeyProps extends ApiKeyOptions {
   /**
-   * [disable-awslint:ref-via-interface]
    * A list of resources this api key is associated with.
    * @default none
    */
-  readonly resources?: RestApi[];
+  readonly resources?: IRestApi[];
 
   /**
    * An AWS Marketplace customer identifier to use when integrating with the AWS SaaS Marketplace.
@@ -183,12 +182,12 @@ export class ApiKey extends ApiKeyBase {
     });
   }
 
-  private renderStageKeys(resources: RestApi[] | undefined): CfnApiKey.StageKeyProperty[] | undefined {
+  private renderStageKeys(resources: IRestApi[] | undefined): CfnApiKey.StageKeyProperty[] | undefined {
     if (!resources) {
       return undefined;
     }
 
-    return resources.map((resource: RestApi) => {
+    return resources.map((resource: IRestApi) => {
       const restApi = resource;
       const restApiId = restApi.restApiId;
       const stageName = restApi.deploymentStage!.stageName.toString();

packages/@aws-cdk/aws-apigateway/lib/restapi.ts

@@ -378,6 +378,16 @@ export abstract class RestApiBase extends Resource implements IRestApi {
     });
   }
 
+  /**
+   * Add an ApiKey
+   */
+  public addApiKey(id: string, options?: ApiKeyOptions): IApiKey {
+    return new ApiKey(this, id, {
+      resources: [this],
+      ...options,
+    });
+  }
+
   /**
    * Returns the given named metric for this API
    */
@@ -706,16 +716,6 @@ export class RestApi extends RestApiBase {
     return this.urlForPath();
   }
 
-  /**
-   * Add an ApiKey
-   */
-  public addApiKey(id: string, options?: ApiKeyOptions): IApiKey {
-    return new ApiKey(this, id, {
-      resources: [this],
-      ...options,
-    });
-  }
-
   /**
    * Adds a new model.
    */

packages/@aws-cdk/aws-apigateway/test/restapi.test.ts

@@ -918,6 +918,34 @@ describe('restapi', () => {
         },
       });
     });
+
+    test('addApiKey is supported', () => {
+      // GIVEN
+      const stack = new Stack();
+      const api = new apigw.SpecRestApi(stack, 'myapi', {
+        apiDefinition: apigw.ApiDefinition.fromInline({ foo: 'bar' }),
+      });
+      api.root.addMethod('OPTIONS');
+
+      // WHEN
+      api.addApiKey('myapikey', {
+        apiKeyName: 'myApiKey1',
+        value: '01234567890ABCDEFabcdef',
+      });
+
+      // THEN
+      expect(stack).toHaveResource('AWS::ApiGateway::ApiKey', {
+        Enabled: true,
+        Name: 'myApiKey1',
+        StageKeys: [
+          {
+            RestApiId: { Ref: 'myapi162F20B8' },
+            StageName: { Ref: 'myapiDeploymentStageprod329F21FF' },
+          },
+        ],
+        Value: '01234567890ABCDEFabcdef',
+      });
+    });
   });
 
   describe('Metrics', () => {

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

@@ -75,7 +75,7 @@
     "@types/nodeunit": "^0.0.31",
     "cdk-build-tools": "0.0.0",
     "cfn2ts": "0.0.0",
-    "fast-check": "^2.6.0",
+    "fast-check": "^2.6.1",
     "nodeunit": "^0.11.3",
     "pkglint": "0.0.0"
   },

packages/@aws-cdk/aws-appmesh/README.md

@@ -53,22 +53,21 @@ const mesh = new Mesh(stack, 'AppMesh', {
 
 ## Adding VirtualRouters
 
-The `Mesh` needs `VirtualRouters` as logical units to route to `VirtualNodes`.
+The _Mesh_ needs _VirtualRouters_ as logical units to route requests to _VirtualNodes_.
 
-Virtual routers handle traffic for one or more virtual services within your mesh. After you create a virtual router, you can create and associate routes for your virtual router that direct incoming requests to different virtual nodes.
+Virtual routers handle traffic for one or more virtual services within your mesh.
+After you create a virtual router, you can create and associate routes to your virtual router that direct incoming requests to different virtual nodes.
 
 ```typescript
 const router = mesh.addVirtualRouter('router', {
-  listener: {
-    portMapping: {
-      port: 8081,
-      protocol: Protocol.HTTP,
-    }
-  }
+  listeners: [ appmesh.VirtualRouterListener.http(8080) ],
 });
 ```
 
-The router can also be created using the constructor and passing in the mesh instead of calling the addVirtualRouter() method for the mesh.
+The router can also be created using the constructor and passing in the mesh instead of calling the `addVirtualRouter()` method for the mesh.
+The same pattern applies to all constructs within the appmesh library, for any mesh.addXZY method, a new constuctor can also be used.
+This is particularly useful for cross stack resources are required.
+Where creating the `mesh` as part of an infrastructure stack and creating the `resources` such as `nodes` is more useful to keep in the application stack.
 
 ```typescript
 const mesh = new Mesh(stack, 'AppMesh', {
@@ -78,18 +77,15 @@ const mesh = new Mesh(stack, 'AppMesh', {
 
 const router = new VirtualRouter(stack, 'router', {
   mesh, // notice that mesh is a required property when creating a router with a new statement
-  listener: {
-    portMapping: {
-      port: 8081,
-      protocol: Protocol.HTTP,
-    }
+  listeners: [ appmesh.VirtualRouterListener.http(8081) ]
   }
 });
 ```
 
-The listener protocol can be either `HTTP` or `TCP`.
-
-The same pattern applies to all constructs within the appmesh library, for any mesh.addXZY method, a new constuctor can also be used. This is particularly useful for cross stack resources are required. Where creating the `mesh` as part of an infrastructure stack and creating the `resources` such as `nodes` is more useful to keep in the application stack.
+The _VirtualRouterListener_ class provides an easy interface for defining new protocol specific listeners.
+The `http()`, `http2()`, `grpc()` and `tcp()` methods are available for use.
+They accept a single port parameter, that is used to define what port to match requests on.
+The port parameter can be omitted, and it will default to port 8080.
 
 ## Adding VirtualService
 
@@ -307,3 +303,32 @@ gateway.addGatewayRoute('gateway-route-grpc', {
   }),
 });
 ```
+
+## Importing Resources
+
+Each mesh resource comes with two static methods for importing a reference to an existing App Mesh resource.
+These imported resources can be used as references for other resources in your mesh.
+There are two static methods, `from<Resource>Arn` and `from<Resource>Attributes` where the `<Resource>` is replaced with the resource name.
+
+```typescript
+const arn = "arn:aws:appmesh:us-east-1:123456789012:mesh/testMesh/virtualNode/testNode";
+appmesh.VirtualNode.fromVirtualNodeArn(stack, 'importedVirtualNode', arn);
+```
+
+```typescript
+appmesh.VirtualNode.fromVirtualNodeAttributes(stack, 'imported-virtual-node', {
+  mesh: appmesh.Mesh.fromMeshName(stack, 'Mesh', 'testMesh'),
+  virtualNodeName: virtualNodeName,
+});
+```
+
+To import a mesh, there are two static methods, `fromMeshArn` and `fromMeshName`.
+
+```typescript
+const arn = 'arn:aws:appmesh:us-east-1:123456789012:mesh/testMesh';
+appmesh.Mesh.fromMeshArn(stack, 'imported-mesh', arn);
+```
+
+```typescript
+appmesh.Mesh.fromMeshName(stack, 'imported-mesh', 'abc');
+```