Merge branch 'master' into shivlaks/cli-stack-events

Author: shivlaks

.github/ISSUE_TEMPLATE/bug.md

@@ -18,16 +18,17 @@ description of the bug:
 minimal amount of code that causes the bug (if possible) or a reference:
 -->
 
-
-
-
-### Error Log
+### What did you expect to happen?
 
 <!--
-what is the error message you are seeing?
+What were you trying to achieve by performing the steps above?
 -->
 
+### What actually happened?
 
+<!--
+What is the unexpected behavior you were seeing? If you got an error, paste it here.
+-->
 
 
 ### Environment

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

@@ -40,3 +40,5 @@ yarn-error.log
 # Parcel default cache directory
 .parcel-cache
 
+# Cloud9
+.c9

.gitignore

@@ -1,6 +1,6 @@
 image: jsii/superchain
 tasks:
-  - init: yarn build --skip-test --no-bail --skip-prereqs
+  - init: yarn build --skip-test --no-bail --skip-prereqs --skip-compat
 
 vscode:
   extensions:

.gitpod.yml

@@ -6,7 +6,7 @@ pull_request_rules:
       label:
         add: [ contribution/core ]
     conditions:
-      - author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo|njlynch)$
+      - author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo|njlynch|ericzbeard|ccfife|fulghum|pkandasamy91|SoManyHs|uttarasridhar|BryanPan342|comcalvi|kaizen3031593|)$
       - -label~="contribution/core"
   - name: automatic merge
     actions:
@@ -21,7 +21,7 @@ pull_request_rules:
     conditions:
       - base!=release
       - -title~=(WIP|wip)
-      - -label~=(blocked|do-not-merge|no-squash)
+      - -label~=(blocked|do-not-merge|no-squash|two-approvers)
       - -merged
       - -closed
       - author!=dependabot[bot]
@@ -32,7 +32,32 @@ pull_request_rules:
       - status-success~=AWS CodeBuild us-east-1
       #- status-success=Semantic Pull Request
       - status-success=mandatory-changes
-  - name: automatic merge
+  - name: automatic merge (2+ approvers)
+    actions:
+      comment:
+        message: Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
+      merge:
+        strict: smart
+        method: squash
+        strict_method: merge
+        commit_message: title+body
+      delete_head_branch: {}
+    conditions:
+      - base!=release
+      - -title~=(WIP|wip)
+      - label~=two-approvers
+      - -label~=(blocked|do-not-merge|no-squash)
+      - -merged
+      - -closed
+      - author!=dependabot[bot]
+      - author!=dependabot-preview[bot]
+      - "#approved-reviews-by>=2"
+      - -approved-reviews-by~=author
+      - "#changes-requested-reviews-by=0"
+      - status-success~=AWS CodeBuild us-east-1
+      #- status-success=Semantic Pull Request
+      - status-success=mandatory-changes
+  - name: automatic merge (no-squash)
     actions:
       comment:
         message: Thank you for contributing! Your pull request will be updated from master and then merged automatically without squashing (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).

.mergify.yml

@@ -361,14 +361,14 @@ $ lr pkglint
 
 **awslint** is a linter for the AWS Construct Library APIs. It is executed as a
 part of the build of all AWS modules in the project and enforces the [AWS
-Construct Library Design Guidelines](./design/aws-guidelines.md).
+Construct Library Design Guidelines](./DESIGN_GUIDELINES.md).
 
 For more information about this tool, see the [awslint
-README](./tools/awslint/README.md).
+README](./packages/awslint/README.md).
 
 Generally speaking, if you make any changes which violate an awslint rule, build
 will fail with appropriate messages. All rules are documented and explained in
-the [guidelines](./design/aws-guidelines.md).
+the [guidelines](./DESIGN_GUIDELINES.md).
 
 Here are a few useful commands:
 
@@ -377,7 +377,7 @@ Here are a few useful commands:
  * `scripts/foreach.sh yarn awslint` will start linting the entire repo, progressively. Rerun `scripts/foreach.sh` after fixing to continue.
  * `lerna run awslint --no-bail --stream 2> awslint.txt` will run __awslint__ in all modules and collect all results into awslint.txt
  * `lerna run awslint -- -i <RULE>` will run awslint throughout the repo and
-   evaluate only the rule specified [awslint README](./tools/awslint/README.md)
+   evaluate only the rule specified [awslint README](./packages/awslint/README.md)
    for details on include/exclude rule patterns.
 
 ### cfn2ts

CHANGELOG.md

@@ -26,16 +26,18 @@ The CDK is available in the following languages:
 * Java ([Java ≥ 8](https://www.oracle.com/technetwork/java/javase/downloads/index.html) and [Maven ≥ 3.5.4](https://maven.apache.org/download.cgi))
 * .NET ([.NET Core ≥ 3.1](https://dotnet.microsoft.com/download))
 
--------
-
+\
+Jump To:
 [Developer Guide](https://docs.aws.amazon.com/cdk/latest/guide) |
-[CDK Workshop](https://cdkworkshop.com/) |
-[Getting Started](https://docs.aws.amazon.com/cdk/latest/guide/getting_started.html) |
 [API Reference](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-construct-library.html) |
-[Examples](https://github.com/aws-samples/aws-cdk-examples) |
+[Getting Started](#getting-started) |
 [Getting Help](#getting-help) |
+[Contributing](#contributing) |
 [RFCs](https://github.com/aws/aws-cdk-rfcs) |
-[Roadmap](https://github.com/aws/aws-cdk/blob/master/ROADMAP.md)
+[Roadmap](https://github.com/aws/aws-cdk/blob/master/ROADMAP.md) |
+[More Resources](#more-resources)
+
+-------
 
 Developers use the [CDK framework] in one of the
 supported programming languages to define reusable cloud components called [constructs], which
@@ -51,16 +53,20 @@ how to use AWS. The AWS Construct Library aims to reduce the complexity and
 glue-logic required when integrating various AWS services to achieve your goals
 on AWS.
 
-[cdk framework]: https://docs.aws.amazon.com/cdk/api/latest/
+[CDK framework]: https://docs.aws.amazon.com/cdk/latest/guide/home.html
 [constructs]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html
-[stacks]: https://docs.aws.amazon.com/cdk/latest/guide/apps_and_stacks.html#stacks
-[apps]: https://docs.aws.amazon.com/cdk/latest/guide/apps_and_stacks.html#apps
+[stacks]: https://docs.aws.amazon.com/cdk/latest/guide/stacks.html
+[apps]: https://docs.aws.amazon.com/cdk/latest/guide/apps.html
 [Developer Guide]: https://docs.aws.amazon.com/cdk/latest/guide
 [AWS CDK CLI]: https://docs.aws.amazon.com/cdk/latest/guide/tools.html
 [AWS Construct Library]: https://docs.aws.amazon.com/cdk/api/latest/docs/aws-construct-library.html
 
-## At a glance
 
+## Getting Started
+
+For a detailed walkthrough, see the [tutorial](https://docs.aws.amazon.com/cdk/latest/guide/getting_started.html#hello_world_tutorial) in the AWS CDK [Developer Guide](https://docs.aws.amazon.com/cdk/latest/guide/home.html).
+
+### At a glance
 Install or update the [AWS CDK CLI] from npm (requires [Node.js ≥ 10.13.0](https://nodejs.org/download/release/latest-v10.x/)). We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/)
 ⚠️ versions `13.0.0` to `13.6.0` are not supported due to compatibility issues with our dependencies.
 
@@ -108,38 +114,33 @@ Use the `cdk` command-line toolkit to interact with your project:
  * `cdk synth`: synthesizes an AWS CloudFormation template for your app
  * `cdk diff`: compares your app with the deployed stack
 
-For a detailed walkthrough, see the [tutorial] in the AWS CDK [Developer Guide].
-
 ## Getting Help
 
-Please use these community resources for getting help. We use the GitHub issues
-for tracking bugs and feature requests.
+The best way to interact with our team is through GitHub. You can open an [issue](https://github.com/aws/aws-cdk/issues/new/choose) and choose from one of our templates for bug reports, feature requests, documentation issues, or guidance.
+
+If you have a support plan with AWS Support, you can also create a new [support case](https://console.aws.amazon.com/support/home#/).
 
+You may also find help on these community resources:
+* Look through the [API Reference](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-construct-library.html) or [Developer Guide](https://docs.aws.amazon.com/cdk/latest/guide)
 * Ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/aws-cdk)
   and tag it with `aws-cdk`
 * Come join the AWS CDK community on [Gitter](https://gitter.im/awslabs/aws-cdk)
 * Talk in the CDK channel of the [AWS Developers Slack workspace](https://awsdevelopers.slack.com) (invite required)
-* Open a support ticket with [AWS Support](https://console.aws.amazon.com/support/home#/)
-* If it turns out that you may have found a bug,
-  please open an [issue](https://github.com/aws/aws-cdk/issues/new)
+* Check out the [partitions.io board](https://partitions.io/cdk)
+
+### Roadmap
+
+The [AWS CDK Roadmap project board](https://github.com/orgs/aws/projects/7) lets developers know about our upcoming features and priorities to help them plan how to best leverage the CDK and identify opportunities to contribute to the project. See [ROADMAP.md](https://github.com/aws/aws-cdk/blob/master/ROADMAP.md) for more information and FAQs.
 
 ## Contributing
 
 We welcome community contributions and pull requests. See
-[CONTRIBUTING](./CONTRIBUTING.md) for information on how to set up a development
+[CONTRIBUTING.md](./CONTRIBUTING.md) for information on how to set up a development
 environment and submit code.
 
-## Roadmap
-
-The [AWS CDK Roadmap project board] lets developers know about our upcoming features and priorities to help them plan how to best leverage the CDK and identify opportunities to contribute to the project. See [ROADMAP] for more information and FAQs.
-
-[AWS CDK Roadmap project board]: https://github.com/orgs/aws/projects/7
-[Roadmap]: (https://github.com/aws/aws-cdk/ROADMAP.md)
-
-## License
-
-The AWS CDK is distributed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).
-
-See [LICENSE](./LICENSE) and [NOTICE](./NOTICE) for more information.
-
-[Tutorial]: https://docs.aws.amazon.com/cdk/latest/guide/getting_started.html#hello_world_tutorial
+## More Resources
+* [CDK Workshop](https://cdkworkshop.com/)
+* [Examples](https://github.com/aws-samples/aws-cdk-examples)
+* [Changelog](./CHANGELOG.md)
+* [NOTICE](./NOTICE)
+* [License](./LICENSE) 

CONTRIBUTING.md

@@ -19,3 +19,6 @@ removed:@aws-cdk/cdk-assets-schema.FileDestination
 removed:@aws-cdk/cdk-assets-schema.FileSource
 removed:@aws-cdk/cdk-assets-schema.ManifestFile
 removed:@aws-cdk/cdk-assets-schema.FileAssetPackaging
+
+changed-type:@aws-cdk/aws-codedeploy.IServerDeploymentGroup.autoScalingGroups
+changed-type:@aws-cdk/aws-codedeploy.ServerDeploymentGroup.autoScalingGroups

README.md

@@ -4,6 +4,7 @@ set -euo pipefail
 bail="--bail"
 runtarget="build+test"
 check_prereqs="true"
+check_compat="true"
 while [[ "${1:-}" != "" ]]; do
     case $1 in
         -h|--help)
@@ -22,6 +23,9 @@ while [[ "${1:-}" != "" ]]; do
         --skip-prereqs)
             check_prereqs="false"
             ;;
+        --skip-compat)
+            check_compat="false"
+            ;;
         *)
             echo "Unrecognized parameter: $1"
             exit 1
@@ -70,6 +74,8 @@ echo "==========================================================================
 echo "building..."
 time lerna run $bail --stream $runtarget || fail
 
-/bin/bash scripts/check-api-compatibility.sh
+if [ "$check_compat" == "true" ]; then
+  /bin/bash scripts/check-api-compatibility.sh
+fi
 
 touch $BUILD_INDICATOR

allowed-breaking-changes.txt

@@ -10,5 +10,5 @@
     "tools/*"
   ],
   "rejectCycles": "true",
-  "version": "1.51.0"
+  "version": "1.57.0"
 }

build.sh

@@ -115,7 +115,7 @@ export class PipelineDeployStackAction implements codepipeline.IAction {
 
   constructor(props: PipelineDeployStackActionProps) {
     this.stack = props.stack;
-    const assets = this.stack.node.metadata.filter(md => md.type === cxschema.ArtifactMetadataEntryType.ASSET);
+    const assets = this.stack.construct.metadata.filter(md => md.type === cxschema.ArtifactMetadataEntryType.ASSET);
     if (assets.length > 0) {
       // FIXME: Implement the necessary actions to publish assets
       throw new Error(`Cannot deploy the stack ${this.stack.stackName} because it references ${assets.length} asset(s)`);

lerna.json

@@ -390,7 +390,7 @@ export = nodeunit.testCase({
 
           const deployedStack = new cdk.Stack(app, 'DeployedStack');
           for (let i = 0 ; i < assetCount ; i++) {
-            deployedStack.node.addMetadata(cxschema.ArtifactMetadataEntryType.ASSET, {});
+            deployedStack.construct.addMetadata(cxschema.ArtifactMetadataEntryType.ASSET, {});
           }
 
           test.throws(() => {

packages/@aws-cdk/app-delivery/lib/pipeline-deploy-stack-action.ts

@@ -4,13 +4,12 @@ import * as core from '@aws-cdk/core';
 import * as cxapi from '@aws-cdk/cx-api';
 
 export class SynthUtils {
+  /**
+   * Returns the cloud assembly template artifact for a stack.
+   */
   public static synthesize(stack: core.Stack, options: core.SynthesisOptions = { }): cxapi.CloudFormationStackArtifact {
     // always synthesize against the root (be it an App or whatever) so all artifacts will be included
-    const root = stack.node.root;
-
-    // if the root is an app, invoke "synth" to avoid double synthesis
-    const assembly = root instanceof core.App ? root.synth() : core.ConstructNode.synth(root.node, options);
-
+    const assembly = synthesizeApp(stack, options);
     return assembly.getStackArtifact(stack.artifactId);
   }
 
@@ -51,10 +50,7 @@ export class SynthUtils {
    */
   public static _synthesizeWithNested(stack: core.Stack, options: core.SynthesisOptions = { }): cxapi.CloudFormationStackArtifact | object {
     // always synthesize against the root (be it an App or whatever) so all artifacts will be included
-    const root = stack.node.root;
-
-    // if the root is an app, invoke "synth" to avoid double synthesis
-    const assembly = root instanceof core.App ? root.synth() : core.ConstructNode.synth(root.node, options);
+    const assembly = synthesizeApp(stack, options);
 
     // if this is a nested stack (it has a parent), then just read the template as a string
     if (stack.nestedStackParent) {
@@ -65,6 +61,24 @@ export class SynthUtils {
   }
 }
 
+/**
+ * Synthesizes the app in which a stack resides and returns the cloud assembly object.
+ */
+function synthesizeApp(stack: core.Stack, options: core.SynthesisOptions) {
+  const root = stack.construct.root;
+  if (!core.Stage.isStage(root)) {
+    throw new Error('unexpected: all stacks must be part of a Stage or an App');
+  }
+
+  // to support incremental assertions (i.e. "expect(stack).toNotContainSomething(); doSomething(); expect(stack).toContainSomthing()")
+  const force = true;
+
+  return root.synth({
+    force,
+    ...options,
+  });
+}
+
 export interface SubsetOptions {
   /**
    * Match all resources of the given type

packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts

@@ -23,7 +23,7 @@ export = {
   'staging can be disabled through context'(test: Test) {
     // GIVEN
     const stack = new Stack();
-    stack.node.setContext(cxapi.DISABLE_ASSET_STAGING_CONTEXT, true);
+    stack.construct.setContext(cxapi.DISABLE_ASSET_STAGING_CONTEXT, true);
     const sourcePath = path.join(__dirname, 'fs', 'fixtures', 'test1');
 
     // WHEN

packages/@aws-cdk/assert/lib/synth-utils.ts

@@ -221,7 +221,7 @@ export class App extends Resource implements IApp, iam.IGrantable {
       description: props.description,
       environmentVariables: Lazy.anyValue({ produce: () => renderEnvironmentVariables(this.environmentVariables) }, { omitEmptyArray: true }),
       iamServiceRole: role.roleArn,
-      name: props.appName || this.node.id,
+      name: props.appName || this.construct.id,
       oauthToken: sourceCodeProviderOptions?.oauthToken?.toString(),
       repository: sourceCodeProviderOptions?.repository,
     });

packages/@aws-cdk/assets/test/test.staging.ts

@@ -1,4 +1,4 @@
-import { Construct, Lazy, Resource } from '@aws-cdk/core';
+import { Construct, Lazy, Resource, IResolvable } from '@aws-cdk/core';
 import { CfnDomain } from './amplify.generated';
 import { IApp } from './app';
 import { IBranch } from './branch';
@@ -72,6 +72,27 @@ export class Domain extends Resource {
    */
   public readonly statusReason: string;
 
+  /**
+   * Branch patterns for the automatically created subdomain.
+   *
+   * @attribute
+   */
+  public readonly domainAutoSubDomainCreationPatterns: string[];
+
+  /**
+   * The IAM service role for the subdomain.
+   *
+   * @attribute
+   */
+  public readonly domainAutoSubDomainIamRole: string;
+
+  /**
+   * Specifies whether the automated creation of subdomains for branches is enabled.
+   *
+   * @attribute
+   */
+  public readonly domainEnableAutoSubDomain: IResolvable;
+
   private readonly subDomains: SubDomain[];
 
   constructor(scope: Construct, id: string, props: DomainProps) {
@@ -91,6 +112,9 @@ export class Domain extends Resource {
     this.domainName = domain.attrDomainName;
     this.domainStatus = domain.attrDomainStatus;
     this.statusReason = domain.attrStatusReason;
+    this.domainAutoSubDomainCreationPatterns = domain.attrAutoSubDomainCreationPatterns;
+    this.domainAutoSubDomainIamRole = domain.attrAutoSubDomainIamRole;
+    this.domainEnableAutoSubDomain = domain.attrEnableAutoSubDomain;
   }
 
   /**