Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(aws-cdk): include nested stacks when building changesets #19494

Merged
merged 2 commits into from
Mar 29, 2022

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Mar 21, 2022

This is a workaround for #5722 - users can do cdk deploy --no-execute
and then view the nested changesets as a way to get a full diff of
changes.

This PR is a re-roll of #17396. That PR broke an integration test in the CLI,
which this version fixes.

Closes #19224.


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

This is a workaround for #5722 - users can do `cdk deploy --no-execute`
and then view the nested changesets as a way to get a full diff of
changes.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
@rix0rrr rix0rrr added pr-linter/exempt-test The PR linter will not require test changes pr-linter/exempt-integ-test The PR linter will not require integ test changes labels Mar 21, 2022
@rix0rrr rix0rrr requested a review from a team March 21, 2022 12:59
@rix0rrr rix0rrr self-assigned this Mar 21, 2022
@gitpod-io
Copy link

gitpod-io bot commented Mar 21, 2022

@github-actions github-actions bot added the package/tools Related to AWS CDK Tools or CLI label Mar 21, 2022
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Mar 21, 2022
@mergify
Copy link
Contributor

mergify bot commented Mar 29, 2022

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).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: b91ca2f
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit 97cc8e2 into master Mar 29, 2022
@mergify mergify bot deleted the huijbers/nested-changesets-p2 branch March 29, 2022 13:45
@mergify
Copy link
Contributor

mergify bot commented Mar 29, 2022

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).

madeline-k added a commit to madeline-k/aws-cdk that referenced this pull request Mar 29, 2022
mergify bot pushed a commit that referenced this pull request Mar 29, 2022
…ding changesets … (#19618)

…(#19494)"

This reverts commit 97cc8e2.

Reverting this commit since it introduced a regression. Or, it is not a regression but the regression runs of the CLI integ tests think it is. The same test fails in the run-against-latest-release and the run-against-latest-code regression test suites: https://github.com/aws/aws-cdk/blob/master/packages/aws-cdk/test/integ/cli/cli.integtest.ts#L629.

Test fails with:
```
    expect(received).not.toEqual(expected) // deep equality

    Expected: not "arn:aws:cloudformation:ap-southeast-2:416588550161:changeSet/cdk-deploy-change-set/c8c68622-fc38-4199-81b2-b74206380152"
      at cli.integtest.ts:644:38
          at runMicrotasks (<anonymous>)
      at ../helpers/cdk.ts:130:7
      at ResourcePool.using (../helpers/resource-pool.ts:44:14)
      at ../helpers/test-helpers.ts:38:14
```
----

### All Submissions:

* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
StevePotter pushed a commit to StevePotter/aws-cdk that referenced this pull request Apr 27, 2022
This is a workaround for aws#5722 - users can do `cdk deploy --no-execute`
and then view the nested changesets as a way to get a full diff of
changes.

This PR is a re-roll of aws#17396. That PR broke an integration test in the CLI,
which this version fixes.

Closes aws#19224.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
StevePotter pushed a commit to StevePotter/aws-cdk that referenced this pull request Apr 27, 2022
…ding changesets … (aws#19618)

…(aws#19494)"

This reverts commit 97cc8e2.

Reverting this commit since it introduced a regression. Or, it is not a regression but the regression runs of the CLI integ tests think it is. The same test fails in the run-against-latest-release and the run-against-latest-code regression test suites: https://github.com/aws/aws-cdk/blob/master/packages/aws-cdk/test/integ/cli/cli.integtest.ts#L629.

Test fails with:
```
    expect(received).not.toEqual(expected) // deep equality

    Expected: not "arn:aws:cloudformation:ap-southeast-2:416588550161:changeSet/cdk-deploy-change-set/c8c68622-fc38-4199-81b2-b74206380152"
      at cli.integtest.ts:644:38
          at runMicrotasks (<anonymous>)
      at ../helpers/cdk.ts:130:7
      at ResourcePool.using (../helpers/resource-pool.ts:44:14)
      at ../helpers/test-helpers.ts:38:14
```
----

### All Submissions:

* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
@svenfinke
Copy link

Whats the status with this PR? It was reverted at the end of march and the bug was fixed a few days ago, but nothing happened. Does the bot ignore this as the PR is "merged"?

@gagipro
Copy link

gagipro commented May 1, 2023

+1 we have to patch the libs in our deployments to have the possibility to review nested stack.
A base CFN feature not fixed in one year.

thanks in advance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS. package/tools Related to AWS CDK Tools or CLI pr-linter/exempt-integ-test The PR linter will not require integ test changes pr-linter/exempt-test The PR linter will not require test changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(core): Add IncludeNestedStacks option to createChangeSet
6 participants