diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index aa49c2ba..17710386 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-multidatasources-enabled-e2e.yml b/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml index e7260bb5..f1abc117 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 diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml index 07679e79..ff5ff0d0 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: @@ -27,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 diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml index e63532f9..e1d4289d 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 75212a31..22577d9f 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 8ecdccb4..2f7b7d69 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 diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index cddc826d..f00379b0 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 53a8151f..d2a93dd9 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",