Skip to content

Fix alpha bump #2190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DarshitChanpura merged 5 commits into from
Feb 26, 2025
+9 −15
Merged

Fix alpha bump #2190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31b778a
Fix alpha bump
derek-ho Feb 25, 2025
6e45fd1
Fix version issue
derek-ho Feb 25, 2025
73ca269
fix version issue
derek-ho Feb 25, 2025
5ac0574
Final fix up
derek-ho Feb 25, 2025
322c242
Merge branch 'main' into fix-alpha
cwperks Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/actions/run-cypress-tests/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/cypress-test-multidatasources-enabled-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/cypress-test-tenancy-disabled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/cypress-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ env:
CI: 1
PLUGIN_NAME: opensearch-security
OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123!
OPENSEARCH_VERSION: '3.0.0-alpha1'

jobs:
tests:
Expand All @@ -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

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/verify-binary-installation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion opensearch_dashboards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "securityDashboards",
"version": "3.0.0.0-alpha1",
"opensearchDashboardsVersion": "3.0.0-alpha1",
"opensearchDashboardsVersion": "3.0.0",
"configPath": [
"opensearch_security"
],
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading