Merge branch 'main' into meta-templates

.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

.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: |

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;
 }

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,

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"
   }

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"
   >
     <EuiContextMenuPanel

public/apps/configuration/_index.scss

@@ -13,31 +13,31 @@
  *   permissions and limitations under the License.
  */
 
- .panel-header-count {
-    color: #687078;
-    font-weight: normal;
+.panel-header-count {
+  color: #687078;
+  font-weight: normal;
 }
 
 .panel-header-subtext {
-    width: 75%;
+  width: 75%;
 }
 
 .text-center {
-    text-align: 'center'
+  text-align: "center";
 }
 
 .panel-restrict-width {
-    max-width: 75%;
+  max-width: 75%;
 }
 
 .external-link-inline-block {
   display: inline-block;
 }
 
 .table-items {
-    font-size: inherit;
+  font-size: inherit;
 }
 
 .limit-width-input {
-    max-width: 400px;
+  max-width: 400px;
 }

public/apps/configuration/panels/audit-logging/_index.scss

@@ -1,11 +1,11 @@
 .described-form-group {
-  max-width: 1500px
+  max-width: 1500px;
 }
 
 .form-row {
-  max-width: 800px
+  max-width: 800px;
 }
 
 pre code {
-  color: #666666;
+  color: #666;
 }

public/apps/configuration/panels/permission-tree/_index.scss

@@ -15,7 +15,7 @@
 
 .permission-tree-container {
   max-height: 200px;
-  overflow-Y: scroll;
+  overflow-y: scroll;
   width: 100%;
 }
 

public/apps/configuration/panels/tenant-list/test/__snapshots__/edit-modal.test.tsx.snap

@@ -2,6 +2,7 @@
 
 exports[`Permission edit modal Submit button text should be Create when user is creating tenant 1`] = `
 <EuiButtonDisplay
+  baseClassName="euiButton"
   disabled={false}
   element="button"
   fill={true}
@@ -16,6 +17,7 @@ exports[`Permission edit modal Submit button text should be Create when user is
 
 exports[`Permission edit modal Submit button text should be Save when user is updating tenant 1`] = `
 <EuiButtonDisplay
+  baseClassName="euiButton"
   disabled={false}
   element="button"
   fill={true}

public/apps/configuration/panels/test/__snapshots__/nav-panel.test.tsx.snap

@@ -24,5 +24,11 @@ exports[`Navigation panel renders 1`] = `
       },
     ]
   }
+  mobileBreakpoints={
+    Array [
+      "xs",
+      "s",
+    ]
+  }
 />
 `;

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;
 }

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%;
 }

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';
 

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);