diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 7c80705dd..f5b79426c 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -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: | diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 3cd6cbb6f..b00511b6d 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -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: | diff --git a/common/index.ts b/common/index.ts index b3dc4ae8d..47a825102 100644 --- a/common/index.ts +++ b/common/index.ts @@ -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; } diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index cd9a36e2a..30acf144e 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -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, diff --git a/package.json b/package.json index 2dca9de6f..5b20e8ff9 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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" }