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-runner): ignoring asset changes doesn't work with new style assets #21638

Merged
merged 3 commits into from
Aug 17, 2022
Merged

fix(integ-runner): ignoring asset changes doesn't work with new style assets #21638

merged 3 commits into from
Aug 17, 2022

Conversation

corymhall
Copy link
Contributor

The integ-runner has the ability to ignore changes to assets since asset
changes can lead to a lot of snapshot failures and we don't always need
to re-deploy the integ test when this occurs. The canonicalizeTemplate
function only worked with the v1
(@aws-cdk/core:newStyleStackSynthesis:false) assets which were stored
in CFN parameters.

This PR updates the logic to also account for the new style assets.
Because we now have a list of the actual assets in the asset manifest
the logic simply reads the list of assets from the manifest and replaces
substitutes those values.

I also refactored some things:

  • The canonicalizeTemplate function was moved into a private method of
    IntegSnapshotRunner since that is the only place it is used.
  • The CloudAssemblyManifest asset methods were refactored so that we
    could either return the asset location or the asset id

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

… assets

The integ-runner has the ability to ignore changes to assets since asset
changes can lead to a lot of snapshot failures and we don't always need
to re-deploy the integ test when this occurs. The `canonicalizeTemplate`
function only worked with the v1
(`@aws-cdk/core:newStyleStackSynthesis:false`) assets which were stored
in CFN parameters.

This PR updates the logic to also account for the new style assets.
Because we now have a list of the actual assets in the asset manifest
the logic simply reads the list of assets from the manifest and replaces
substitutes those values.

I also refactored some things:
- The `canonicalizeTemplate` function was moved into a private method of
 `IntegSnapshotRunner` since that is the only place it is used.
- The CloudAssemblyManifest asset methods were refactored so that we
  could either return the asset location or the asset id
@gitpod-io
Copy link

gitpod-io bot commented Aug 17, 2022

@aws-cdk-automation aws-cdk-automation requested a review from a team August 17, 2022 13:40
@github-actions github-actions bot added the p2 label Aug 17, 2022
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Aug 17, 2022
@mergify
Copy link
Contributor

mergify bot commented Aug 17, 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).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: c486151
  • 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 7857f55 into aws:main Aug 17, 2022
@mergify
Copy link
Contributor

mergify bot commented Aug 17, 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).

josephedward pushed a commit to josephedward/aws-cdk that referenced this pull request Aug 30, 2022
… assets (aws#21638)

The integ-runner has the ability to ignore changes to assets since asset
changes can lead to a lot of snapshot failures and we don't always need
to re-deploy the integ test when this occurs. The `canonicalizeTemplate`
function only worked with the v1
(`@aws-cdk/core:newStyleStackSynthesis:false`) assets which were stored
in CFN parameters.

This PR updates the logic to also account for the new style assets.
Because we now have a list of the actual assets in the asset manifest
the logic simply reads the list of assets from the manifest and replaces
substitutes those values.

I also refactored some things:
- The `canonicalizeTemplate` function was moved into a private method of
 `IntegSnapshotRunner` since that is the only place it is used.
- The CloudAssemblyManifest asset methods were refactored so that we
  could either return the asset location or the asset id


----

### 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
contribution/core This is a PR that came from AWS. p2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants