Merge remote-tracking branch 'upstream/main' into fixes-saml-login-flow

.github/actions/run-cypress-tests/action.yml

@@ -55,7 +55,7 @@ runs:
       if: ${{ runner.os == 'Linux' }}
       run: |
         cd ./OpenSearch-Dashboards/plugins/security-dashboards-plugin
-        yarn pretest:jest_server
+        yarn runIdp
       shell: bash
 
     - name: Run OpenSearch Dashboards with provided configuration

.github/workflows/integration-test.yml

@@ -6,7 +6,7 @@ env:
   TEST_BROWSER_HEADLESS: 1
   CI: 1
   PLUGIN_NAME: opensearch-security
-  OPENSEARCH_INITIAL_ADMIN_PASSWORD: admin
+  OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123!
 
 jobs:
   tests:
@@ -34,24 +34,6 @@ jobs:
           echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
         shell: bash
 
-      - uses: browser-actions/[email protected]
-      - run: geckodriver --version
-
-      - name: Set up Firefox browser
-        if: ${{ runner.os == 'Linux' }}
-        uses: browser-actions/setup-firefox@v1
-
-      - run: firefox --version
-        if: ${{ runner.os == 'Linux' }}
-
-      # Browser-action version does not work on Windows
-      - name: Set up Firefox browser for Windows
-        if: ${{ runner.os == 'Windows' }}
-        uses: RyanL1997/setup-browser@main
-        with:
-          browser: firefox
-          version: latest
-
       - name: Download security plugin and create setup scripts
         uses: ./.github/actions/download-plugin
         with:
@@ -91,13 +73,15 @@ jobs:
         run: |
           echo "check if opensearch is ready"
           curl -XGET https://localhost:9200 -u 'admin:${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }}' -k
-          yarn test:jest_server --coverage
+          ADMIN_PASSWORD=${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} yarn test:jest_server --coverage
+        shell: bash
         working-directory: ${{ steps.install-dashboards.outputs.plugin-directory }}
 
       - name: Run integration tests on Windows
         if: ${{ runner.os == 'Windows' }}
         run: |
           echo "check if opensearch is ready"
           curl -XGET https://localhost:9200 -u 'admin:${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }}' -k
-          node .\test\run_jest_tests.js --runInBand --detectOpenHandles --forceExit --config .\test\jest.config.server.js
+          export ADMIN_PASSWORD=${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} && node ./test/run_jest_tests.js --runInBand --detectOpenHandles --forceExit --config ./test/jest.config.server.js
+        shell: bash
         working-directory: ${{ steps.install-dashboards.outputs.plugin-directory }}

package.json

@@ -19,8 +19,8 @@
     "lint:es": "node ../../scripts/eslint",
     "lint:style": "node ../../scripts/stylelint",
     "lint": "yarn run lint:es && yarn run lint:style",
-    "pretest:jest_server": "node ./test/jest_integration/runIdpServer.js &",
-    "test:jest_server": "node ./test/run_jest_tests.js --config ./test/jest.config.server.js",
+    "runIdp": "node ./test/jest_integration/runIdpServer.js &",
+    "test:jest_server": "ADMIN_PASSWORD=$ADMIN_PASSWORD node ./test/run_jest_tests.js --config ./test/jest.config.server.js",
     "test:jest_ui": "node ./test/run_jest_tests.js --config ./test/jest.config.ui.js",
     "prepare": "husky install"
   },

test/constant.ts

@@ -17,7 +17,7 @@ export const OPENSEARCH_DASHBOARDS_SERVER_USER: string = 'kibanaserver';
 export const OPENSEARCH_DASHBOARDS_SERVER_PASSWORD: string = 'kibanaserver';
 
 export const ADMIN_USER: string = 'admin';
-export const ADMIN_PASSWORD: string = 'admin';
+export const ADMIN_PASSWORD: string = process.env.ADMIN_PASSWORD || 'admin';
 const ADMIN_USER_PASS: string = `${ADMIN_USER}:${ADMIN_PASSWORD}`;
 export const ADMIN_CREDENTIALS: string = `Basic ${Buffer.from(ADMIN_USER_PASS).toString('base64')}`;
 export const AUTHORIZATION_HEADER_NAME: string = 'Authorization';