Fix the `import org.opensearch.core.common.Strings;` and `import org.opensearch.core.common.logging.LoggerMessageFormat;` by RyanL1997 · Pull Request #2781 · opensearch-project/security

RyanL1997 · 2023-05-18T20:15:59Z

Description

Fix the import org.opensearch.core.common.Strings; and import org.opensearch.core.common.logging.LoggerMessageFormat; to adapt the breaking change in core: opensearch-project/OpenSearch#7508

Category (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)
Refactoring

Issues Resolved

Relate [Refactor] Build failure due to breaking changes introduced in core #2782

Check List

~~New functionality includes testing~~
~~New functionality has been documented~~
Commits are signed per the DCO using --signoff

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: Ryan Liang <jiallian@amazon.com>

RyanL1997 · 2023-05-18T20:19:13Z

 	public String toString() {
 		try {
-			return Strings.toString(JsonXContent.contentBuilder().map(getAsMap()));
+			return org.opensearch.common.Strings.toString(JsonXContent.contentBuilder().map(getAsMap()));


NOTE: this line and L474 are temporarily changed into this since the original toString() function is undefined in org.opensearch.core.common.Strings. I will create an issue to track that.

Issue I created: #2782

codecov · 2023-05-18T20:47:06Z

Codecov Report

Merging #2781 (a68e734) into main (15860b6) will decrease coverage by 0.02%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main    #2781      +/-   ##
============================================
- Coverage     61.48%   61.47%   -0.02%     
+ Complexity     3402     3401       -1     
============================================
  Files           266      266              
  Lines         18865    18865              
  Branches       3302     3302              
============================================
- Hits          11600    11597       -3     
- Misses         5669     5671       +2     
- Partials       1596     1597       +1

Impacted Files	Coverage Δ
...ic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java	`55.29% <ø> (ø)`
...ic/auth/ldap/backend/LDAPAuthorizationBackend.java	`57.81% <ø> (ø)`
...zon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java	`31.48% <ø> (ø)`
...opensearch/security/auditlog/sink/WebhookSink.java	`76.74% <ø> (ø)`
...ensearch/security/compliance/ComplianceConfig.java	`83.33% <ø> (ø)`
...earch/security/dlic/rest/api/AccountApiAction.java	`81.15% <ø> (ø)`
...rity/dlic/rest/api/PatchableResourceApiAction.java	`85.60% <ø> (ø)`
...ity/dlic/rest/validation/CredentialsValidator.java	`70.00% <ø> (ø)`
...curity/dlic/rest/validation/PasswordValidator.java	`84.05% <ø> (ø)`
...org/opensearch/security/filter/SecurityFilter.java	`71.75% <ø> (ø)`
... and 8 more

... and 1 file with indirect coverage changes

DarshitChanpura · 2023-05-19T14:51:30Z

Plugin-install CI task will pass once common-utils artifact is available with opensearch-project/common-utils#432 merged

RyanL1997 · 2023-05-19T16:23:11Z

Checking up the errors in plugin-install

cwperks · 2023-05-22T14:03:11Z

@opensearch-project/engineering-effectiveness can a build be triggered to produce new artifacts for common-utils? The CI for this build fixing PR is blocked by stale artifacts.

prudhvigodithi · 2023-05-22T14:48:02Z

@opensearch-project/engineering-effectiveness can a build be triggered to produce new artifacts for common-utils? The CI for this build fixing PR is blocked by stale artifacts.

I have triggered one with just OpenSearch common-utils.

RyanL1997 · 2023-05-22T16:34:51Z

I have triggered one with just OpenSearch common-utils.

Hi @prudhvigodithi, thank you for the follow-up! However, the new build seems failed (https://build.ci.opensearch.org/job/distribution-build-opensearch/7870/console) :/

prudhvigodithi · 2023-05-22T16:38:41Z

I have triggered one with just OpenSearch common-utils.

Hi @prudhvigodithi, thank you for the follow-up! However, the new build seems failed (https://build.ci.opensearch.org/job/distribution-build-opensearch/7870/console) :/

Ya, I have just noticed it failed with OpenSearch :( and did not even reach common-utils, there is already an open issue opensearch-project/OpenSearch#7590 in OpenSearch repo.

RyanL1997 · 2023-05-22T16:42:33Z

@prudhvigodithi got it, thanks! I will keep tracking that.

…ect#2781) Signed-off-by: Ryan Liang <jiallian@amazon.com> Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>

…ect#2781) Signed-off-by: Ryan Liang <jiallian@amazon.com>

…ect#2781) Signed-off-by: Ryan Liang <jiallian@amazon.com> Signed-off-by: Sam <samuel.costa@eliatra.com>

opensearch-trigger-bot · 2023-07-07T13:05:28Z

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-2781-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 33aebb96781a4988ae14fab2a5e53b17bb99ecf6
# Push it to GitHub
git push --set-upstream origin backport/backport-2781-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2781-to-2.x.

cwperks · 2023-07-07T13:08:57Z

Creating a manual backport now

…ect#2781) Signed-off-by: Ryan Liang <jiallian@amazon.com> (cherry picked from commit 33aebb9)

cwperks · 2023-07-07T13:10:37Z

Manual backport created: #2953

… import org.opensearch.core.common.logging.LoggerMessageFormat; (#2953) * Use version of httpclient 4 from core's buildSrc/version.properties Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix the `import org.opensearch.core.common.Strings;` (#2781) Signed-off-by: Ryan Liang <jiallian@amazon.com> (cherry picked from commit 33aebb9) * Run spotlessApply Signed-off-by: Craig Perkins <cwperx@amazon.com> * Set common-utils-version to 2.9.0.0-SNAPSHOT Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com> Co-authored-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com>

Fix the import org.opensearch.core.common.Strings;

a68e734

Signed-off-by: Ryan Liang <jiallian@amazon.com>

RyanL1997 requested review from DarshitChanpura, cliu123, cwperks, davidlago, peternied, reta and stephen-crawford as code owners May 18, 2023 20:16

RyanL1997 commented May 18, 2023

View reviewed changes

RyanL1997 mentioned this pull request May 18, 2023

[Refactor] Build failure due to breaking changes introduced in core #2782

Closed

2 tasks

DarshitChanpura approved these changes May 19, 2023

View reviewed changes

reta approved these changes May 19, 2023

View reviewed changes

RyanL1997 changed the title ~~Fix the import org.opensearch.core.common.Strings;~~ Fix the import org.opensearch.core.common.Strings; and import org.opensearch.core.common.logging.LoggerMessageFormat; May 19, 2023

cwperks approved these changes May 22, 2023

View reviewed changes

monusingh-1 mentioned this pull request May 23, 2023

Update snakeyaml to version 2.0 opensearch-project/cross-cluster-replication#860

Merged

5 tasks

cwperks merged commit 33aebb9 into opensearch-project:main May 23, 2023

samuelcostae pushed a commit to samuelcostae/security that referenced this pull request Jun 19, 2023

Fix the import org.opensearch.core.common.Strings; (opensearch-proj…

d94560b

…ect#2781) Signed-off-by: Ryan Liang <jiallian@amazon.com>

samuelcostae pushed a commit to samuelcostae/security that referenced this pull request Jun 19, 2023

Fix the import org.opensearch.core.common.Strings; (opensearch-proj…

1b7649a

…ect#2781) Signed-off-by: Ryan Liang <jiallian@amazon.com> Signed-off-by: Sam <samuel.costa@eliatra.com>

cwperks mentioned this pull request Jul 7, 2023

[2.x] Use version of httpclient 4 from core's buildSrc/version.properties #2952

Closed

3 tasks

cwperks added the backport 2.x label Jul 7, 2023

cwperks pushed a commit to cwperks/security that referenced this pull request Jul 7, 2023

Fix the import org.opensearch.core.common.Strings; (opensearch-proj…

458de81

…ect#2781) Signed-off-by: Ryan Liang <jiallian@amazon.com> (cherry picked from commit 33aebb9)

cwperks mentioned this pull request Jul 7, 2023

[Backport 2.x] Fix the import org.opensearch.core.common.Strings; and import org.opensearch.core.common.logging.LoggerMessageFormat; #2953

Merged

Conversation

RyanL1997 commented May 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issues Resolved

Check List

Uh oh!

RyanL1997 May 18, 2023

Choose a reason for hiding this comment

Uh oh!

RyanL1997 May 18, 2023

Choose a reason for hiding this comment

Uh oh!

codecov bot commented May 18, 2023

Codecov Report

Uh oh!

DarshitChanpura commented May 19, 2023

Uh oh!

RyanL1997 commented May 19, 2023

Uh oh!

cwperks commented May 22, 2023

Uh oh!

prudhvigodithi commented May 22, 2023

Uh oh!

RyanL1997 commented May 22, 2023

Uh oh!

prudhvigodithi commented May 22, 2023

Uh oh!

RyanL1997 commented May 22, 2023

Uh oh!

opensearch-trigger-bot bot commented Jul 7, 2023

Uh oh!

cwperks commented Jul 7, 2023

Uh oh!

cwperks commented Jul 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

RyanL1997 commented May 18, 2023 •

edited

Loading