Bumps artifact version to 2.0.0.0 and updates node to 14.18.2 and rem…

…oves test workflow filter for branches

Signed-off-by: Darshit Chanpura <[email protected]>

.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",

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