elastic · tylersmalley · Jun 10, 2020 · May 21, 2020 · May 21, 2020 · May 21, 2020
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -198,9 +198,12 @@ module.exports = {
                 errorMessage: `Plugins may only import from src/core/server and src/core/public.`,
               },
               {
-                target: ['(src|x-pack)/plugins/*/public/**/*'],
-                from: ['(src|x-pack)/plugins/*/server/**/*'],
-                errorMessage: `Public code can not import from server, use a common directory.`,
+                target: [
+                  '(src|x-pack)/plugins/*/server/**/*',
+                  '!x-pack/plugins/apm/**/*', // https://github.com/elastic/kibana/issues/67210
+                ],
+                from: ['(src|x-pack)/plugins/*/public/**/*'],
+                errorMessage: `Server code can not import from public, use a common directory.`,
               },
               {
                 target: [

diff --git a/src/plugins/es_ui_shared/common/index.ts b/src/plugins/es_ui_shared/common/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { Privileges, MissingPrivileges } from '../__packages_do_not_import__/authorization';
diff --git a/src/plugins/es_ui_shared/public/authorization/index.ts b/src/plugins/es_ui_shared/public/authorization/index.ts
@@ -17,4 +17,12 @@
  * under the License.
  */
 
-export * from '../../__packages_do_not_import__/authorization';
+export {
+  WithPrivileges,
+  NotAuthorizedSection,
+  AuthorizationProvider,
+  AuthorizationContext,
+  SectionError,
+  Error,
+  useAuthorizationContext,
+} from '../../__packages_do_not_import__/authorization';
diff --git a/src/plugins/es_ui_shared/public/index.ts b/src/plugins/es_ui_shared/public/index.ts
@@ -47,17 +47,7 @@ export {
   expandLiteralStrings,
 } from './console_lang';
 
-export {
-  AuthorizationContext,
-  AuthorizationProvider,
-  NotAuthorizedSection,
-  WithPrivileges,
-  Privileges,
-  MissingPrivileges,
-  SectionError,
-  Error,
-  useAuthorizationContext,
-} from './authorization';
+export * from './authorization';
 
 /** dummy plugin, we just want esUiShared to have its own bundle */
 export function plugin() {

diff --git a/src/plugins/usage_collection/server/report/store_report.test.ts b/src/plugins/usage_collection/server/report/store_report.test.ts
@@ -20,7 +20,7 @@
 import { savedObjectsRepositoryMock } from '../../../../core/server/mocks';
 import { storeReport } from './store_report';
 import { ReportSchemaType } from './schema';
-import { METRIC_TYPE } from '../../public';
+import { METRIC_TYPE } from '@kbn/analytics';
 
 describe('store_report', () => {
   test('stores report for all types of data', async () => {

diff --git a/x-pack/plugins/alerting/server/alerts_client_factory.test.ts b/x-pack/plugins/alerting/server/alerts_client_factory.test.ts
@@ -11,7 +11,7 @@ import { taskManagerMock } from '../../../plugins/task_manager/server/task_manag
 import { KibanaRequest } from '../../../../src/core/server';
 import { loggingServiceMock, savedObjectsClientMock } from '../../../../src/core/server/mocks';
 import { encryptedSavedObjectsMock } from '../../../plugins/encrypted_saved_objects/server/mocks';
-import { AuthenticatedUser } from '../../../plugins/security/public';
+import { AuthenticatedUser } from '../../../plugins/security/common/model';
 import { securityMock } from '../../../plugins/security/server/mocks';
 
 jest.mock('./alerts_client');

diff --git a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts b/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
-import { apmIndexPattern } from '../../../../../../src/plugins/apm_oss/server';
-import { APM_STATIC_INDEX_PATTERN_ID } from '../../../../../../src/plugins/apm_oss/server';
+import {
+  apmIndexPattern,
+  APM_STATIC_INDEX_PATTERN_ID
+} from '../../../../../../src/plugins/apm_oss/server';
 import { hasHistoricalAgentData } from '../services/get_services/has_historical_agent_data';
 import { Setup } from '../helpers/setup_request';
 import { APMRequestHandlerContext } from '../../routes/typings';

diff --git a/x-pack/plugins/ingest_pipelines/public/shared_imports.ts b/x-pack/plugins/ingest_pipelines/public/shared_imports.ts
@@ -7,11 +7,18 @@ import { useKibana as _useKibana } from '../../../../src/plugins/kibana_react/pu
 import { AppServices } from './application';
 
 export {
+  AuthorizationProvider,
+  Error,
+  NotAuthorizedSection,
+  SectionError,
+  SectionLoading,
+  sendRequest,
   SendRequestConfig,
   SendRequestResponse,
-  UseRequestConfig,
-  sendRequest,
+  useAuthorizationContext,
   useRequest,
+  UseRequestConfig,
+  WithPrivileges,
 } from '../../../../src/plugins/es_ui_shared/public/';
 
 export {
@@ -41,14 +48,4 @@ export {
   isEmptyString,
 } from '../../../../src/plugins/es_ui_shared/static/validators/string';
 
-export {
-  SectionLoading,
-  WithPrivileges,
-  AuthorizationProvider,
-  SectionError,
-  Error,
-  useAuthorizationContext,
-  NotAuthorizedSection,
-} from '../../../../src/plugins/es_ui_shared/public';
-
 export const useKibana = () => _useKibana<AppServices>();
diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/privileges.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/privileges.ts
@@ -5,7 +5,7 @@
  */
 import { RouteDependencies } from '../../types';
 import { API_BASE_PATH, APP_CLUSTER_REQUIRED_PRIVILEGES } from '../../../common/constants';
-import { Privileges } from '../../../../../../src/plugins/es_ui_shared/public';
+import { Privileges } from '../../../../../../src/plugins/es_ui_shared/common';
 
 const extractMissingPrivileges = (privilegesObject: { [key: string]: boolean } = {}): string[] =>
   Object.keys(privilegesObject).reduce((privileges: string[], privilegeName: string): string[] => {

diff --git a/x-pack/plugins/maps/server/plugin.ts b/x-pack/plugins/maps/server/plugin.ts
@@ -23,7 +23,7 @@ import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/s
 import { emsBoundariesSpecProvider } from './tutorials/ems';
 // @ts-ignore
 import { initRoutes } from './routes';
-import { ILicense, LicensingPluginSetup } from '../../licensing/public';
+import { ILicense, LicensingPluginSetup } from '../../licensing/common/types';
 import { HomeServerPluginSetup } from '../../../../src/plugins/home/server';
 
 interface SetupDeps {

diff --git a/x-pack/plugins/siem/server/endpoint/alerts/handlers/lib/index.ts b/x-pack/plugins/siem/server/endpoint/alerts/handlers/lib/index.ts
@@ -6,7 +6,7 @@
 import { SearchResponse } from 'elasticsearch';
 import { IScopedClusterClient } from 'kibana/server';
 import { AlertEvent } from '../../../../../common/endpoint/types';
-import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { esQuery } from '../../../../../../../../src/plugins/data/server';
 import {
   AlertAPIOrdering,

diff --git a/x-pack/plugins/siem/server/endpoint/routes/resolver/queries/base.ts b/x-pack/plugins/siem/server/endpoint/routes/resolver/queries/base.ts
@@ -13,7 +13,7 @@ import {
   PaginationParams,
   PaginatedResults,
 } from '../utils/pagination';
-import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { legacyEventIndexPattern } from './legacy_event_index_pattern';
 
 export abstract class ResolverQuery {

diff --git a/x-pack/plugins/siem/server/endpoint/routes/resolver/queries/events.ts b/x-pack/plugins/siem/server/endpoint/routes/resolver/queries/events.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { ResolverQuery } from './base';
-import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common';
 
 export class EventsQuery extends ResolverQuery {
   protected legacyQuery(endpointID: string, uniquePIDs: string[], index: string): JsonObject {

diff --git a/x-pack/plugins/siem/server/endpoint/routes/resolver/queries/lifecycle.ts b/x-pack/plugins/siem/server/endpoint/routes/resolver/queries/lifecycle.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { ResolverQuery } from './base';
-import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common';
 
 export class LifecycleQuery extends ResolverQuery {
   protected legacyQuery(endpointID: string, uniquePIDs: string[], index: string): JsonObject {

diff --git a/x-pack/plugins/siem/server/endpoint/routes/resolver/queries/stats.ts b/x-pack/plugins/siem/server/endpoint/routes/resolver/queries/stats.ts
@@ -6,7 +6,7 @@
 import { SearchResponse } from 'elasticsearch';
 import { ResolverQuery } from './base';
 import { ResolverEvent } from '../../../../../common/endpoint/types';
-import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { PaginatedResults } from '../utils/pagination';
 
 export class StatsQuery extends ResolverQuery {

diff --git a/x-pack/plugins/siem/server/endpoint/routes/resolver/utils/pagination.ts b/x-pack/plugins/siem/server/endpoint/routes/resolver/utils/pagination.ts
@@ -7,7 +7,7 @@
 import { SearchResponse } from 'elasticsearch';
 import { ResolverEvent } from '../../../../../common/endpoint/types';
 import { entityId } from '../../../../../common/endpoint/models/event';
-import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common';
 
 export interface PaginationParams {
   size: number;

diff --git a/x-pack/plugins/siem/server/lib/types.ts b/x-pack/plugins/siem/server/lib/types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AuthenticatedUser } from '../../../security/public';
+import { AuthenticatedUser } from '../../../security/common/model';
 import { RequestHandlerContext } from '../../../../../src/core/server';
 export { ConfigType as Configuration } from '../config';
 

diff --git a/x-pack/plugins/siem/server/utils/serialized_query.ts b/x-pack/plugins/siem/server/utils/serialized_query.ts
@@ -7,7 +7,7 @@
 import { UserInputError } from 'apollo-server-errors';
 import { isEmpty, isPlainObject, isString } from 'lodash/fp';
 
-import { JsonObject } from '../../../../../src/plugins/kibana_utils/public';
+import { JsonObject } from '../../../../../src/plugins/kibana_utils/common';
 
 export const parseFilterQuery = (filterQuery: string): JsonObject => {
   try {

diff --git a/x-pack/plugins/snapshot_restore/public/shared_imports.ts b/x-pack/plugins/snapshot_restore/public/shared_imports.ts
@@ -5,17 +5,17 @@
  */
 
 export {
-  SendRequestConfig,
-  SendRequestResponse,
-  UseRequestConfig,
-  sendRequest,
-  useRequest,
+  AuthorizationProvider,
   CronEditor,
   DAY,
-  SectionError,
   Error,
-  WithPrivileges,
-  useAuthorizationContext,
   NotAuthorizedSection,
-  AuthorizationProvider,
+  SectionError,
+  sendRequest,
+  SendRequestConfig,
+  SendRequestResponse,
+  useAuthorizationContext,
+  useRequest,
+  UseRequestConfig,
+  WithPrivileges,
 } from '../../../../src/plugins/es_ui_shared/public';
diff --git a/x-pack/plugins/snapshot_restore/server/routes/api/app.ts b/x-pack/plugins/snapshot_restore/server/routes/api/app.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { Privileges } from '../../../../../../src/plugins/es_ui_shared/public';
+import { Privileges } from '../../../../../../src/plugins/es_ui_shared/common';
 
 import {
   APP_REQUIRED_CLUSTER_PRIVILEGES,