Skip to content

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Sep 11, 2024

Description

Manual backport of #1243 to 2.x

Resolves conflicts related to difference between Apache HttpClient v4 on 2.x vs. v5 on main. Also resolves a couple conflicts related to static import of ContentType.APPLICATION_JSON. Fixes ktlint errors from #1244

ktlint errors can be resolved by running ./gradlew ktlintFormat which will auto format the code.

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

cwperks and others added 3 commits September 11, 2024 00:36
…ith security (opensearch-project#1243)

* Run all integ tests with security

Signed-off-by: Craig Perkins <[email protected]>

* Use adminClient when deleting ISM index in RestStopRollupActionIT

Signed-off-by: Craig Perkins <[email protected]>

* Update RolloverActionIT

Signed-off-by: Craig Perkins <[email protected]>

* Fix RestStopSnapshotManagementIT

Signed-off-by: Craig Perkins <[email protected]>

* Fix RestChangePolicyActionIT

Signed-off-by: Craig Perkins <[email protected]>

* Fix more tests

Signed-off-by: Craig Perkins <[email protected]>

* Fix more tests

Signed-off-by: Craig Perkins <[email protected]>

* Fix more tests

Signed-off-by: Craig Perkins <[email protected]>

* Fix RestExplainTransformActionIT

Signed-off-by: Craig Perkins <[email protected]>

* Fix more tests

Signed-off-by: Craig Perkins <[email protected]>

* Make sure read from system index also uses adminClient

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 395317d)
Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
@bowenlan-amzn bowenlan-amzn merged commit f73a2cf into opensearch-project:2.x Sep 11, 2024
17 of 28 checks passed
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.

2 participants