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

Merged
merged 4 commits into from
Jul 5, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 4, 2022

This is an automatic backport of pull request #20982 done by Mergify.
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 7f4f150b97.
  (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


Mergify commands and options

More conditions and actions can be found in the documentation.

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 you can:

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

Finally, you can contact us on https://mergify.com

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
@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 15:45
@github-actions github-actions bot added the p2 label Jul 4, 2022
@rix0rrr rix0rrr changed the title refactor: remove more duplicate enum values (backport #20982) refactor: remove more duplicate enum values Jul 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jul 5, 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: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 4a83d97
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify
Copy link
Contributor Author

mergify bot commented Jul 5, 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 a7e3eab into v1-main Jul 5, 2022
@mergify mergify bot deleted the mergify/bp/v1-main/pr-20982 branch July 5, 2022 10:46
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants