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.17] Update CI check for integ-test-with-security to run all integ tests with security #1248

Merged
merged 3 commits into from
Sep 11, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Sep 11, 2024

Description

Manual backport of #1243 to 2.17

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:57
…ith security (opensearch-project#1243)

* Run all integ tests with security

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Use adminClient when deleting ISM index in RestStopRollupActionIT

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update RolloverActionIT

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix RestStopSnapshotManagementIT

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix RestChangePolicyActionIT

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix more tests

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix more tests

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix more tests

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix RestExplainTransformActionIT

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix more tests

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Make sure read from system index also uses adminClient

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 395317d)
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@bowenlan-amzn bowenlan-amzn merged commit 5cb0dbc into opensearch-project:2.17 Sep 11, 2024
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.

3 participants