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(ec2): deprecated SubnetType enums are treated incorrectly #21140

Merged
merged 1 commit into from
Jul 14, 2022

Conversation

iliapolo
Copy link
Contributor

@iliapolo iliapolo commented Jul 14, 2022

In #19320, we changed the values of deprecated enums to include a Deprecated_ prefix. This also meant we had to do some gymnastics in the code to change usages of the value to a switch case.

However, there were also places in the code that do enum comparison, which uses the enum value. Those comparison points need to also explicitly consider the equivalent deprecated enums.

Fixes #21131, Fixes #21138


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

@gitpod-io
Copy link

gitpod-io bot commented Jul 14, 2022

@iliapolo iliapolo requested a review from a team July 14, 2022 14:10
@aws-cdk-automation aws-cdk-automation requested a review from a team July 14, 2022 14:10
@github-actions github-actions bot added the p2 label Jul 14, 2022
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Jul 14, 2022
@github-actions github-actions bot added bug This issue is a bug. p0 and removed p2 labels Jul 14, 2022
@kaizencc
Copy link
Contributor

@Mergifyio backport v1-main

@mergify
Copy link
Contributor

mergify bot commented Jul 14, 2022

backport v1-main

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

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

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

@mergify
Copy link
Contributor

mergify bot commented Jul 14, 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 0b5123a into main Jul 14, 2022
@mergify mergify bot deleted the epolon/subnet-type-deprecated branch July 14, 2022 14:46
mergify bot pushed a commit that referenced this pull request Jul 14, 2022
In #19320, we changed the values of deprecated enums to include a `Deprecated_` prefix. This also meant we had to do some gymnastics in the code to change usages of the value to a switch case.

However, there were also places in the code that do enum comparison, which uses the enum value. Those comparison points need to also explicitly consider the equivalent deprecated enums.

Fixes #21131, Fixes #21138

----

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

(cherry picked from commit 0b5123a)
@mergify
Copy link
Contributor

mergify bot commented Jul 14, 2022

backport v1-main

✅ Backports have been created

mergify bot added a commit that referenced this pull request Jul 14, 2022
…port #21140) (#21141)

This is an automatic backport of pull request #21140 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>
@HBobertz HBobertz mentioned this pull request Nov 10, 2022
4 tasks
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. p0
Projects
None yet
3 participants