Merge branch 'master' into math-expressions

allowed-breaking-changes.txt

@@ -74,3 +74,7 @@ removed:@aws-cdk/aws-stepfunctions-tasks.BatchSubmitJobProps.jobDefinition
 strengthened:@aws-cdk/aws-stepfunctions-tasks.BatchSubmitJobProps
 removed:@aws-cdk/aws-lambda-event-sources.ManagedKafkaEventSourceProps.cluster
 strengthened:@aws-cdk/aws-lambda-event-sources.ManagedKafkaEventSourceProps
+
+# Remove IO2 from autoscaling EbsDeviceVolumeType. This value is not supported 
+# at the moment and was not supported in the past.
+removed:@aws-cdk/aws-autoscaling.EbsDeviceVolumeType.IO2

buildspec-pr.yaml

@@ -14,4 +14,6 @@ phases:
       - yarn --version || npm -g install yarn
   build:
     commands:
-      - /bin/bash ./build.sh --extract && git diff-index --exit-code --ignore-space-at-eol --stat HEAD
+      - /bin/bash ./build.sh --extract
+      - /bin/bash ./scripts/transform.sh --extract
+      - git diff-index --exit-code --ignore-space-at-eol --stat HEAD

buildspec.yaml

@@ -17,6 +17,7 @@ phases:
       - 'if ${BUMP_CANDIDATE:-false}; then /bin/bash ./scripts/bump-candidate.sh; fi'
       - /bin/bash ./scripts/align-version.sh
       - /bin/bash ./build.sh
+      - /bin/bash ./scripts/transform.sh
   post_build:
     commands:
       - "[ -f .BUILD_COMPLETED ] && /bin/bash ./pack.sh"

package.json

@@ -71,6 +71,16 @@
     "nohoist": [
       "**/jszip",
       "**/jszip/**",
+      "@aws-cdk/assertions-alpha/colors",
+      "@aws-cdk/assertions-alpha/colors/**",
+      "@aws-cdk/assertions-alpha/diff",
+      "@aws-cdk/assertions-alpha/diff/**",
+      "@aws-cdk/assertions-alpha/fast-deep-equal",
+      "@aws-cdk/assertions-alpha/fast-deep-equal/**",
+      "@aws-cdk/assertions-alpha/string-width",
+      "@aws-cdk/assertions-alpha/string-width/**",
+      "@aws-cdk/assertions-alpha/table",
+      "@aws-cdk/assertions-alpha/table/**",
       "@aws-cdk/assertions/colors",
       "@aws-cdk/assertions/colors/**",
       "@aws-cdk/assertions/diff",

packages/@aws-cdk/assertions/vendor-in.sh

@@ -17,6 +17,16 @@ echo "⏳ Vendoring in modules..."
 
 scriptdir=$(cd $(dirname $0) && pwd)
 cd $scriptdir
+
+if [[ "$PHASE" == "transform" ]]; then
+  # Make the script short-circuit when running in the packages/individual-packages build context.
+  # That's required because the build done by individual-pkg-gen does import re-writing when copying the TS files
+  # (because it needs to know which modules are also unstable to do the rewriting correctly),
+  # but the vendor.sh script runs only after the 'build' script for this package has been invoked,
+  # which means any TS files copied by it successfully would not have their imports re-written.
+  exit 0
+fi
+
 set -euo pipefail
 dest="lib/vendored"
 mkdir -p $dest
@@ -44,4 +54,4 @@ They also cannot be bundled since they are part of the monorepo.
 Instead vendor them directly into the assertv2 library.
 EOF
 
-echo "✅ Vendoring complete"
+echo "✅ Vendoring complete"

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

@@ -4,11 +4,11 @@ import { Construct } from 'constructs';
 import { CfnApi, CfnApiProps } from '../apigatewayv2.generated';
 import { IApi } from '../common/api';
 import { ApiBase } from '../common/base';
-import { DomainMappingOptions, IStage } from '../common/stage';
+import { DomainMappingOptions } from '../common/stage';
 import { IHttpRouteAuthorizer } from './authorizer';
 import { IHttpRouteIntegration, HttpIntegration, HttpRouteIntegrationConfig } from './integration';
 import { BatchHttpRouteOptions, HttpMethod, HttpRoute, HttpRouteKey } from './route';
-import { HttpStage, HttpStageOptions } from './stage';
+import { IHttpStage, HttpStage, HttpStageOptions } from './stage';
 import { VpcLink, VpcLinkProps } from './vpc-link';
 
 /**
@@ -366,7 +366,7 @@ export class HttpApi extends HttpApiBase {
   /**
    * The default stage of this API
    */
-  public readonly defaultStage: IStage | undefined;
+  public readonly defaultStage: IHttpStage | undefined;
 
   private readonly _apiEndpoint: string;
 

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

@@ -76,7 +76,7 @@
     "@types/jest": "^26.0.24",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
-    "nodeunit-shim": "0.0.0",
+    "jest": "^26.6.3",
     "cfn2ts": "0.0.0",
     "pkglint": "0.0.0",
     "@aws-cdk/assertions": "0.0.0"

packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts

@@ -1145,6 +1145,8 @@ export class AutoScalingGroup extends AutoScalingGroupBase implements
       embedFingerprint: options.embedFingerprint,
       printLog: options.printLog,
       ignoreFailures: options.ignoreFailures,
+      includeRole: options.includeRole,
+      includeUrl: options.includeUrl,
     });
   }
 
