-
Notifications
You must be signed in to change notification settings - Fork 280
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] Update imports for files refactored in core PR #8157 (#3003) #3036
[Backport 2.x] Update imports for files refactored in core PR #8157 (#3003) #3036
Conversation
…ect#3003) * Update imports for files refactored in core PR #8157 Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update references to old packages in test files Signed-off-by: Craig Perkins <cwperx@amazon.com> * Get remaining bad imports in integrationTest Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update log4j in bwc build.gradle Signed-off-by: Craig Perkins <cwperx@amazon.com> * Use versions.log4j Signed-off-by: Craig Perkins <cwperx@amazon.com> * Also reference guava version Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update integtest.sh Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update tests that expect certain amount of headers in a response Signed-off-by: Craig Perkins <cwperx@amazon.com> * Empty commit Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com> (cherry picked from commit 37aacdc)
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Codecov Report
@@ Coverage Diff @@
## 2.x #3036 +/- ##
============================================
- Coverage 62.25% 62.21% -0.05%
+ Complexity 3311 3308 -3
============================================
Files 264 264
Lines 19468 19468
Branches 3326 3326
============================================
- Hits 12120 12112 -8
- Misses 5721 5729 +8
Partials 1627 1627
|
Plugin install seems to be failing due to stale core artifact. Will wait for new artifact to be available before re-running these tasks. The error below should not be thrown as that is the correct path for Writeable.Reader:
|
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
422cad8
to
5fdad23
Compare
Backwards-compatibility also seems to be failing only for windows due to stale artifact issue too. |
src/integrationTest/java/org/opensearch/security/http/JwtAuthenticationTests.java
Outdated
Show resolved
Hide resolved
src/main/java/org/opensearch/security/ssl/SecureSSLSettings.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Backwards compatibility tests are broken because the CI task checks out 2.x and current HEAD at 2.x doesn;t contain the import changes. (This PR brings those changes) |
We either need to force-merge this to fix bwc tests or temporarily change the reference to current branch to |
I think this is the similar issue happened on main, and if this is the case I think Craig's procedure can be also applied to here. But yeah, instead of referencing to the current 2.x, reference to current fix's branch will definitely resolve the issue. |
bwc tests need to be revisited on the 2.x branch. I see a change in main that isn't in 2.x that could help the issue: #2253 |
I think the bwc tests in 2.x are doing too much. It should be testing from the 1.3 -> branch of the PR against 2.x |
@DarshitChanpura I believe you can update these lines: https://github.com/opensearch-project/security/blob/2.x/.github/workflows/ci.yml#L92-L93 The new values would be Edit:
|
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Description
Backports 37aacdc from #3003
Also adds integration tests to 2.x line.
Check List
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.