From 31b778a353fe10c99e16f69c1b5fbc3a9e4ebffb Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 25 Feb 2025 14:05:24 -0500 Subject: [PATCH 1/4] Fix alpha bump Signed-off-by: Derek Ho --- opensearch_dashboards.json | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index cddc826d8..f00379b09 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "securityDashboards", "version": "3.0.0.0-alpha1", - "opensearchDashboardsVersion": "3.0.0-alpha1", + "opensearchDashboardsVersion": "3.0.0", "configPath": [ "opensearch_security" ], diff --git a/package.json b/package.json index 53a8151fc..d2a93dd99 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "version": "3.0.0.0-alpha1", "main": "target/plugins/opensearch_security_dashboards", "opensearchDashboards": { - "version": "3.0.0-alpha1", - "templateVersion": "3.0.0-alpha1" + "version": "3.0.0", + "templateVersion": "3.0.0" }, "license": "Apache-2.0", "homepage": "https://github.com/opensearch-project/security-dashboards-plugin", From 6e45fd18f44e3ff9b45859ec9cb26688de61a5b4 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 25 Feb 2025 15:27:13 -0500 Subject: [PATCH 2/4] Fix version issue Signed-off-by: Derek Ho --- .github/workflows/cypress-test-tenancy-disabled.yml | 1 + .github/workflows/cypress-test.yml | 3 +-- .github/workflows/integration-test.yml | 3 +-- .github/workflows/verify-binary-installation.yml | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml index 07679e790..af7dc4a26 100644 --- a/.github/workflows/cypress-test-tenancy-disabled.yml +++ b/.github/workflows/cypress-test-tenancy-disabled.yml @@ -11,6 +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' jobs: cypress-tests-multitenancy-disabled: diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml index e63532f9c..e1d4289d9 100644 --- a/.github/workflows/cypress-test.yml +++ b/.github/workflows/cypress-test.yml @@ -12,6 +12,7 @@ env: PLUGIN_NAME: opensearch-security OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123! CYPRESS_NO_COMMAND_LOG: 1 + OPENSEARCH_VERSION: '3.0.0-alpha1' jobs: cypress-tests: @@ -28,9 +29,7 @@ jobs: - name: Set env run: | - opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") plugin_version=$(node -p "require('./package.json').version") - echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 75212a315..22577d9fe 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -7,6 +7,7 @@ env: CI: 1 PLUGIN_NAME: opensearch-security OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123! + OPENSEARCH_VERSION: '3.0.0-alpha1' jobs: tests: @@ -23,9 +24,7 @@ jobs: - name: Set env run: | - opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") plugin_version=$(node -p "require('./package.json').version") - echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/verify-binary-installation.yml b/.github/workflows/verify-binary-installation.yml index 8ecdccb4f..2f7b7d69e 100644 --- a/.github/workflows/verify-binary-installation.yml +++ b/.github/workflows/verify-binary-installation.yml @@ -24,9 +24,7 @@ jobs: - name: Set env run: | - opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") plugin_version=$(node -p "require('./package.json').version") - echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash From 73ca2699e144ed1e5f2479c8c18b5549c87b21bb Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 25 Feb 2025 15:32:12 -0500 Subject: [PATCH 3/4] fix version issue Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 5 +++-- .github/workflows/cypress-test-tenancy-disabled.yml | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index aa49c2baa..177103865 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -1,6 +1,9 @@ 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' + inputs: security_config_file: description: 'Name of the security plugin config file' @@ -21,9 +24,7 @@ runs: steps: - name: Set env run: | - opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") plugin_version=$(node -p "require('./package.json').version") - echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml index af7dc4a26..ff5ff0d00 100644 --- a/.github/workflows/cypress-test-tenancy-disabled.yml +++ b/.github/workflows/cypress-test-tenancy-disabled.yml @@ -28,9 +28,7 @@ jobs: - name: Set env run: | - opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") plugin_version=$(node -p "require('./package.json').version") - echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash From 5ac0574fe54f7d76820e59a129741113e7ef2c0a Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 25 Feb 2025 15:34:30 -0500 Subject: [PATCH 4/4] Final fix up Signed-off-by: Derek Ho --- .github/workflows/cypress-test-multidatasources-enabled-e2e.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml b/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml index e7260bb5e..f1abc1170 100644 --- a/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml +++ b/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml @@ -25,9 +25,7 @@ jobs: - name: Set env run: | - opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") plugin_version=$(node -p "require('./package.json').version") - echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV shell: bash