@@ -1780,4 +1782,23 @@ export interface ApplyCloudFormationInitOptions {
    * @default false
    */
   readonly ignoreFailures?: boolean;
+
+  /**
+   * Include --url argument when running cfn-init and cfn-signal commands
+   *
+   * This will be the cloudformation endpoint in the deployed region
+   * e.g. https://cloudformation.us-east-1.amazonaws.com
+   *
+   * @default false
+   */
+  readonly includeUrl?: boolean;
+
+  /**
+  * Include --role argument when running cfn-init and cfn-signal commands
+  *
+  * This will be the IAM instance profile attached to the EC2 instance
+  *
+  * @default false
+  */
+  readonly includeRole?: boolean;
 }

packages/@aws-cdk/aws-autoscaling/lib/volume.ts

@@ -182,11 +182,6 @@ export enum EbsDeviceVolumeType {
    */
   IO1 = 'io1',
 
-  /**
-   *  Provisioned IOPS SSD - IO2
-   */
-  IO2 = 'io2',
-
   /**
    * General Purpose SSD - GP2
    */

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

@@ -78,7 +78,7 @@
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "cfn2ts": "0.0.0",
-    "nodeunit-shim": "0.0.0",
+    "jest": "^26.6.3",
     "pkglint": "0.0.0",
     "@aws-cdk/assert-internal": "0.0.0"
   },

packages/@aws-cdk/aws-cloudfront/test/origin-groups.test.ts

@@ -1,11 +1,10 @@
-import { expect, haveResourceLike } from '@aws-cdk/assert-internal';
+import '@aws-cdk/assert-internal/jest';
 import * as s3 from '@aws-cdk/aws-s3';
 import * as cdk from '@aws-cdk/core';
-import { nodeunitShim, Test } from 'nodeunit-shim';
 import { CloudFrontWebDistribution, FailoverStatusCode } from '../lib';
 
-nodeunitShim({
-  'Distribution with custom origin failover'(test: Test) {
+describe('origin group', () => {
+  test('Distribution with custom origin failover', () => {
     const stack = new cdk.Stack();
 
     new CloudFrontWebDistribution(stack, 'ADistribution', {
@@ -29,8 +28,8 @@ nodeunitShim({
       ],
     });
 
-    expect(stack).to(
-      haveResourceLike('AWS::CloudFront::Distribution', {
+    expect(stack)
+      .toHaveResourceLike('AWS::CloudFront::Distribution', {
         DistributionConfig: {
           OriginGroups: {
             Items: [
@@ -105,13 +104,12 @@ nodeunitShim({
             },
           ],
         },
-      }),
-    );
+      });
 
-    test.done();
-  },
 
-  'Distribution with s3 origin failover'(test: Test) {
+  });
+
+  test('Distribution with s3 origin failover', () => {
     const stack = new cdk.Stack();
 
     new CloudFrontWebDistribution(stack, 'ADistribution', {
@@ -141,8 +139,8 @@ nodeunitShim({
       ],
     });
 
-    expect(stack).to(
-      haveResourceLike('AWS::CloudFront::Distribution', {
+    expect(stack)
+      .toHaveResourceLike('AWS::CloudFront::Distribution', {
         DistributionConfig: {
           OriginGroups: {
             Items: [
@@ -226,9 +224,8 @@ nodeunitShim({
             },
           ],
         },
-      }),
-    );
+      });
+
 
-    test.done();
-  },
+  });
 });