Fix path references into and out of x-pack/legacy

jbudz · Jun 20, 2019 · 2d171c9 · 2d171c9
1 parent 7ac8e4d
commit 2d171c9
Show file tree

Hide file tree

Showing 214 changed files with 487 additions and 478 deletions.
diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh
@@ -41,8 +41,8 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
   node_modules \
   packages/*/node_modules \
   x-pack/node_modules \
-  x-pack/plugins/*/node_modules \
-  x-pack/plugins/reporting/.chromium \
+  x-pack/legacy/plugins/*/node_modules \
+  x-pack/legacy/plugins/reporting/.chromium \
   test/plugin_functional/plugins/*/node_modules \
   .es \
   .chromedriver \

diff --git a/.eslintignore b/.eslintignore
@@ -25,17 +25,17 @@ bower_components
 /packages/kbn-ui-framework/dist
 /packages/kbn-ui-framework/doc_site/build
 /packages/kbn-ui-framework/generator-kui/*/templates/
-/x-pack/plugins/maps/public/vendor/**
+/x-pack/legacy/plugins/maps/public/vendor/**
 /x-pack/coverage
 /x-pack/build
-/x-pack/plugins/**/__tests__/fixtures/**
+/x-pack/legacy/plugins/**/__tests__/fixtures/**
 /packages/kbn-interpreter/src/common/lib/grammar.js
-/x-pack/plugins/canvas/canvas_plugin
-/x-pack/plugins/canvas/storybook
-/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
-/x-pack/plugins/infra/common/graphql/types.ts
-/x-pack/plugins/infra/public/graphql/types.ts
-/x-pack/plugins/infra/server/graphql/types.ts
+/x-pack/legacy/plugins/canvas/canvas_plugin
+/x-pack/legacy/plugins/canvas/storybook
+/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
+/x-pack/legacy/plugins/infra/common/graphql/types.ts
+/x-pack/legacy/plugins/infra/public/graphql/types.ts
+/x-pack/legacy/plugins/infra/server/graphql/types.ts
 **/graphql/types.ts
 **/*.js.snap
 !/.eslintrc.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -53,8 +53,8 @@ module.exports = {
         'packages/kbn-test/**/*',
         'packages/kbn-eslint-import-resolver-kibana/**/*',
         'src/legacy/server/saved_objects/**/*',
-        'x-pack/plugins/apm/**/*',
-        'x-pack/plugins/canvas/**/*',
+        'x-pack/legacy/plugins/apm/**/*',
+        'x-pack/legacy/plugins/canvas/**/*',
         '**/*.{ts,tsx}',
         'src/legacy/core_plugins/metrics/**/*.js',
       ],
