From f06549e0d9ecd17c7caccafdb7240009a8ffa6db Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Thu, 27 Mar 2025 12:19:04 -0400 Subject: [PATCH 1/2] Bump to beta qual Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 2 +- .github/workflows/cypress-test-multiauth-e2e.yml | 2 +- .../workflows/cypress-test-multidatasources-disabled-e2e.yml | 2 +- .github/workflows/cypress-test-multidatasources-enabled-e2e.yml | 2 +- .github/workflows/cypress-test-oidc-e2e.yml | 2 +- .github/workflows/cypress-test-saml-e2e.yml | 2 +- .github/workflows/cypress-test-tenancy-disabled.yml | 2 +- .github/workflows/cypress-test.yml | 2 +- .github/workflows/integration-test.yml | 2 +- .github/workflows/verify-binary-installation.yml | 2 +- opensearch_dashboards.json | 2 +- package.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index 177103865..a220af368 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -2,7 +2,7 @@ name: Run Cypress Tests description: 'Runs Cypress tests for the security-dashboards-plugin with opensearch_dashboards.yml and security configuration provided' env: - OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_VERSION: '3.0.0-beta1' inputs: security_config_file: diff --git a/.github/workflows/cypress-test-multiauth-e2e.yml b/.github/workflows/cypress-test-multiauth-e2e.yml index 3b0a5c46e..ce7cce876 100644 --- a/.github/workflows/cypress-test-multiauth-e2e.yml +++ b/.github/workflows/cypress-test-multiauth-e2e.yml @@ -3,7 +3,7 @@ name: Snapshot based E2E SAML multi-auth tests workflow on: [ push, pull_request ] env: - OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_VERSION: '3.0.0-beta1' CI: 1 # avoid warnings like "tput: No value for $TERM and no -T specified" TERM: xterm diff --git a/.github/workflows/cypress-test-multidatasources-disabled-e2e.yml b/.github/workflows/cypress-test-multidatasources-disabled-e2e.yml index ef9dfcfdf..6e1a48ea5 100644 --- a/.github/workflows/cypress-test-multidatasources-disabled-e2e.yml +++ b/.github/workflows/cypress-test-multidatasources-disabled-e2e.yml @@ -3,7 +3,7 @@ name: E2E multi datasources disabled workflow on: [ push, pull_request ] env: - OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_VERSION: '3.0.0-beta1' CI: 1 # avoid warnings like "tput: No value for $TERM and no -T specified" TERM: xterm diff --git a/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml b/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml index f1abc1170..539d8c29b 100644 --- a/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml +++ b/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml @@ -3,7 +3,7 @@ name: E2E multi datasources enabled workflow on: [ push, pull_request ] env: - OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_VERSION: '3.0.0-beta1' CI: 1 # avoid warnings like "tput: No value for $TERM and no -T specified" TERM: xterm diff --git a/.github/workflows/cypress-test-oidc-e2e.yml b/.github/workflows/cypress-test-oidc-e2e.yml index 590485df5..fd7ba3e16 100644 --- a/.github/workflows/cypress-test-oidc-e2e.yml +++ b/.github/workflows/cypress-test-oidc-e2e.yml @@ -3,7 +3,7 @@ name: Snapshot based E2E OIDC tests workflow on: [ push, pull_request ] env: - OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_VERSION: '3.0.0-beta1' KEYCLOAK_VERSION: '21.0.1' TEST_KEYCLOAK_CLIENT_SECRET: 'oacHfNaXyy81r2uHq1A9RY4ASryre4rZ' CI: 1 diff --git a/.github/workflows/cypress-test-saml-e2e.yml b/.github/workflows/cypress-test-saml-e2e.yml index bc5498cc6..ef43eecf6 100644 --- a/.github/workflows/cypress-test-saml-e2e.yml +++ b/.github/workflows/cypress-test-saml-e2e.yml @@ -3,7 +3,7 @@ name: Snapshot based E2E SAML tests workflow on: [ push, pull_request ] env: - OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_VERSION: '3.0.0-beta1' CI: 1 # avoid warnings like "tput: No value for $TERM and no -T specified" TERM: xterm diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml index ff5ff0d00..60e58b137 100644 --- a/.github/workflows/cypress-test-tenancy-disabled.yml +++ b/.github/workflows/cypress-test-tenancy-disabled.yml @@ -11,7 +11,7 @@ env: SPEC: 'cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js,' PLUGIN_NAME: opensearch-security OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123! - OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_VERSION: '3.0.0-beta1' jobs: cypress-tests-multitenancy-disabled: diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml index e1d4289d9..e975dc657 100644 --- a/.github/workflows/cypress-test.yml +++ b/.github/workflows/cypress-test.yml @@ -12,7 +12,7 @@ env: PLUGIN_NAME: opensearch-security OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123! CYPRESS_NO_COMMAND_LOG: 1 - OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_VERSION: '3.0.0-beta1' jobs: cypress-tests: diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 22577d9fe..892ada061 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -7,7 +7,7 @@ env: CI: 1 PLUGIN_NAME: opensearch-security OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123! - OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_VERSION: '3.0.0-beta1' jobs: tests: diff --git a/.github/workflows/verify-binary-installation.yml b/.github/workflows/verify-binary-installation.yml index 2f7b7d69e..b97c9a4a3 100644 --- a/.github/workflows/verify-binary-installation.yml +++ b/.github/workflows/verify-binary-installation.yml @@ -2,7 +2,7 @@ name: 'Install Dashboards with Plugin via Binary' on: [push, pull_request] env: - OPENSEARCH_VERSION: '3.0.0-alpha1' + OPENSEARCH_VERSION: '3.0.0-beta1' CI: 1 # avoid warnings like "tput: No value for $TERM and no -T specified" TERM: xterm diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index f00379b09..413d51b5c 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "securityDashboards", - "version": "3.0.0.0-alpha1", + "version": "3.0.0.0-beta1", "opensearchDashboardsVersion": "3.0.0", "configPath": [ "opensearch_security" diff --git a/package.json b/package.json index 974458b3e..ba32aa3fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opensearch-security-dashboards", - "version": "3.0.0.0-alpha1", + "version": "3.0.0.0-beta1", "main": "target/plugins/opensearch_security_dashboards", "opensearchDashboards": { "version": "3.0.0", From 46201b1f9f88c4e2b757e683f5a2524c31860925 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Tue, 1 Apr 2025 14:52:11 -0400 Subject: [PATCH 2/2] Use IPv6 Signed-off-by: Craig Perkins --- test/jest_integration/jwt_auth.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jest_integration/jwt_auth.test.ts b/test/jest_integration/jwt_auth.test.ts index 41f9b0cc5..21e81fe25 100644 --- a/test/jest_integration/jwt_auth.test.ts +++ b/test/jest_integration/jwt_auth.test.ts @@ -55,7 +55,7 @@ describe('start OpenSearch Dashboards server', () => { verbose: false, }, opensearch: { - hosts: ['https://localhost:9200'], + hosts: ['https://[::1]:9200'], ignoreVersionMismatch: true, ssl: { verificationMode: 'none' }, username: OPENSEARCH_DASHBOARDS_SERVER_USER,