Partial Cherry-pick of #886 and Additional Adjustments#914
Partial Cherry-pick of #886 and Additional Adjustments#914amitgalitz merged 1 commit intoopensearch-project:2.xfrom
Conversation
Codecov Report
@@ Coverage Diff @@
## 2.x #914 +/- ##
============================================
- Coverage 79.39% 79.36% -0.03%
+ Complexity 4315 4312 -3
============================================
Files 307 307
Lines 18144 18147 +3
Branches 1909 1909
============================================
- Hits 14406 14403 -3
- Misses 2819 2823 +4
- Partials 919 921 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
|
…and Additional Adjustments This commit includes a partial cherry-pick of opensearch-project#886 along with other necessary changes for compatibility with the 2.8 branch. The cherry-picked changes from the anomaly-detection repository's main branch are not identical due to differences between the main and 2.8 branches. Specifically, the changes in opensearch-project/OpenSearch#7165 present in the main branch are not incorporated in 2.8. To reconcile this, modifications related to ImmutableMap and ImmutableOpenMap were undone. Additionally, only partial changes from opensearch-project/OpenSearch@1e08b5a were applied to 2.8. To address compiler failures, OpenSearchRejectedExecutionException was relocated from the org.opensearch.common.util.concurrent package to the org.opensearch.core.concurrency package. Tests completed: - Successful Gradle build Signed-off-by: Kaituo Li <kaituo@amazon.com>
| implementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}" | ||
| implementation group: 'com.google.guava', name: 'guava', version:'31.0.1-jre' | ||
| implementation group: 'com.google.guava', name: 'failureaccess', version:'1.0.1' | ||
| compileOnly group: 'com.google.guava', name: 'guava', version:'31.0.1-jre' |
There was a problem hiding this comment.
nit: these seemed to change in main in #770. Do you know why this was never moved to 2.x?
There was a problem hiding this comment.
not sure. Maybe due to my mistakes forgetting to add the changes to build.gradle when backporting.
|
Should we make it standard to have separate limited PRs for any breaking change fixes in main to make backporting to 2.x easier? |
It is hard to enforce that standard. When the main branch is broken, I will try to change everything to make it compile and pass tests. It is not easy to add one PR for each core breaking changes. The core selectively backport from main to 2.8 also adds the complexity of the current PR. |
4 participants
Description
This commit includes a partial cherry-pick of #886 along with other necessary changes for compatibility with the 2.8 branch.
The cherry-picked changes from the anomaly-detection repository's main branch are not identical due to differences between the main and 2.8 branches. Specifically, the changes in opensearch-project/OpenSearch#7165 present in the main branch are not incorporated in 2.8. To reconcile this, modifications related to ImmutableMap and ImmutableOpenMap were undone.
Additionally, only partial changes from opensearch-project/OpenSearch@1e08b5a were applied to 2.8. To address compiler failures, OpenSearchRejectedExecutionException was relocated from the org.opensearch.common.util.concurrent package to the org.opensearch.core.concurrency package.
I also incorporate selected changes from PR #907 to enhance security in the 2.x branch. This update transitions from simpler passwords to a more secure, unguessable password system. The motivation behind this change is to address a potential security risk identified with simpler passwords (details at https://tinyurl.com/383em9zk). Without these updates, security tests would fail due to the vulnerability associated with simple passwords.
Tests completed:
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.