-
Notifications
You must be signed in to change notification settings - Fork 60
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
Updates integTest behavior to accept the version and set the password accordingly, and force HTTP1 policy for local clusters #1318
Conversation
… accordingly Signed-off-by: Darshit Chanpura <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1318 +/- ##
============================================
+ Coverage 74.19% 76.55% +2.36%
- Complexity 1023 1050 +27
============================================
Files 141 141
Lines 4782 4782
Branches 526 526
============================================
+ Hits 3548 3661 +113
+ Misses 883 771 -112
+ Partials 351 350 -1 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Darshit Chanpura <[email protected]>
Security tests no-longer fail with unauthorized. instead they fail with:
|
Signed-off-by: Darshit Chanpura <[email protected]>
6e56239
to
6f02a20
Compare
@monusingh-1 Mind reviewing this one? |
Signed-off-by: Darshit Chanpura <[email protected]>
Head branch was pushed to by a user without write access
@monusingh-1 Mind giving this another look? I've fixed the broken security tests. |
scripts/integtest.sh
Outdated
CREDENTIAL="admin:myStrongPassword123!" | ||
else | ||
COMPARE_VERSION=`echo $OPENSEARCH_REQUIRED_VERSION $OPENSEARCH_VERSION | tr ' ' '\n' | sort -V | uniq | head -n 1` | ||
if [ "$COMPARE_VERSION" != "$OPENSEARCH_REQUIRED_VERSION" ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't this check for 2.12 or higher?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you provide some context in code comments?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is what this check is doing.
OPENSEARCH_VERSION=3.0.0
OPENSEARCH_REQUIRED_VERSION="2.12.0"
if [ -z "$CREDENTIAL" ]
then
# Starting in 2.12.0, security demo configuration script requires an initial admin password
COMPARE_VERSION=`echo $OPENSEARCH_REQUIRED_VERSION $OPENSEARCH_VERSION | tr ' ' '\n' | sort -V | uniq | head -n 1`
if [ "$COMPARE_VERSION" != "$OPENSEARCH_REQUIRED_VERSION" ]; then
CREDENTIAL="admin:admin"
else
CREDENTIAL="admin:myStrongPassword123!"
fi
fi
echo $CREDENTIAL
Feel free to test this out here: https://www.onlinegdb.com/online_bash_shell
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have added more comments.
Signed-off-by: Darshit Chanpura <[email protected]>
Head branch was pushed to by a user without write access
@monusingh-1 @ankitkala I've addressed the feedback. Mind re-reviewing it? |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1318-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d703887f88f24c444e0513ebeca21e30b93354f8
# Push it to GitHub
git push --set-upstream origin backport/backport-1318-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.12 2.12
# Navigate to the new working tree
cd .worktrees/backport-2.12
# Create a new branch
git switch --create backport/backport-1318-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d703887f88f24c444e0513ebeca21e30b93354f8
# Push it to GitHub
git push --set-upstream origin backport/backport-1318-to-2.12
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.12 Then, create a pull request where the |
Description
integtest.sh run by opensearch-build passes
-v
to supply opensearch version however it was not being consumed on CCR side. This PR consumes that version to conditionally set the password correctly and fixes:https://build.ci.opensearch.org/blue/rest/organizations/jenkins/pipelines/integ-test/runs/7592/nodes/98/steps/579/log/?start=0
Issues Resolved
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.