refactor: remove more duplicate enum values#20982
Merged
mergify[bot] merged 4 commits intomainfrom Jul 4, 2022
Merged
Conversation
This is a follow-up to #19320: there are more duplicate enum values that need to be removed, in anticipation of a jsii release that will make these duplicate values illegal.
|
|
Contributor
Author
|
@Mergifyio backport v1-main |
Contributor
🟠 Waiting for conditions to matchDetails
|
iliapolo
reviewed
Jul 4, 2022
| "./aws-elasticsearch": "./aws-elasticsearch/index.js", | ||
| "./aws-emr": "./aws-emr/index.js", | ||
| "./aws-emrcontainers": "./aws-emrcontainers/index.js", | ||
| "./aws-emrserverless": "./aws-emrserverless/index.js", |
Contributor
There was a problem hiding this comment.
Adding do-not-merge and approving.
Contributor
Author
There was a problem hiding this comment.
They get added as part of the aws-cdk-lib build.
iliapolo
approved these changes
Jul 4, 2022
Contributor
|
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). |
Collaborator
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
Contributor
|
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 bot
pushed a commit
that referenced
this pull request
Jul 4, 2022
This is a follow-up to #19320: there are more duplicate enum values that need to be removed, in anticipation of a jsii release that will make these duplicate values illegal. ---- *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 7f4f150) # Conflicts: # packages/@aws-cdk/aws-secretsmanager/lib/secret.ts
Contributor
✅ Backports have been createdDetails
|
mergify bot
added a commit
that referenced
this pull request
Jul 5, 2022
This is an automatic backport of pull request #20982 done by [Mergify](https://mergify.com). Cherry-pick of 7f4f150 has failed: ``` On branch mergify/bp/v1-main/pr-20982 Your branch is up to date with 'origin/v1-main'. You are currently cherry-picking commit 7f4f150. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: packages/@aws-cdk/aws-secretsmanager/test/secret.test.ts modified: packages/@aws-cdk/core/lib/custom-resource-provider/custom-resource-provider.ts Unmerged paths: (use "git add <file>..." to mark resolution) both modified: packages/@aws-cdk/aws-secretsmanager/lib/secret.ts ``` To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally --- <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>
daschaa
pushed a commit
to daschaa/aws-cdk
that referenced
this pull request
Jul 9, 2022
This is a follow-up to aws#19320: there are more duplicate enum values that need to be removed, in anticipation of a jsii release that will make these duplicate values illegal. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a follow-up to #19320: there are more duplicate enum values that
need to be removed, in anticipation of a jsii release that will make
these duplicate values illegal.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license