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

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

Merged
merged 5 commits into from
Jul 7, 2023

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Jul 7, 2023

Backport #2781 to 2.x

This PR also includes a fix for: #2950

cwperks and others added 3 commits July 7, 2023 08:58
Signed-off-by: Craig Perkins <cwperx@amazon.com>
…ect#2781)

Signed-off-by: Ryan Liang <jiallian@amazon.com>
(cherry picked from commit 33aebb9)
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Member Author

cwperks commented Jul 7, 2023

There's an issue with the common-utils version:

org.opensearch.security.sanity.tests.SingleClusterSanityIT > testSecurityPluginInstallation FAILED
    java.lang.NoSuchMethodError: 'boolean org.opensearch.common.Strings.isNullOrEmpty(java.lang.String)'
        at org.opensearch.commons.rest.SecureRestClientBuilder.<init>(SecureRestClientBuilder.java:111)

I'm going to check if common-utils has fixed the issue and updating the dependency in this repo to 2.9.0.0-SNAPSHOT

@cwperks
Copy link
Member Author

cwperks commented Jul 7, 2023

common-utils has fixed the issue on 2.x: opensearch-project/common-utils#474

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@@ -21,7 +21,7 @@ buildscript {
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'

common_utils_version = System.getProperty("common_utils.version", '2.1.0.0')
common_utils_version = System.getProperty("common_utils.version", '2.9.0.0-SNAPSHOT')
Copy link
Member Author

@cwperks cwperks Jul 7, 2023

Choose a reason for hiding this comment

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

I set this to SNAPSHOT, but this should be changed to a release version ASAP.

@cwperks
Copy link
Member Author

cwperks commented Jul 7, 2023

@opensearch-project/engineering-effectiveness Can a new SNAPSHOT for common-utils 2.9.0.0 be published? https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/common-utils/2.9.0.0-SNAPSHOT/

Security needs a version of the jar with this change included.

@gaiksaya
Copy link
Member

gaiksaya commented Jul 7, 2023

@opensearch-project/engineering-effectiveness Can a new SNAPSHOT for common-utils 2.9.0.0 be published? https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/common-utils/2.9.0.0-SNAPSHOT/

Security needs a version of the jar with this change included.

Triggered here: https://github.com/opensearch-project/common-utils/actions/runs/5486967416

The process is now moved to GHA and owned by respective team. Looks like a PR is in review to fix the triggers: opensearch-project/common-utils#475

@cwperks
Copy link
Member Author

cwperks commented Jul 7, 2023

Thank you @gaiksaya !

@codecov
Copy link

codecov bot commented Jul 7, 2023

Codecov Report

Merging #2953 (c40466d) into 2.x (010e444) will decrease coverage by 0.09%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##                2.x    #2953      +/-   ##
============================================
- Coverage     62.13%   62.05%   -0.09%     
+ Complexity     3374     3367       -7     
============================================
  Files           264      264              
  Lines         19440    19440              
  Branches       3314     3314              
============================================
- Hits          12080    12063      -17     
- Misses         5764     5776      +12     
- Partials       1596     1601       +5     
Impacted Files Coverage Δ
...ic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java 58.42% <ø> (ø)
...ic/auth/ldap/backend/LDAPAuthorizationBackend.java 57.38% <ø> (ø)
...zon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java 31.22% <ø> (ø)
...opensearch/security/auditlog/sink/WebhookSink.java 76.47% <ø> (ø)
...ensearch/security/compliance/ComplianceConfig.java 84.21% <ø> (ø)
...earch/security/dlic/rest/api/AccountApiAction.java 84.05% <ø> (ø)
...rity/dlic/rest/api/PatchableResourceApiAction.java 86.25% <ø> (ø)
...ity/dlic/rest/validation/CredentialsValidator.java 70.00% <ø> (ø)
...curity/dlic/rest/validation/PasswordValidator.java 82.53% <ø> (ø)
...org/opensearch/security/filter/SecurityFilter.java 66.34% <ø> (ø)
... and 8 more

... and 7 files with indirect coverage changes

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.

5 participants