Skip to content

chore: (revert) chore: move modules to assertions (#16671)#16727

Merged
mergify[bot] merged 3 commits intomasterfrom
njlynch/revert-assertions
Sep 30, 2021
Merged

chore: (revert) chore: move modules to assertions (#16671)#16727
mergify[bot] merged 3 commits intomasterfrom
njlynch/revert-assertions

Conversation

@njlynch
Copy link
Copy Markdown
Contributor

@njlynch njlynch commented Sep 30, 2021

This reverts commit be6aa2e.

This commit, coupled with the newStyleSynthesis flag (enabled by default on the
v2 branch) do not play nicely together. This is due to the default resources
present in every template (Parameter and Rule for checking bootstrap version).
The templateMatches usage introduced in the original PR does not filter out
these default inclusions, leading to most every of those tests to fail. Rather
than block the forward merge on trying to come up with a clever solution,
temporarily reverting.


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

This reverts commit be6aa2e.

This commit, coupled with the newStyleSynthesis flag (enabled by default on the
v2 branch) do not play nicely together. This is due to the default resources
present in every template (Parameter and Rule for checking bootstrap version).
The `templateMatches` usage introduced in the original PR does not filter out
these default inclusions, leading to most every of those tests to fail. Rather
than block the forward merge on trying to come up with a clever solution,
temporarily reverting.
@njlynch njlynch requested a review from a team September 30, 2021 08:55
@njlynch njlynch self-assigned this Sep 30, 2021
@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented Sep 30, 2021

@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Sep 30, 2021
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 30, 2021

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
Copy Markdown
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 02d365a
  • 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 341303f into master Sep 30, 2021
@mergify mergify bot deleted the njlynch/revert-assertions branch September 30, 2021 11:19
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 30, 2021

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

njlynch added a commit that referenced this pull request Sep 30, 2021
This reverts commit 5e452f8.

Similar to #16727, reverting the move to assertions until the correct API to use
for the combination of `matchTemplate` and `newStyleSynthesis` can be defined.
mergify bot pushed a commit that referenced this pull request Sep 30, 2021
#16740)

This reverts commit 5e452f8.

Similar to #16727, reverting the move to assertions until the correct API to use
for the combination of `matchTemplate` and `newStyleSynthesis` can be defined.


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
njlynch added a commit that referenced this pull request Oct 11, 2021
This reverts commit be6aa2e.

This commit, coupled with the newStyleSynthesis flag (enabled by default on the
v2 branch) do not play nicely together. This is due to the default resources
present in every template (Parameter and Rule for checking bootstrap version).
The `templateMatches` usage introduced in the original PR does not filter out
these default inclusions, leading to most every of those tests to fail. Rather
than block the forward merge on trying to come up with a clever solution,
temporarily reverting.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
njlynch added a commit that referenced this pull request Oct 11, 2021
#16740)

This reverts commit 5e452f8.

Similar to #16727, reverting the move to assertions until the correct API to use
for the combination of `matchTemplate` and `newStyleSynthesis` can be defined.


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
TikiTDO pushed a commit to TikiTDO/aws-cdk that referenced this pull request Feb 21, 2022
)

This reverts commit be6aa2e.

This commit, coupled with the newStyleSynthesis flag (enabled by default on the
v2 branch) do not play nicely together. This is due to the default resources
present in every template (Parameter and Rule for checking bootstrap version).
The `templateMatches` usage introduced in the original PR does not filter out
these default inclusions, leading to most every of those tests to fail. Rather
than block the forward merge on trying to come up with a clever solution,
temporarily reverting.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
TikiTDO pushed a commit to TikiTDO/aws-cdk that referenced this pull request Feb 21, 2022
…)" (aws#16740)

This reverts commit 5e452f8.

Similar to aws#16727, reverting the move to assertions until the correct API to use
for the combination of `matchTemplate` and `newStyleSynthesis` can be defined.


----

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants