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

Replace exclusionary words whitelist and blacklist in the places that… #2365

Merged
merged 4 commits into from
Mar 7, 2022

Conversation

aponb
Copy link
Contributor

@aponb aponb commented Mar 5, 2022

Description

… won't impact backwards compatibility (#2178)

  • Replace the exclusionary word whitelist with allowlist, and blacklist with denylist, in code comment and internal variable/method/class/package name.

Issues Resolved

backport of #2178 for 1.x

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Andreas [email protected]

… won't impact backwards compatibility (opensearch-project#2178)

* Replace the exclusionary word whitelist with allowlist, and blacklist with denylist, in code commet and internal variable/method/class/package name.

Signed-off-by: Andreas <[email protected]>
@opensearch-ci-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 1495858
Log 3077

Reports 3077

Signed-off-by: Andreas <[email protected]>
@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success a729d51
Log 3078

Reports 3078

@tlfeng
Copy link
Collaborator

tlfeng commented Mar 7, 2022

I think it can be merged after resolving the conflict in plugins/discovery-azure-classic/build.gradle.

@aponb
Copy link
Contributor Author

aponb commented Mar 7, 2022

I think it can be merged after resolving the conflict in plugins/discovery-azure-classic/build.gradle.

anything I can do?

@tlfeng
Copy link
Collaborator

tlfeng commented Mar 7, 2022

anything I can do?

You will need to merge the upstream 1.x branch to your local feature branch 1.x-backport2178, and resolve the conflict.

or follow the instruct to use the web editor to resolve this conflict, and then add DCO sign-off to the commit.
image

Thanks!

@aponb
Copy link
Contributor Author

aponb commented Mar 7, 2022

anything I can do?

You will need to merge the upstream 1.x branch to your local feature branch 1.x-backport2178, and resolve the conflict.

or follow the instruct to use the web editor to resolve this conflict, and then add DCO sign-off to the commit. image

Thanks!

Oh I see. There were further commits. It's merged again now!

@tlfeng
Copy link
Collaborator

tlfeng commented Mar 7, 2022

Oh I see. There were further commits. It's merged again now!

Thank you! Yeah.. there are many new commits being merged recently.

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure a2bc84c
Log 3133

Reports 3133

@tlfeng
Copy link
Collaborator

tlfeng commented Mar 7, 2022

There are 2 problems in the log 3133:

3: Task failed with an exception.
-----------
* Where:
Build file '/var/CITOOL/workflow/OpenSearch_CI/PR_Checks/Gradle_Check/search/qa/full-cluster-restart/build.gradle' line: 80

* What went wrong:
Execution failed for task ':qa:full-cluster-restart:v1.2.5#oldClusterTest'.
> `cluster{:qa:full-cluster-restart:v1.2.5}` failed to wait for cluster health yellow after 40 SECONDS
    IO error while waiting cluster
    503 Service Unavailable

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.
==============================================================================

4: Task failed with an exception.
-----------
* What went wrong:
Execution failed for task ':plugins:discovery-azure-classic:dependencyLicenses'.
> Missing SHA for jaxb-api-2.2.2.jar. Run "gradle updateSHAs" to create them

The first "failed for task ':qa:full-cluster-restart:v1.2.5#oldClusterTest'." is not likely caused by this PR, but the second one ('javax.xml.bind:jaxb-api:2.3.1') is caused by a mistake in last commit.

// and whitelist this hack in JarHell
api 'javax.xml.bind:jaxb-api:2.3.1'
// and allowlist this hack in JarHell
api 'javax.xml.bind:jaxb-api:2.2.2'
Copy link
Collaborator

@tlfeng tlfeng Mar 7, 2022

Choose a reason for hiding this comment

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

Please keep the newer version number 2.3.1, the version was updated in this commit: e54656e

Suggested change
api 'javax.xml.bind:jaxb-api:2.2.2'
api 'javax.xml.bind:jaxb-api:2.3.1'

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Respect. You have a lot of patience. Sorry for that, I missed that. It's fixed now.

Copy link
Collaborator

Choose a reason for hiding this comment

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

You are very welcome! 😄 Glad you are so responsive.

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 5e50a04
Log 3138

Reports 3138

Copy link
Collaborator

@tlfeng tlfeng left a comment

Choose a reason for hiding this comment

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

I validated all the changes in the backport PR is the same with those that merged in main branch.

Copy link
Member

@owaiskazi19 owaiskazi19 left a comment

Choose a reason for hiding this comment

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

Thanks for the changes!

@tlfeng tlfeng merged commit 0483f15 into opensearch-project:1.x Mar 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants