Skip to content
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

Version bump to 2.0.0.0-SNAPSHOT #892

Closed
wants to merge 4 commits into from
Closed

Version bump to 2.0.0.0-SNAPSHOT #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1cbbc7
Version bump to 2.0.0.0-SNAPSHOT
Jan 19, 2022
ca7f148
Version changes to align with 2.0 of Dashboards
Jan 19, 2022
3cfd70c
Pointing to 2.0.0-SNAPSHOT version of Dashboards
Jan 19, 2022
fd18c91
Not 2.x branch, main
Jan 25, 2022
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
2 changes: 1 addition & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
'@osd/eslint/require-license-header': [
'error',
{
license: LICENSE_HEADER,
licenses: [LICENSE_HEADER],
},
],
"no-console": 0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
steps:
- name: Download OpenSearch Core
run: |
wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/488/linux/x64/builds/opensearch/dist/opensearch-min-1.3.0-linux-x64.tar.gz
wget https://artifacts.opensearch.org/snapshots/core/opensearch/2.0.0-SNAPSHOT/opensearch-min-2.0.0-SNAPSHOT-linux-x64-latest.tar.gz
tar -xzf opensearch-*.tar.gz
rm -f opensearch-*.tar.gz

- name: Download OpenSearch Security Plugin
run: wget -O opensearch-security.zip https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/488/linux/x64/builds/opensearch/plugins/opensearch-security-1.3.0.0.zip
run: wget -O opensearch-security.zip https://TBD/opensearch-security-2.0.0.0.zip
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to update after opensearch-project/security#1577 produces a 2.0.0 artifact


- name: Run OpenSearch with plugin
run: |
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
with:
path: OpenSearch-Dashboards
repository: opensearch-project/OpenSearch-Dashboards
ref: '1.x'
ref: 'main'
fetch-depth: 0

- name: Create plugins dir
Expand Down
1 change: 1 addition & 0 deletions .node-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14.18.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to explicitly declare or can we transitivity pick this up from OpenSearch Dashboards version?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, yeah... we do for the integration tests run here. I honestly just added it as a convenience so that it stands by itself, but to be honest I'm not sure if we ever build this project without being "nested" inside of the Dashboards codebase.

4 changes: 2 additions & 2 deletions 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": "1.3.0.0",
"opensearchDashboardsVersion": "1.3.0",
"version": "2.0.0.0",
"opensearchDashboardsVersion": "2.0.0",
"configPath": ["opensearch_security"],
"requiredPlugins": ["navigation"],
"server": true,
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "opensearch-security-dashboards",
"version": "1.3.0.0",
"version": "2.0.0.0",
"main": "target/plugins/opensearch_security_dashboards",
"opensearchDashboards": {
"version": "1.3.0",
"templateVersion": "1.3.0"
"version": "2.0.0",
"templateVersion": "2.0.0"
},
"license": "Apache-2.0",
"homepage": "https://github.com/opensearch-project/security-dashboards-plugin",
Expand All @@ -28,7 +28,7 @@
"@types/hapi__wreck": "^15.0.1"
},
"dependencies": {
"@hapi/wreck": "^15.0.2",
"@hapi/wreck": "^17.1.0",
"@hapi/cryptiles": "5.0.0",
"html-entities": "1.3.1"
}
Expand Down