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(integ-tests): assertions stack not deployed on v2 #21646

Merged
merged 4 commits into from
Aug 18, 2022
Merged

fix(integ-tests): assertions stack not deployed on v2 #21646

merged 4 commits into from
Aug 18, 2022

Conversation

corymhall
Copy link
Contributor

It is no longer valid in CDK v2 to specify stacks to deploy by the stack
name. This PR updates the logic to use the stack id.

I've also re-ran the integration tests that use assertions to verify
that the assertion stacks are now deployed.

fixes #21639


All Submissions:

Adding new Unconventional Dependencies:

  • This PR adds new unconventional dependencies following the process described here

New Features

  • Have you added the new feature to an integration test?
    • Did you use yarn integ to deploy the infrastructure and generate the snapshot (i.e. yarn 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

It is no longer valid in CDK v2 to specify stacks to deploy by the stack
name. This PR updates the logic to use the stack id.

I've also re-ran the integration tests that use assertions to verify
that the assertion stacks are now deployed.

fixes #21639
@gitpod-io
Copy link

gitpod-io bot commented Aug 17, 2022

@github-actions github-actions bot added bug This issue is a bug. effort/small Small work item – less than a day of effort p1 labels Aug 17, 2022
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Aug 17, 2022
@aws-cdk-automation aws-cdk-automation requested a review from a team August 17, 2022 17:08
@mrgrain mrgrain added the pr/do-not-merge This PR should not be merged at this time. label Aug 18, 2022
Copy link
Contributor

@mrgrain mrgrain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code change looks good, as soon as build is green. Looks like another tests needs to be updated.

@mrgrain
Copy link
Contributor

mrgrain commented Aug 18, 2022

@Mergifyio update

@mergify
Copy link
Contributor

mergify bot commented Aug 18, 2022

update

✅ Branch has been successfully updated

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 12c9e78
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@corymhall corymhall removed the pr/do-not-merge This PR should not be merged at this time. label Aug 18, 2022
@mergify
Copy link
Contributor

mergify bot commented Aug 18, 2022

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

1 similar comment
@mergify
Copy link
Contributor

mergify bot commented Aug 18, 2022

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit ee1b66d into aws:main Aug 18, 2022
mergify bot pushed a commit that referenced this pull request Aug 30, 2022
In #21646 we updated the `assertionStack` value to be the `node.id` of
the assertion stack since that is what the CDK CLI requires to deploy
the stack.

The change in #21646 fixed that bug, but it introduced a new one where the
assertion results are no longer read and reported on by the
integ-runner. The integ-runner reads the results of the assertions from
the stack outputs which are written to a file (with `cdk deploy --output
`assertion-results.json`). The outputs use the stack _name_ not the
_node.id_. As a result, the integ-runner was looking for outputs for an
invalid stack name.

This PR fixes that by:
- Adding `assertionStackName` property to the `integ.json` manifest
- Updates the integ-runner to use the `assertionsStackName` to lookup
  the assertion results.
- Add reporting on assertion results (previously only reported
  failures).
- Updates all integ snapshots which currently use assertions.


----

### All Submissions:

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

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/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/main/INTEGRATION_TESTS.md)?
	* [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn 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*
josephedward pushed a commit to josephedward/aws-cdk that referenced this pull request Aug 30, 2022
It is no longer valid in CDK v2 to specify stacks to deploy by the stack
name. This PR updates the logic to use the stack id.

I've also re-ran the integration tests that use assertions to verify
that the assertion stacks are now deployed.

fixes aws#21639


----

### All Submissions:

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

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/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/main/INTEGRATION_TESTS.md)?
	* [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn 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*
josephedward pushed a commit to josephedward/aws-cdk that referenced this pull request Aug 30, 2022
In aws#21646 we updated the `assertionStack` value to be the `node.id` of
the assertion stack since that is what the CDK CLI requires to deploy
the stack.

The change in aws#21646 fixed that bug, but it introduced a new one where the
assertion results are no longer read and reported on by the
integ-runner. The integ-runner reads the results of the assertions from
the stack outputs which are written to a file (with `cdk deploy --output
`assertion-results.json`). The outputs use the stack _name_ not the
_node.id_. As a result, the integ-runner was looking for outputs for an
invalid stack name.

This PR fixes that by:
- Adding `assertionStackName` property to the `integ.json` manifest
- Updates the integ-runner to use the `assertionsStackName` to lookup
  the assertion results.
- Add reporting on assertion results (previously only reported
  failures).
- Updates all integ snapshots which currently use assertions.


----

### All Submissions:

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

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/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/main/INTEGRATION_TESTS.md)?
	* [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn 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*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue is a bug. contribution/core This is a PR that came from AWS. effort/small Small work item – less than a day of effort p1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(integ-runner): assertion stacks are not deploying to the cloud
3 participants