Merge branch 'main' into read-only-tenant-logic-poc

opensearch-project · Jul 27, 2023 · 54a6364 · 54a6364
2 parents c38d4cc + 91faa3d
commit 54a6364
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -20,6 +20,18 @@ module.exports = {
   extends: ['@elastic/eslint-config-kibana', 'plugin:@elastic/eui/recommended'],
   rules: {
     // "@osd/eslint/require-license-header": "off"
+    '@osd/eslint/no-restricted-paths': [
+      'error',
+      {
+        basePath: __dirname,
+        zones: [
+          {
+            target: ['(public|server)/**/*'],
+            from: ['../../packages/**/*','packages/**/*']
+          },
+        ]
+      }
+    ]
   },
   overrides: [
     {

diff --git a/server/saved_objects/saved_objects_wrapper.ts b/server/saved_objects/saved_objects_wrapper.ts
@@ -34,7 +34,6 @@ import {
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
 } from 'opensearch-dashboards/server';
-import { Config } from 'packages/osd-config/target';
 import { SecurityPluginConfigType } from '..';
 import { OpenSearchDashboardsAuthState } from '../auth/types/authentication_type';
 import {