@@ -166,7 +166,7 @@ module.exports = {
     {
       files: [
         'x-pack/test/functional/apps/**/*.js',
-        'x-pack/plugins/apm/**/*.js',
+        'x-pack/legacy/plugins/apm/**/*.js',
         'test/*/config.ts',
         'test/visual_regression/tests/**/*',
         'x-pack/test/visual_regression/tests/**/*',
@@ -205,12 +205,15 @@ module.exports = {
             forceNode: false,
             rootPackageName: 'kibana',
             kibanaPath: '.',
-            pluginMap: readdirSync(resolve(__dirname, 'x-pack/plugins')).reduce((acc, name) => {
-              if (!name.startsWith('_')) {
-                acc[name] = `x-pack/plugins/${name}`;
-              }
-              return acc;
-            }, {}),
+            pluginMap: readdirSync(resolve(__dirname, 'x-pack/legacy/plugins')).reduce(
+              (acc, name) => {
+                if (!name.startsWith('_')) {
+                  acc[name] = `x-pack/legacy/plugins/${name}`;
+                }
+                return acc;
+              },
+              {}
+            ),
           },
         },
       },
@@ -253,7 +256,7 @@ module.exports = {
         'x-pack/**/*.test.js',
         'x-pack/test_utils/**/*',
         'x-pack/gulpfile.js',
-        'x-pack/plugins/apm/public/utils/testHelpers.js',
+        'x-pack/legacy/plugins/apm/public/utils/testHelpers.js',
       ],
       rules: {
         'import/no-extraneous-dependencies': [
@@ -361,7 +364,7 @@ module.exports = {
      * APM overrides
      */
     {
-      files: ['x-pack/plugins/apm/**/*.js'],
+      files: ['x-pack/legacy/plugins/apm/**/*.js'],
       rules: {
         'no-unused-vars': ['error', { ignoreRestSiblings: true }],
         'no-console': ['warn', { allow: ['error'] }],
@@ -372,7 +375,7 @@ module.exports = {
      * GIS overrides
      */
     {
-      files: ['x-pack/plugins/maps/**/*.js'],
+      files: ['x-pack/legacy/plugins/maps/**/*.js'],
       rules: {
         'react/prefer-stateless-function': [0, { ignorePureComponents: false }],
       },
@@ -382,7 +385,7 @@ module.exports = {
      * Graph overrides
      */
     {
-      files: ['x-pack/plugins/graph/**/*.js'],
+      files: ['x-pack/legacy/plugins/graph/**/*.js'],
       globals: {
         angular: true,
         $: true,
@@ -405,7 +408,7 @@ module.exports = {
      * ML overrides
      */
     {
-      files: ['x-pack/plugins/ml/**/*.js'],
+      files: ['x-pack/legacy/plugins/ml/**/*.js'],
       rules: {
         'no-shadow': 'error',
       },
@@ -416,7 +419,7 @@ module.exports = {
      */
     {
       // front end typescript and javascript files only
-      files: ['x-pack/plugins/siem/public/**/*.{js,ts,tsx}'],
+      files: ['x-pack/legacy/plugins/siem/public/**/*.{js,ts,tsx}'],
       rules: {
         'import/no-nodejs-modules': 'error',
         'no-restricted-imports': [
@@ -430,7 +433,7 @@ module.exports = {
     },
     {
       // typescript only for front and back end
-      files: ['x-pack/plugins/siem/**/*.{ts,tsx}'],
+      files: ['x-pack/legacy/plugins/siem/**/*.{ts,tsx}'],
       rules: {
         // This will be turned on after bug fixes are complete
         // '@typescript-eslint/explicit-member-accessibility': 'warn',
@@ -464,7 +467,7 @@ module.exports = {
     },
     {
       // typescript and javascript for front and back end
-      files: ['x-pack/plugins/siem/**/*.{js,ts,tsx}'],
+      files: ['x-pack/legacy/plugins/siem/**/*.{js,ts,tsx}'],
       plugins: ['eslint-plugin-node', 'react'],
       rules: {
         'accessor-pairs': 'error',
@@ -611,7 +614,7 @@ module.exports = {
      * Monitoring overrides
      */
     {
-      files: ['x-pack/plugins/monitoring/**/*.js'],
+      files: ['x-pack/legacy/plugins/monitoring/**/*.js'],
       rules: {
         'block-spacing': ['error', 'always'],
         curly: ['error', 'all'],
@@ -620,15 +623,15 @@ module.exports = {
       },
     },
     {
-      files: ['x-pack/plugins/monitoring/public/**/*.js'],
+      files: ['x-pack/legacy/plugins/monitoring/public/**/*.js'],
       env: { browser: true },
     },
 
     /**
      * Canvas overrides
      */
     {
-      files: ['x-pack/plugins/canvas/**/*.js'],
+      files: ['x-pack/legacy/plugins/canvas/**/*.js'],
       rules: {
         radix: 'error',
         curly: ['error', 'all'],
@@ -674,12 +677,12 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/canvas/gulpfile.js',
-        'x-pack/plugins/canvas/scripts/*.js',
-        'x-pack/plugins/canvas/tasks/*.js',
-        'x-pack/plugins/canvas/tasks/**/*.js',
-        'x-pack/plugins/canvas/__tests__/**/*.js',
-        'x-pack/plugins/canvas/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*.js',
+        'x-pack/legacy/plugins/canvas/gulpfile.js',
+        'x-pack/legacy/plugins/canvas/scripts/*.js',
+        'x-pack/legacy/plugins/canvas/tasks/*.js',
+        'x-pack/legacy/plugins/canvas/tasks/**/*.js',
+        'x-pack/legacy/plugins/canvas/__tests__/**/*.js',
+        'x-pack/legacy/plugins/canvas/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*.js',
       ],
       rules: {
         'import/no-extraneous-dependencies': [
@@ -692,7 +695,7 @@ module.exports = {
       },
     },
     {
-      files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'],
+      files: ['x-pack/legacy/plugins/canvas/canvas_plugin_src/**/*.js'],
       globals: { canvas: true, $: true },
       rules: {
         'import/no-unresolved': [
@@ -704,13 +707,13 @@ module.exports = {
       },
     },
     {
-      files: ['x-pack/plugins/canvas/public/**/*.js'],
+      files: ['x-pack/legacy/plugins/canvas/public/**/*.js'],
       env: {
         browser: true,
       },
     },
     {
-      files: ['x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/**/*.js'],
+      files: ['x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/**/*.js'],
       env: {
         jquery: true,
       },

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -6,24 +6,24 @@
 /src/plugins/kibana_utils/ @elastic/kibana-app-arch
 
 # APM
-/x-pack/plugins/apm/  @elastic/apm-ui
+/x-pack/legacy/plugins/apm/  @elastic/apm-ui
 
 # Beats
-/x-pack/plugins/beats_management/  @elastic/beats
+/x-pack/legacy/plugins/beats_management/  @elastic/beats
 
 # Canvas
-/x-pack/plugins/canvas/  @elastic/kibana-canvas
+/x-pack/legacy/plugins/canvas/  @elastic/kibana-canvas
 
 # Code
-/x-pack/plugins/code/  @teams/code
+/x-pack/legacy/plugins/code/  @teams/code
 /x-pack/test/functional/apps/code/  @teams/code
 /x-pack/test/api_integration/apis/code/  @teams/code
 
 # Infrastructure and Logs UI
-/x-pack/plugins/infra/ @elastic/infra-logs-ui
+/x-pack/legacy/plugins/infra/ @elastic/infra-logs-ui
 
 # Machine Learning
-/x-pack/plugins/ml/  @elastic/ml-ui
+/x-pack/legacy/plugins/ml/  @elastic/ml-ui
 
 # Operations
 /renovate.json5 @elastic/kibana-operations
@@ -37,26 +37,26 @@
 /src/legacy/ui/public/saved_objects  @elastic/kibana-platform
 
 # Security
-/x-pack/plugins/security/  @elastic/kibana-security
-/x-pack/plugins/spaces/  @elastic/kibana-security
-/x-pack/plugins/encrypted_saved_objects/  @elastic/kibana-security
+/x-pack/legacy/plugins/security/  @elastic/kibana-security
+/x-pack/legacy/plugins/spaces/  @elastic/kibana-security
+/x-pack/legacy/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /src/legacy/server/csp/ @elastic/kibana-security
 
 # Design
 **/*.scss  @elastic/kibana-design
 
 # Elasticsearch UI
 /src/legacy/core_plugins/console/  @elastic/es-ui
-/x-pack/plugins/console_extensions/  @elastic/es-ui
-/x-pack/plugins/cross_cluster_replication/  @elastic/es-ui
-/x-pack/plugins/index_lifecycle_management/  @elastic/es-ui
-/x-pack/plugins/index_management/  @elastic/es-ui
-/x-pack/plugins/license_management/  @elastic/es-ui
-/x-pack/plugins/remote_clusters/  @elastic/es-ui
-/x-pack/plugins/rollup/  @elastic/es-ui
-/x-pack/plugins/searchprofiler/  @elastic/es-ui
-/x-pack/plugins/snapshot_restore/  @elastic/es-ui
-/x-pack/plugins/watcher/  @elastic/es-ui
+/x-pack/legacy/plugins/console_extensions/  @elastic/es-ui
+/x-pack/legacy/plugins/cross_cluster_replication/  @elastic/es-ui
+/x-pack/legacy/plugins/index_lifecycle_management/  @elastic/es-ui
+/x-pack/legacy/plugins/index_management/  @elastic/es-ui
+/x-pack/legacy/plugins/license_management/  @elastic/es-ui
+/x-pack/legacy/plugins/remote_clusters/  @elastic/es-ui
+/x-pack/legacy/plugins/rollup/  @elastic/es-ui
+/x-pack/legacy/plugins/searchprofiler/  @elastic/es-ui
+/x-pack/legacy/plugins/snapshot_restore/  @elastic/es-ui
+/x-pack/legacy/plugins/watcher/  @elastic/es-ui
 
 # Kibana TSVB external contractors
 /src/legacy/core_plugins/metrics/  @elastic/kibana-tsvb-external
diff --git a/.i18nrc.json b/.i18nrc.json
@@ -23,42 +23,42 @@
     "tagCloud": "src/legacy/core_plugins/tagcloud",
     "tsvb": "src/legacy/core_plugins/metrics",
     "kbnESQuery": "packages/kbn-es-query",
-    "xpack.apm": "x-pack/plugins/apm",
-    "xpack.beatsManagement": "x-pack/plugins/beats_management",
-    "xpack.canvas": "x-pack/plugins/canvas",
-    "xpack.code": "x-pack/plugins/code",
-    "xpack.crossClusterReplication": "x-pack/plugins/cross_cluster_replication",
-    "xpack.dashboardMode": "x-pack/plugins/dashboard_mode",
-    "xpack.fileUpload": "x-pack/plugins/file_upload",
-    "xpack.graph": "x-pack/plugins/graph",
-    "xpack.grokDebugger": "x-pack/plugins/grokdebugger",
-    "xpack.idxMgmt": "x-pack/plugins/index_management",
-    "xpack.indexLifecycleMgmt": "x-pack/plugins/index_lifecycle_management",
-    "xpack.infra": "x-pack/plugins/infra",
-    "xpack.kueryAutocomplete": "x-pack/plugins/kuery_autocomplete",
-    "xpack.licenseMgmt": "x-pack/plugins/license_management",
-    "xpack.maps": "x-pack/plugins/maps",
-    "xpack.ml": "x-pack/plugins/ml",
-    "xpack.logstash": "x-pack/plugins/logstash",
-    "xpack.main": "x-pack/plugins/xpack_main",
-    "xpack.telemetry": "x-pack/plugins/telemetry",
-    "xpack.monitoring": "x-pack/plugins/monitoring",
-    "xpack.remoteClusters": "x-pack/plugins/remote_clusters",
-    "xpack.reporting": "x-pack/plugins/reporting",
-    "xpack.rollupJobs": "x-pack/plugins/rollup",
-    "xpack.searchProfiler": "x-pack/plugins/searchprofiler",
-    "xpack.siem": "x-pack/plugins/siem",
-    "xpack.security": "x-pack/plugins/security",
-    "xpack.server": "x-pack/server",
-    "xpack.snapshotRestore": "x-pack/plugins/snapshot_restore",
-    "xpack.spaces": "x-pack/plugins/spaces",
-    "xpack.upgradeAssistant": "x-pack/plugins/upgrade_assistant",
-    "xpack.uptime": "x-pack/plugins/uptime",
-    "xpack.watcher": "x-pack/plugins/watcher"
+    "xpack.apm": "x-pack/legacy/plugins/apm",
+    "xpack.beatsManagement": "x-pack/legacy/plugins/beats_management",
+    "xpack.canvas": "x-pack/legacy/plugins/canvas",
+    "xpack.code": "x-pack/legacy/plugins/code",
+    "xpack.crossClusterReplication": "x-pack/legacy/plugins/cross_cluster_replication",
+    "xpack.dashboardMode": "x-pack/legacy/plugins/dashboard_mode",
+    "xpack.fileUpload": "x-pack/legacy/plugins/file_upload",
+    "xpack.graph": "x-pack/legacy/plugins/graph",
+    "xpack.grokDebugger": "x-pack/legacy/plugins/grokdebugger",
+    "xpack.idxMgmt": "x-pack/legacy/plugins/index_management",
+    "xpack.indexLifecycleMgmt": "x-pack/legacy/plugins/index_lifecycle_management",
+    "xpack.infra": "x-pack/legacy/plugins/infra",
+    "xpack.kueryAutocomplete": "x-pack/legacy/plugins/kuery_autocomplete",
+    "xpack.licenseMgmt": "x-pack/legacy/plugins/license_management",
+    "xpack.maps": "x-pack/legacy/plugins/maps",
+    "xpack.ml": "x-pack/legacy/plugins/ml",
+    "xpack.logstash": "x-pack/legacy/plugins/logstash",
+    "xpack.main": "x-pack/legacy/plugins/xpack_main",
+    "xpack.telemetry": "x-pack/legacy/plugins/telemetry",
+    "xpack.monitoring": "x-pack/legacy/plugins/monitoring",
+    "xpack.remoteClusters": "x-pack/legacy/plugins/remote_clusters",
+    "xpack.reporting": "x-pack/legacy/plugins/reporting",
+    "xpack.rollupJobs": "x-pack/legacy/plugins/rollup",
+    "xpack.searchProfiler": "x-pack/legacy/plugins/searchprofiler",
+    "xpack.siem": "x-pack/legacy/plugins/siem",
+    "xpack.security": "x-pack/legacy/plugins/security",
+    "xpack.server": "x-pack/legacy/server",
+    "xpack.snapshotRestore": "x-pack/legacy/plugins/snapshot_restore",
+    "xpack.spaces": "x-pack/legacy/plugins/spaces",
+    "xpack.upgradeAssistant": "x-pack/legacy/plugins/upgrade_assistant",
+    "xpack.uptime": "x-pack/legacy/plugins/uptime",
+    "xpack.watcher": "x-pack/legacy/plugins/watcher"
   },
   "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
   "translations": [
-    "x-pack/plugins/translations/translations/zh-CN.json",
-    "x-pack/plugins/translations/translations/ja-JP.json"
+    "x-pack/legacy/plugins/translations/translations/zh-CN.json",
+    "x-pack/legacy/plugins/translations/translations/ja-JP.json"
   ]
 }
diff --git a/.sass-lint.yml b/.sass-lint.yml
@@ -4,8 +4,8 @@ files:
     - 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
     - 'src/legacy/ui/public/query_bar/**/*.s+(a|c)ss'
     - 'src/legacy/ui/public/vislib/**/*.s+(a|c)ss'
-    - 'x-pack/plugins/rollup/**/*.s+(a|c)ss'
-    - 'x-pack/plugins/security/**/*.s+(a|c)ss'
+    - 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
+    - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
 rules:
   quotes:
     - 2