diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 7c80705dd..36056110b 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -1,12 +1,6 @@ name: Integration Tests -on: - pull_request: - branches: - - main - push: - branches: - - main +on: [push, pull_request] jobs: tests: @@ -15,12 +9,13 @@ 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-alpha1/latest/linux/x64/builds/opensearch/dist/opensearch-min-2.0.0-alpha1-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-alpha1/latest/linux/x64/builds/opensearch/plugins/opensearch-security-2.0.0.0-alpha1.zip + - name: Run OpenSearch with plugin run: | @@ -50,7 +45,7 @@ jobs: with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards - ref: '1.x' + ref: 'main' fetch-depth: 0 - name: Create plugins dir diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 3cd6cbb6f..42f7533b0 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -1,13 +1,6 @@ name: Unit Tests -on: - pull_request: - branches: - - main - - 1.* - push: - branches: - - main +on: [push, pull_request] jobs: tests: @@ -20,7 +13,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/.sass-lint.yml b/.stylelintrc.yml similarity index 100% rename from .sass-lint.yml rename to .stylelintrc.yml diff --git a/common/index.ts b/common/index.ts index b3dc4ae8d..b820a3992 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..7508917bd 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", @@ -15,20 +15,20 @@ "build": "yarn plugin-helpers build && node build_tools/rename_zip.js", "start": "node ../../scripts/opensearch-dashboards --dev", "lint:es": "node ../../scripts/eslint", - "lint:sass": "node ../../scripts/sasslint", - "lint": "yarn run lint:es && yarn run lint:sass", + "lint:style": "node ../../scripts/stylelint", + "lint": "yarn run lint:es && yarn run lint:style", "test:jest_server": "node ./test/run_jest_tests.js --config ./test/jest.config.server.js", "test:jest_ui": "node ./test/run_jest_tests.js --config ./test/jest.config.ui.js" }, "devDependencies": { - "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards", + "@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" } diff --git a/public/apps/account/test/__snapshots__/account-nav-button.test.tsx.snap b/public/apps/account/test/__snapshots__/account-nav-button.test.tsx.snap index d38f48226..c45a38eee 100644 --- a/public/apps/account/test/__snapshots__/account-nav-button.test.tsx.snap +++ b/public/apps/account/test/__snapshots__/account-nav-button.test.tsx.snap @@ -16,7 +16,7 @@ exports[`Account navigation button renders 1`] = ` id="actionsMenu" isOpen={false} onClick={[Function]} - ownFocus={false} + ownFocus={true} panelPaddingSize="s" > `; diff --git a/public/apps/customerror/_index.scss b/public/apps/customerror/_index.scss index 84b565640..5c1039837 100644 --- a/public/apps/customerror/_index.scss +++ b/public/apps/customerror/_index.scss @@ -14,8 +14,8 @@ */ .custom-error-wrapper { - margin: 10% auto; - width: 350px; - padding: 1rem; - position: relative; + margin: 10% auto; + width: 350px; + padding: 1rem; + position: relative; } diff --git a/public/apps/login/_index.scss b/public/apps/login/_index.scss index 62adac225..5b48bd965 100644 --- a/public/apps/login/_index.scss +++ b/public/apps/login/_index.scss @@ -14,12 +14,12 @@ */ .login-wrapper { - margin: 10% auto; - width: 350px; - padding: 1rem; - position: relative; + margin: 10% auto; + width: 350px; + padding: 1rem; + position: relative; } .btn-login { - width: 100%; + width: 100%; } diff --git a/public/index.scss b/public/index.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/public/index.ts b/public/index.ts index 6cc350b86..d09f3dc49 100644 --- a/public/index.ts +++ b/public/index.ts @@ -12,9 +12,6 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ - -import './index.scss'; - import { SecurityPlugin } from './plugin'; import { PluginInitializerContext } from '../../../src/core/public'; diff --git a/server/auth/types/basic/routes.ts b/server/auth/types/basic/routes.ts index affe36120..41da5b3e0 100644 --- a/server/auth/types/basic/routes.ts +++ b/server/auth/types/basic/routes.ts @@ -171,7 +171,7 @@ export class BasicAuthRoutes { ? this.coreSetup.http.basePath.serverBasePath : '/'; const requestQuery = request.url.query as ParsedUrlQueryParams; - if (requestQuery.nextUrl !== undefined) { + if (requestQuery?.nextUrl !== undefined) { redirectUrl = requestQuery.nextUrl; } context.security_plugin.logger.info('The Redirect Path is ' + redirectUrl);