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

refactor: remove more duplicate enum values #20982

Merged
merged 4 commits into from
Jul 4, 2022

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented 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

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.
@rix0rrr rix0rrr requested a review from a team July 4, 2022 11:51
@rix0rrr rix0rrr self-assigned this Jul 4, 2022
@gitpod-io
Copy link

gitpod-io bot commented Jul 4, 2022

@aws-cdk-automation aws-cdk-automation requested a review from a team July 4, 2022 11:51
@github-actions github-actions bot added the p2 label Jul 4, 2022
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Jul 4, 2022
@rix0rrr rix0rrr marked this pull request as ready for review July 4, 2022 12:43
@rix0rrr
Copy link
Contributor Author

rix0rrr commented Jul 4, 2022

@Mergifyio backport v1-main

@mergify
Copy link
Contributor

mergify bot commented Jul 4, 2022

backport v1-main

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@@ -475,6 +475,7 @@
"./aws-elasticsearch": "./aws-elasticsearch/index.js",
"./aws-emr": "./aws-emr/index.js",
"./aws-emrcontainers": "./aws-emrcontainers/index.js",
"./aws-emrserverless": "./aws-emrserverless/index.js",
Copy link
Contributor

Choose a reason for hiding this comment

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

Were these intentional?

Copy link
Contributor

Choose a reason for hiding this comment

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

Adding do-not-merge and approving.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They get added as part of the aws-cdk-lib build.

@iliapolo iliapolo added the pr/do-not-merge This PR should not be merged at this time. label Jul 4, 2022
@rix0rrr rix0rrr removed the pr/do-not-merge This PR should not be merged at this time. label Jul 4, 2022
@mergify
Copy link
Contributor

mergify bot commented Jul 4, 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: 3437ece
  • 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 7f4f150 into main Jul 4, 2022
@mergify mergify bot deleted the huijbers/more-duplicate-enums branch July 4, 2022 15:44
@mergify
Copy link
Contributor

mergify bot commented Jul 4, 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 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
@mergify
Copy link
Contributor

mergify bot commented Jul 4, 2022

backport v1-main

✅ Backports have been created

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