Skip to content

Commit

Permalink
Add changelog line and change PR to be merged in after 2.12 release
Browse files Browse the repository at this point in the history
Signed-off-by: Derek Ho <[email protected]>
  • Loading branch information
derek-ho committed Dec 27, 2023
1 parent 64f17af commit dcee918
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 13 deletions.
40 changes: 28 additions & 12 deletions .github/actions/opensearch/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,34 @@ if [[ $DISABLE_SECURITY = true ]]; then
--silent \
http://os1:$PORT
else
docker run \
--network cluster \
--rm \
appropriate/curl \
--max-time 120 \
--retry 120 \
--retry-delay 1 \
--retry-connrefused \
--show-error \
--silent \
--insecure \
https://admin:myStrongPassword123!@os1:$PORT
if [[ $CLUSTER_VERSION = 'latest' ]]; then
# Since 2.12.0, security demo configuration requires an initial admin password, which is set to
# myStrongPassword123!
docker run \
--network cluster \
--rm \
appropriate/curl \
--max-time 120 \
--retry 120 \
--retry-delay 1 \
--retry-connrefused \
--show-error \
--silent \
--insecure \
https://admin:myStrongPassword123!@os1:$PORT
else
docker run \
--network cluster \
--rm \
appropriate/curl \
--max-time 120 \
--retry 120 \
--retry-delay 1 \
--retry-connrefused \
--show-error \
--silent \
--insecure \
https://admin:admin!@os1:$PORT
fi

sleep 10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

test-opensearch-security:
env:
TEST_OPENSEARCH_SERVER: https://admin:myStrongPassword123!@localhost:9200
TEST_OPENSEARCH_SERVER: https://admin:admin@localhost:9200
PORT: 9200
strategy:
fail-fast: false
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [Unreleased]
### Added
- Pass in an initial admin password, required by security after 2.12.0 release ([#217](https://github.com/opensearch-project/opensearch-ruby/issues/217))
### Changed
### Deprecated
### Removed
Expand Down

0 comments on commit dcee918

Please sign in to comment.