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

Use adminClient instead of client when interacting with system index in integTests #1222

Merged

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Aug 2, 2024

Description

Opening this PR to attempt to fix security CI checks. There are a few instances where the adminClient should be used instead of client in integTests.

To test I am running a local node with security, JS + ISM installed.

Running tests with

./gradlew integTestRemote -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername="smoketestnode" -Duser=admin -Dpassword=myStrongPassword123\! -Dsecurity=true -Dhttps=true

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.

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

@bowenlan-amzn bowenlan-amzn left a comment

Choose a reason for hiding this comment

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

Thank you!

@bowenlan-amzn bowenlan-amzn merged commit b7ddbb6 into opensearch-project:main Aug 2, 2024
29 of 31 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/index-management/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/index-management/backport-2.x
# Create a new branch
git switch --create backport/backport-1222-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b7ddbb693128e5de31482a0d2bc8c16eef710662
# Push it to GitHub
git push --set-upstream origin backport/backport-1222-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/index-management/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1222-to-2.x.

@bowenlan-amzn
Copy link
Member

@cwperks auto backport failing, mind create one manually?

@cwperks
Copy link
Member Author

cwperks commented Aug 2, 2024

@cwperks auto backport failing, mind create one manually?

👍 , yes I will create a manual backport in a few hours.

cwperks added a commit that referenced this pull request Aug 22, 2024
…h system index in integTests (#1222) (#1223)

* Use adminClient instead of client when interacting with system index in integTests (#1222)

(cherry picked from commit b7ddbb6)

* Switch to APPLICATION_JSON

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

---------

Signed-off-by: Craig Perkins <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants