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

Jump to bottom

upgrade to node14 #924

Closed
wants to merge 5 commits into from
Closed

upgrade to node14 #924

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
f6066d0
Updates plugin version to 2.0.0.0 and updates dependencies to be comp…
DarshitChanpura Mar 22, 2022
ce83990
Updates dashboards version to 2.0.0.0
DarshitChanpura Mar 22, 2022
3302b52
Updates regex to pass linter checck
DarshitChanpura Mar 22, 2022
3ff5a88
Updates build artifact versions required for integration tests
DarshitChanpura Mar 28, 2022
4d38dd6
Udpates base dashboards branch to point to correct one in unit-tests
DarshitChanpura Mar 28, 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
4 changes: 2 additions & 2 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://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.0.0/latest/linux/x64/builds/opensearch/dist/opensearch-min-2.0.0-linux-x64.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://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.0.0/latest/linux/x64/builds/opensearch/plugins/opensearch-security-2.0.0.0.zip

- name: Run OpenSearch with plugin
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
path: OpenSearch-Dashboards
repository: opensearch-project/OpenSearch-Dashboards
ref: '1.x'
ref: 'main'
fetch-depth: 0
- name: Create plugins dir
run: |
Expand Down
3 changes: 2 additions & 1 deletion common/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@ export enum AuthType {
*/
export function isValidResourceName(resourceName: string): boolean {
// see: https://javascript.info/regexp-unicode
return !/[\p{C}%]/u.test(resourceName) && resourceName.length > 0;
const exp = new RegExp(/[\p{C}%]/u);
return !exp.test(resourceName) && resourceName.length > 0;
}
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
10 changes: 5 additions & 5 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 @@ -24,11 +24,11 @@
"@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
"typescript": "4.0.2",
"gulp-rename": "2.0.0",
"@testing-library/react-hooks": "^3.4.1",
"@testing-library/react-hooks": "^7.0.2",
"@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