chore(NA): avoids imports of server or public code into common (elast…

…ic#67231) * chore(NA): avoids imports of server or public code into common * chore(NA): fix imports from public or server into common * chore(NA): fix typechecking for data plugin stubs * chore(NA): fix types and tests related with licensing plugin * chore(NA): fix problems on infra plugin * chore(NA): fix typo on .eslintrc.js Co-authored-by: Ryland Herrick <[email protected]> * chore(NA): migrate to license mock usage on security plugin licensing module Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Ryland Herrick <[email protected]> # Conflicts: # x-pack/plugins/infra/common/inventory_models/shared/components/metrics_and_groupby_toolbar_items.tsx # x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.d.ts # x-pack/plugins/security/common/licensing/license_service.test.ts # x-pack/plugins/spaces/common/licensing/license_service.test.ts
mistic · Jun 3, 2020 · 2953e79 · 2953e79
1 parent 8478856
commit 2953e79
Show file tree

Hide file tree

Showing 19 changed files with 51 additions and 26 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -209,6 +209,11 @@ module.exports = {
                 from: ['(src|x-pack)/plugins/*/server/**/*'],
                 errorMessage: `Public code can not import from server, use a common directory.`,
               },
+              {
+                target: ['(src|x-pack)/plugins/*/common/**/*'],
+                from: ['(src|x-pack)/plugins/*/(server|public)/**/*'],
+                errorMessage: `Common code can not import from server or public, use a common directory.`,
+              },
               {
                 target: [
                   '(src|x-pack)/legacy/**/*',

diff --git a/src/plugins/data/common/es_query/filters/build_filter.test.ts b/src/plugins/data/common/es_query/filters/build_filter.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { buildFilter, FilterStateStore, FILTERS } from '.';
-import { stubIndexPattern, stubFields } from '../../../public/stubs';
+import { stubIndexPattern, stubFields } from '../../../common/stubs';
 
 describe('buildFilter', () => {
   it('should build phrase filters', () => {

diff --git a/src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.test.ts b/src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { stubIndexPattern, phraseFilter } from 'src/plugins/data/public/stubs';
+import { stubIndexPattern, phraseFilter } from 'src/plugins/data/common/stubs';
 import { getIndexPatternFromFilter } from './get_index_pattern_from_filter';
 
 describe('getIndexPatternFromFilter', () => {

diff --git a/src/plugins/data/common/es_query/kuery/ast/ast.ts b/src/plugins/data/common/es_query/kuery/ast/ast.ts
@@ -24,7 +24,7 @@ import { IIndexPattern } from '../../../index_patterns/types';
 
 // @ts-ignore
 import { parse as parseKuery } from './_generated_/kuery';
-import { JsonObject } from '../../../../../kibana_utils/public';
+import { JsonObject } from '../../../../../kibana_utils/common';
 
 const fromExpression = (
   expression: string | DslQuery,

diff --git a/src/plugins/data/common/es_query/kuery/node_types/named_arg.ts b/src/plugins/data/common/es_query/kuery/node_types/named_arg.ts
@@ -21,7 +21,7 @@ import _ from 'lodash';
 import * as ast from '../ast';
 import { nodeTypes } from '../node_types';
 import { NamedArgTypeBuildNode } from './types';
-import { JsonObject } from '../../../../../kibana_utils/public';
+import { JsonObject } from '../../../../../kibana_utils/common';
 
 export function buildNode(name: string, value: any): NamedArgTypeBuildNode {
   const argumentNode =

diff --git a/src/plugins/data/common/es_query/kuery/node_types/types.ts b/src/plugins/data/common/es_query/kuery/node_types/types.ts
@@ -22,7 +22,7 @@
  */
 
 import { IIndexPattern } from '../../../index_patterns';
-import { JsonValue } from '../../../../../kibana_utils/public';
+import { JsonValue } from '../../../../../kibana_utils/common';
 import { KueryNode } from '..';
 
 export type FunctionName =

diff --git a/.../data/public/index_patterns/field.stub.ts → .../data/common/index_patterns/field.stub.ts b/.../data/public/index_patterns/field.stub.ts → .../data/common/index_patterns/field.stub.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IFieldType } from '../../../../plugins/data/public';
+import { IFieldType } from '.';
 
 export const stubFields: IFieldType[] = [
   {

diff --git a/...blic/index_patterns/index_pattern.stub.ts → ...mmon/index_patterns/index_pattern.stub.ts b/...blic/index_patterns/index_pattern.stub.ts → ...mmon/index_patterns/index_pattern.stub.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IIndexPattern } from '../../common';
+import { IIndexPattern } from '.';
 import { stubFields } from './field.stub';
 
 export const stubIndexPattern: IIndexPattern = {

diff --git a/src/plugins/data/common/stubs.ts b/src/plugins/data/common/stubs.ts
@@ -0,0 +1,22 @@
+/*
+ * 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 { stubIndexPattern, stubIndexPatternWithFields } from './index_patterns/index_pattern.stub';
+export { stubFields } from './index_patterns/field.stub';
+export * from './es_query/filters/stubs';
diff --git a/src/plugins/data/public/stubs.ts b/src/plugins/data/public/stubs.ts
@@ -17,6 +17,4 @@
  * under the License.
  */
 
-export { stubIndexPattern, stubIndexPatternWithFields } from './index_patterns/index_pattern.stub';
-export { stubFields } from './index_patterns/field.stub';
-export * from '../common/es_query/filters/stubs';
+export * from '../common/stubs';
diff --git a/src/plugins/expressions/common/ast/types.ts b/src/plugins/expressions/common/ast/types.ts
@@ -18,7 +18,7 @@
  */
 
 import { ExpressionValue, ExpressionValueError } from '../expression_types';
-import { ExpressionFunction } from '../../public';
+import { ExpressionFunction } from '../../common';
 
 export type ExpressionAstNode =
   | ExpressionAstExpression

diff --git a/src/plugins/expressions/common/execution/execution.test.ts b/src/plugins/expressions/common/execution/execution.test.ts
@@ -20,7 +20,7 @@
 import { Execution } from './execution';
 import { parseExpression, ExpressionAstExpression } from '../ast';
 import { createUnitTestExecutor } from '../test_helpers';
-import { ExpressionFunctionDefinition } from '../../public';
+import { ExpressionFunctionDefinition } from '../../common';
 import { ExecutionContract } from './execution_contract';
 
 beforeAll(() => {

diff --git a/src/plugins/expressions/common/util/create_error.ts b/src/plugins/expressions/common/util/create_error.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ExpressionValueError } from '../../public';
+import { ExpressionValueError } from '../../common';
 
 type ErrorLike = Partial<Pick<Error, 'name' | 'message' | 'stack'>>;
 

diff --git a/x-pack/plugins/apm/common/service_map.ts b/x-pack/plugins/apm/common/service_map.ts
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import cytoscape from 'cytoscape';
-import { ILicense } from '../../licensing/public';
+import { ILicense } from '../../licensing/common/types';
 import {
   AGENT_NAME,
   SERVICE_ENVIRONMENT,

diff --git a/...ins/infra/common/inventory_models/shared/components/metrics_and_groupby_toolbar_items.tsx b/...ins/infra/common/inventory_models/shared/components/metrics_and_groupby_toolbar_items.tsx
@@ -60,4 +60,4 @@ export const MetricsAndGroupByToolbarItems = (props: Props) => {
       </EuiFlexItem>
     </>
   );
-};
+};
diff --git a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.d.ts b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.d.ts
@@ -69,4 +69,4 @@ export type DataRequestDescriptor = {
   dataRequestToken?: symbol;
   data?: object;
   dataMeta?: DataMeta;
-};
+};
diff --git a/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts b/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
@@ -5,7 +5,7 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import { Query } from '../../../../../src/plugins/data/public';
+import { Query } from '../../../../../src/plugins/data/common';
 import { DRAW_TYPE, ES_GEO_FIELD_TYPE, ES_SPATIAL_RELATIONS } from '../constants';
 
 export type MapExtent = {

diff --git a/x-pack/plugins/security/common/licensing/license_service.test.ts b/x-pack/plugins/security/common/licensing/license_service.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { of, BehaviorSubject } from 'rxjs';
-import { licensingMock } from '../../../licensing/public/mocks';
+import { licenseMock } from '../../../licensing/common/licensing.mock';
 import { SecurityLicenseService } from './license_service';
 
 describe('license features', function () {
@@ -28,7 +28,7 @@ describe('license features', function () {
   });
 
   it('should display error when X-Pack is unavailable', () => {
-    const rawLicenseMock = licensingMock.createLicenseMock();
+    const rawLicenseMock = licenseMock.createLicenseMock();
     rawLicenseMock.isAvailable = false;
     const serviceSetup = new SecurityLicenseService().setup({
       license$: of(rawLicenseMock),
@@ -48,7 +48,7 @@ describe('license features', function () {
   });
 
   it('should notify consumers of licensed feature changes', () => {
-    const rawLicenseMock = licensingMock.createLicenseMock();
+    const rawLicenseMock = licenseMock.createLicenseMock();
     rawLicenseMock.isAvailable = false;
     const rawLicense$ = new BehaviorSubject(rawLicenseMock);
     const serviceSetup = new SecurityLicenseService().setup({
@@ -76,7 +76,7 @@ describe('license features', function () {
         ]
       `);
 
-      rawLicense$.next(licensingMock.createLicenseMock());
+      rawLicense$.next(licenseMock.createLicenseMock());
       expect(subscriptionHandler).toHaveBeenCalledTimes(2);
       expect(subscriptionHandler.mock.calls[1]).toMatchInlineSnapshot(`
         Array [
@@ -99,7 +99,7 @@ describe('license features', function () {
   });
 
   it('should show login page and other security elements, allow RBAC but forbid paid features if license is basic.', () => {
-    const mockRawLicense = licensingMock.createLicense({
+    const mockRawLicense = licenseMock.createLicense({
       features: { security: { isEnabled: true, isAvailable: true } },
     });
 
@@ -124,7 +124,7 @@ describe('license features', function () {
   });
 
   it('should not show login page or other security elements if security is disabled in Elasticsearch.', () => {
-    const mockRawLicense = licensingMock.createLicense({
+    const mockRawLicense = licenseMock.createLicense({
       features: { security: { isEnabled: false, isAvailable: true } },
     });
 
@@ -145,7 +145,7 @@ describe('license features', function () {
   });
 
   it('should allow role mappings, access agreement and sub-feature privileges, but not DLS/FLS if license = gold', () => {
-    const mockRawLicense = licensingMock.createLicense({
+    const mockRawLicense = licenseMock.createLicense({
       license: { mode: 'gold', type: 'gold' },
       features: { security: { isEnabled: true, isAvailable: true } },
     });
@@ -167,7 +167,7 @@ describe('license features', function () {
   });
 
   it('should allow to login, allow RBAC, role mappings, access agreement, sub-feature privileges, and DLS if license >= platinum', () => {
-    const mockRawLicense = licensingMock.createLicense({
+    const mockRawLicense = licenseMock.createLicense({
       license: { mode: 'platinum', type: 'platinum' },
       features: { security: { isEnabled: true, isAvailable: true } },
     });

diff --git a/x-pack/plugins/siem/common/typed_json.ts b/x-pack/plugins/siem/common/typed_json.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 { JsonObject } from '../../../../src/plugins/kibana_utils/public';
+import { JsonObject } from '../../../../src/plugins/kibana_utils/common';
 
 export type ESQuery = ESRangeQuery | ESQueryStringQuery | ESMatchQuery | ESTermQuery | JsonObject;