[1.x] Synchronize 1.x branch with 1.3 (opensearch-project#1688)

Signed-off-by: leanneeliatra <[email protected]> Signed-off-by: Darshit Chanpura <[email protected]> Signed-off-by: Darshit Chanpura <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: Derek Ho <[email protected]> Co-authored-by: Darshit Chanpura <[email protected]> Co-authored-by: leanneeliatra <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: opensearch-ci-bot <[email protected]> Co-authored-by: Peter Nied <[email protected]> Co-authored-by: Derek Ho <[email protected]>
DarshitChanpura · Dec 7, 2023 · 0319257 · 0319257
1 parent 5f4b7df
commit 0319257
Show file tree

Hide file tree

Showing 5 changed files with 581 additions and 75 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -64,6 +64,7 @@ jobs:
           opensearch-version: ${{ env.OPENSEARCH_VERSION }}
           plugin-name: ${{ env.PLUGIN_NAME }}
           setup-script-name: setup
+          admin-password: admin
 
       - id: install-dashboards
         uses: ./.github/actions/install-dashboards

diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "securityDashboards",
-  "version": "1.3.12.0",
-  "opensearchDashboardsVersion": "1.3.12",
+  "version": "1.3.14.0",
+  "opensearchDashboardsVersion": "1.3.14",
   "configPath": [
     "opensearch_security"
   ],
@@ -10,4 +10,4 @@
   ],
   "server": true,
   "ui": true
-}
+}
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "opensearch-security-dashboards",
-  "version": "1.3.12.0",
+  "version": "1.3.14.0",
   "main": "target/plugins/opensearch_security_dashboards",
   "opensearchDashboards": {
-    "version": "1.3.12",
-    "templateVersion": "1.3.12"
+    "version": "1.3.14",
+    "templateVersion": "1.3.14"
   },
   "license": "Apache-2.0",
   "homepage": "https://github.com/opensearch-project/security-dashboards-plugin",
@@ -25,7 +25,9 @@
     "samlp": "6.0.2",
     "**/glob-parent": "^6.0.0",
     "**/loader-utils": "^2.0.4",
-    "decode-uri-component": "^0.2.1"
+    "decode-uri-component": "^0.2.1",
+    "debug": "^4.3.4",
+    "browserify-sign": "^4.2.2"
   },
   "devDependencies": {
     "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
@@ -42,4 +44,4 @@
     "@hapi/cryptiles": "5.0.0",
     "html-entities": "1.3.1"
   }
-}
+}
diff --git a/server/multitenancy/tenant_resolver.ts b/server/multitenancy/tenant_resolver.ts
@@ -16,9 +16,9 @@
 import { isEmpty, findKey, cloneDeep } from 'lodash';
 import { OpenSearchDashboardsRequest } from 'opensearch-dashboards/server';
 import { ResponseObject } from '@hapi/hapi';
+import { modifyUrl } from '@osd/std';
 import { SecuritySessionCookie } from '../session/security_cookie';
-import { GLOBAL_TENANT_SYMBOL, PRIVATE_TENANT_SYMBOL } from '../../common';
-import { modifyUrl } from '../../../../packages/osd-std';
+import { GLOBAL_TENANT_SYMBOL, PRIVATE_TENANT_SYMBOL, globalTenantName } from '../../common';
 import { ensureRawRequest } from '../../../../src/core/server/http/router';
 import { GOTO_PREFIX } from '../../../../src/plugins/share/common/short_url_routes';
 import { SecurityPluginConfigType } from '..';