Remove references to admin:admin #1298

derek-ho · 2023-12-15T20:58:01Z

Description

Recently, security repo removed the hard coded admin:admin that comes from the demo configuration setup script. This makes the corresponding change. Integtest.sh is not used, and should be removed as per: opensearch-project/opensearch-build#497

Issues Resolved

[List any issues this PR will resolve]

Check List

New functionality includes testing.
- All tests pass
New functionality has been documented.
- New functionality has javadoc added
Commits are signed per the DCO using --signoff

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: Derek Ho <dxho@amazon.com>

derek-ho · 2023-12-15T20:58:35Z

build.gradle

@@ -682,6 +682,7 @@ clusters.each { name ->
            if (securityEnabled) {
                plugin(provider(securityPluginOld))
                cliSetup("opensearch-security/install_demo_configuration.sh", "-y")


@DarshitChanpura how is this being used? How do we pass in "admin" as the password here? -t?

we don't pass it here.

We have to export it as a separate command.

And if you want to use admin as password you can pass in option -t in addition to -y

codecov · 2023-12-15T21:05:10Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (be24bfa) 74.03% compared to head (2925971) 74.57%.

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #1298      +/-   ##
============================================
+ Coverage     74.03%   74.57%   +0.54%     
- Complexity     1022     1028       +6     
============================================
  Files           141      141              
  Lines          4783     4783              
  Branches        526      526              
============================================
+ Hits           3541     3567      +26     
+ Misses          889      869      -20     
+ Partials        353      347       -6

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Derek Ho <dxho@amazon.com>

monusingh-1 · 2023-12-17T06:30:35Z

@derek-ho the default integtest.sh present in opensearch-build will not run the complete integ test suite as it not handle multi-node multi-cluster topology for integtest runs.

monusingh-1 · 2023-12-18T04:13:32Z

from opensearch-project/opensearch-build#497
However, if a plugin requires some custom logic to run integtests, which the standard tool doesn't provide, they can continue maintaining this integtest.sh in their own repo.

I think we should continue to maintain integtest.sh in this repo.

derek-ho · 2023-12-18T20:22:56Z

Ack. I will revert the deletion of the file. @monusingh-1 can you double check there seems to be a security CI failure not related to this change. This change has been backported to 2.x line, so we can try and resolve any CI failures in this PR related to the change. Thanks!

derek-ho · 2023-12-27T21:25:00Z

build.gradle

@@ -681,7 +682,8 @@ clusters.each { name ->

            if (securityEnabled) {
                plugin(provider(securityPluginOld))
-                cliSetup("opensearch-security/install_demo_configuration.sh", "-y")
+                cliSetup("opensearch-security/install_demo_configuration.sh", "-y", "-t")


@monusingh-1 can you help me understand how you folks are using this line?

Signed-off-by: Derek Ho <dxho@amazon.com>

derek-ho · 2023-12-27T21:25:59Z

scripts/integtest.sh

+  # Starting in 2.12.0, security demo configuration script requires an initial admin password
+  if (( ${version_array[0]} > 2 || (${version_array[0]} == 2 && ${version_array[1]} >= 12) )); then
+      CREDENTIAL="admin:myStrongPassword123!"
+  else
+      CREDENTIAL="admin:admin"
+  fi


logic to use strong password in 2.12.0 onwards

derek-ho · 2023-12-27T21:26:24Z

@monusingh-1 can you take another look? Is security tests a known issue/related to admin credential changes?

Signed-off-by: Derek Ho <dxho@amazon.com>

DarshitChanpura · 2024-01-03T15:57:52Z

build.gradle

@@ -34,6 +34,7 @@ import org.opensearch.gradle.test.RestIntegTestTask

 buildscript {
    ext {
+        System.setProperty("OPENSEARCH_INITIAL_ADMIN_PASSWORD", "myStrongPassword123!")


we should be setting this value based on versions. i.e. for 2.11 and lower, it should be admin else use myStrongPassword123. Tests for 2.11 and lower would fail otherwise as the integtest.sh is modified to followed the same conditional assignment

* Remove references to admin:admin Signed-off-by: Derek Ho <dxho@amazon.com> * Try to pass in initial admin password via env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Try using the env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Revert file deletion and add logic for integration tests Signed-off-by: Derek Ho <dxho@amazon.com> * fix env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Update logic to be the same across all repos Signed-off-by: Derek Ho <dxho@amazon.com> * Keep old logic Signed-off-by: Derek Ho <dxho@amazon.com> * Change variable name Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 3ea239b)

* Remove references to admin:admin Signed-off-by: Derek Ho <dxho@amazon.com> * Try to pass in initial admin password via env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Try using the env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Revert file deletion and add logic for integration tests Signed-off-by: Derek Ho <dxho@amazon.com> * fix env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Update logic to be the same across all repos Signed-off-by: Derek Ho <dxho@amazon.com> * Keep old logic Signed-off-by: Derek Ho <dxho@amazon.com> * Change variable name Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 3ea239b) Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

…et the password accordingly and removes admin:admin reference from the Handbook (#1327) * Remove references to admin:admin (#1298) * Remove references to admin:admin Signed-off-by: Derek Ho <dxho@amazon.com> * Try to pass in initial admin password via env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Try using the env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Revert file deletion and add logic for integration tests Signed-off-by: Derek Ho <dxho@amazon.com> * fix env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Update logic to be the same across all repos Signed-off-by: Derek Ho <dxho@amazon.com> * Keep old logic Signed-off-by: Derek Ho <dxho@amazon.com> * Change variable name Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 3ea239b) Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates integTest behavior to accept the version and set the password accordingly Signed-off-by: Darshit Chanpura <dchanp@amazon.com> (cherry picked from commit d703887) --------- Signed-off-by: Derek Ho <dxho@amazon.com> Signed-off-by: Darshit Chanpura <dchanp@amazon.com> Co-authored-by: Derek Ho <dxho@amazon.com>

…set the password accordingly and removes admin:admin reference from the Handbook (#1328) * Remove references to admin:admin (#1298) * Remove references to admin:admin Signed-off-by: Derek Ho <dxho@amazon.com> * Try to pass in initial admin password via env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Try using the env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Revert file deletion and add logic for integration tests Signed-off-by: Derek Ho <dxho@amazon.com> * fix env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Update logic to be the same across all repos Signed-off-by: Derek Ho <dxho@amazon.com> * Keep old logic Signed-off-by: Derek Ho <dxho@amazon.com> * Change variable name Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 3ea239b) * Updates integTest behavior to accept the version and set the password accordingly Signed-off-by: Darshit Chanpura <dchanp@amazon.com> (cherry picked from commit d703887) --------- Co-authored-by: Derek Ho <dxho@amazon.com>

…et the password accordingly and removes admin:admin reference from the Handbook (opensearch-project#1327) * Remove references to admin:admin (opensearch-project#1298) * Remove references to admin:admin Signed-off-by: Derek Ho <dxho@amazon.com> * Try to pass in initial admin password via env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Try using the env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Revert file deletion and add logic for integration tests Signed-off-by: Derek Ho <dxho@amazon.com> * fix env variable Signed-off-by: Derek Ho <dxho@amazon.com> * Update logic to be the same across all repos Signed-off-by: Derek Ho <dxho@amazon.com> * Keep old logic Signed-off-by: Derek Ho <dxho@amazon.com> * Change variable name Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 3ea239b) Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates integTest behavior to accept the version and set the password accordingly Signed-off-by: Darshit Chanpura <dchanp@amazon.com> (cherry picked from commit d703887) --------- Signed-off-by: Derek Ho <dxho@amazon.com> Signed-off-by: Darshit Chanpura <dchanp@amazon.com> Co-authored-by: Derek Ho <dxho@amazon.com>

Remove references to admin:admin

69eba91

Signed-off-by: Derek Ho <dxho@amazon.com>

derek-ho requested review from krishna-ggk, ankitkala, saikaranam-amazon, soosinha, gbbafna and monusingh-1 as code owners December 15, 2023 20:58

derek-ho commented Dec 15, 2023

View reviewed changes

derek-ho added 2 commits December 15, 2023 16:08

Try to pass in initial admin password via env variable

911a23c

Signed-off-by: Derek Ho <dxho@amazon.com>

Try using the env variable

4c26601

Signed-off-by: Derek Ho <dxho@amazon.com>

derek-ho mentioned this pull request Dec 18, 2023

[META] Update all instances of admin:admin across different repositories opensearch-project/security#3624

Closed

2 tasks

derek-ho commented Dec 27, 2023

View reviewed changes

Revert file deletion and add logic for integration tests

859d45f

Signed-off-by: Derek Ho <dxho@amazon.com>

derek-ho commented Dec 27, 2023

View reviewed changes

derek-ho added 4 commits December 27, 2023 16:41

fix env variable

7bb465e

Signed-off-by: Derek Ho <dxho@amazon.com>

Update logic to be the same across all repos

b47c3d9

Signed-off-by: Derek Ho <dxho@amazon.com>

Keep old logic

a1ba4e3

Signed-off-by: Derek Ho <dxho@amazon.com>

Change variable name

2925971

Signed-off-by: Derek Ho <dxho@amazon.com>

monusingh-1 approved these changes Jan 3, 2024

View reviewed changes

ankitkala approved these changes Jan 3, 2024

View reviewed changes

DarshitChanpura added backport 2.x v2.12.0 Issues targeting release v2.12.0 labels Jan 3, 2024

DarshitChanpura reviewed Jan 3, 2024

View reviewed changes

derek-ho mentioned this pull request Jan 4, 2024

Pass in strong password instead to fix integtest workflow opensearch-project/opensearch-build#4302

Merged

monusingh-1 merged commit 3ea239b into opensearch-project:main Jan 19, 2024
16 of 17 checks passed

opensearch-trigger-bot bot mentioned this pull request Jan 19, 2024

[Backport 2.x] Remove references to admin:admin #1311

Closed

This was referenced Jan 22, 2024

[v2.12.0] Ensure CI/documentation reflect changes to default admin credentials #1310

Closed

Corrects the usage of admin credentials in integTest task #1313

Closed

DarshitChanpura mentioned this pull request Feb 9, 2024

[Backport 2.x] Updates integTest behavior to accept the version and set the password accordingly and removes admin:admin reference from the Handbook #1327

Merged

5 tasks

DarshitChanpura mentioned this pull request Feb 9, 2024

[Backport 2.12] Updates integTest behavior to accept the version and set the password accordingly and removes admin:admin reference from the Handbook #1328

Merged

5 tasks

DarshitChanpura mentioned this pull request Feb 9, 2024

Updates 2.12.0 release notes #1329

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove references to admin:admin #1298

Remove references to admin:admin #1298

derek-ho commented Dec 15, 2023

derek-ho Dec 15, 2023

DarshitChanpura Dec 15, 2023

codecov bot commented Dec 15, 2023 •

edited

Loading

monusingh-1 commented Dec 17, 2023

monusingh-1 commented Dec 18, 2023

derek-ho commented Dec 18, 2023 •

edited

Loading

derek-ho Dec 27, 2023

derek-ho Dec 27, 2023

derek-ho commented Dec 27, 2023

DarshitChanpura Jan 3, 2024

Remove references to admin:admin #1298

Remove references to admin:admin #1298

Conversation

derek-ho commented Dec 15, 2023

Description

Issues Resolved

Check List

derek-ho Dec 15, 2023

Choose a reason for hiding this comment

DarshitChanpura Dec 15, 2023

Choose a reason for hiding this comment

codecov bot commented Dec 15, 2023 • edited Loading

Codecov Report

monusingh-1 commented Dec 17, 2023

monusingh-1 commented Dec 18, 2023

derek-ho commented Dec 18, 2023 • edited Loading

derek-ho Dec 27, 2023

Choose a reason for hiding this comment

derek-ho Dec 27, 2023

Choose a reason for hiding this comment

derek-ho commented Dec 27, 2023

DarshitChanpura Jan 3, 2024

Choose a reason for hiding this comment

codecov bot commented Dec 15, 2023 •

edited

Loading

derek-ho commented Dec 18, 2023 •

edited

Loading