From 4b81c978e51029ad5885a38331cf07e8f668e37c Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Mon, 24 May 2021 16:34:29 +0200 Subject: [PATCH] security solution and lists to TS incremental builds (#100447) * lists to ts incremental builds * security_solution to ts incremental * import ResizeObserver explicitly as it is not declared in dom types --- src/core/server/http/http_server.mocks.ts | 5 +- tsconfig.json | 10 ++-- tsconfig.refs.json | 2 + x-pack/plugins/lists/tsconfig.json | 23 +++++++++ .../schemas/request/rule_schemas.ts | 14 +++++- .../common/endpoint/types/index.ts | 6 +-- .../permissions/ml_capabilities_provider.tsx | 2 +- .../common/components/page/manage_query.tsx | 6 ++- .../components/super_date_picker/index.tsx | 4 +- .../public/common/components/top_n/index.tsx | 6 ++- .../pages/endpoint_hosts/store/action.ts | 47 ++++++++++--------- .../policy/store/policy_details/action.ts | 18 +++---- .../public/resolver/store/camera/selectors.ts | 2 +- .../public/resolver/types.ts | 1 + .../server/endpoint/mocks.ts | 2 +- .../routes/trusted_apps/handlers.test.ts | 2 +- .../security_solution/server/fixtures.ts} | 4 +- .../routes/__mocks__/test_adapters.ts | 5 +- .../plugins/security_solution/tsconfig.json | 46 ++++++++++++++++++ x-pack/test/tsconfig.json | 2 + 20 files changed, 149 insertions(+), 58 deletions(-) create mode 100644 x-pack/plugins/lists/tsconfig.json rename x-pack/{mocks.ts => plugins/security_solution/server/fixtures.ts} (81%) create mode 100644 x-pack/plugins/security_solution/tsconfig.json diff --git a/src/core/server/http/http_server.mocks.ts b/src/core/server/http/http_server.mocks.ts index 52dab28accb33..9e2f0821a2219 100644 --- a/src/core/server/http/http_server.mocks.ts +++ b/src/core/server/http/http_server.mocks.ts @@ -27,7 +27,10 @@ import { OnPreResponseToolkit } from './lifecycle/on_pre_response'; import { OnPostAuthToolkit } from './lifecycle/on_post_auth'; import { OnPreRoutingToolkit } from './lifecycle/on_pre_routing'; -interface RequestFixtureOptions

{ +/** + * @internal + */ +export interface RequestFixtureOptions

{ auth?: { isAuthenticated: boolean }; headers?: Record; params?: Record; diff --git a/tsconfig.json b/tsconfig.json index b7122a70cb471..c56d4c6b8dc32 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,15 +13,9 @@ "src/legacy/**/*", "src/optimize/**/*", - "x-pack/mocks.ts", - "x-pack/typings/**/*", "x-pack/tasks/**/*", - "x-pack/plugins/lists/**/*", - "x-pack/plugins/security_solution/**/*" - ], - "exclude": [ - "x-pack/plugins/security_solution/cypress/**/*" ], + "exclude": [], "references": [ { "path": "./src/core/tsconfig.json" }, { "path": "./src/plugins/telemetry_management_section/tsconfig.json" }, @@ -108,6 +102,7 @@ { "path": "./x-pack/plugins/license_api_guard/tsconfig.json" }, { "path": "./x-pack/plugins/license_management/tsconfig.json" }, { "path": "./x-pack/plugins/licensing/tsconfig.json" }, + { "path": "./x-pack/plugins/lists/tsconfig.json" }, { "path": "./x-pack/plugins/logstash/tsconfig.json" }, { "path": "./x-pack/plugins/maps/tsconfig.json" }, { "path": "./x-pack/plugins/metrics_entities/tsconfig.json" }, @@ -119,6 +114,7 @@ { "path": "./x-pack/plugins/saved_objects_tagging/tsconfig.json" }, { "path": "./x-pack/plugins/searchprofiler/tsconfig.json" }, { "path": "./x-pack/plugins/security/tsconfig.json" }, + { "path": "./x-pack/plugins/security_solution/tsconfig.json" }, { "path": "./x-pack/plugins/snapshot_restore/tsconfig.json" }, { "path": "./x-pack/plugins/spaces/tsconfig.json" }, { "path": "./x-pack/plugins/stack_alerts/tsconfig.json" }, diff --git a/tsconfig.refs.json b/tsconfig.refs.json index 2aa098e21f283..bc682043224d5 100644 --- a/tsconfig.refs.json +++ b/tsconfig.refs.json @@ -86,6 +86,7 @@ { "path": "./x-pack/plugins/lens/tsconfig.json" }, { "path": "./x-pack/plugins/license_management/tsconfig.json" }, { "path": "./x-pack/plugins/licensing/tsconfig.json" }, + { "path": "./x-pack/plugins/lists/tsconfig.json" }, { "path": "./x-pack/plugins/logstash/tsconfig.json" }, { "path": "./x-pack/plugins/maps/tsconfig.json" }, { "path": "./x-pack/plugins/metrics_entities/tsconfig.json" }, @@ -98,6 +99,7 @@ { "path": "./x-pack/plugins/saved_objects_tagging/tsconfig.json" }, { "path": "./x-pack/plugins/searchprofiler/tsconfig.json" }, { "path": "./x-pack/plugins/security/tsconfig.json" }, + { "path": "./x-pack/plugins/security_solution/tsconfig.json" }, { "path": "./x-pack/plugins/snapshot_restore/tsconfig.json" }, { "path": "./x-pack/plugins/spaces/tsconfig.json" }, { "path": "./x-pack/plugins/stack_alerts/tsconfig.json" }, diff --git a/x-pack/plugins/lists/tsconfig.json b/x-pack/plugins/lists/tsconfig.json new file mode 100644 index 0000000000000..9025a1640f8bf --- /dev/null +++ b/x-pack/plugins/lists/tsconfig.json @@ -0,0 +1,23 @@ + +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true + }, + "include": [ + "common/**/*", + "public/**/*", + "server/**/*", + // have to declare *.json explicitly due to https://github.com/microsoft/TypeScript/issues/25636 + "server/**/*.json", + ], + "references": [ + { "path": "../../../src/core/tsconfig.json" }, + { "path": "../spaces/tsconfig.json" }, + { "path": "../security/tsconfig.json"}, + ] + } diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/rule_schemas.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/rule_schemas.ts index dbc40763a0c6c..74cc47904003d 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/rule_schemas.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/rule_schemas.ts @@ -70,7 +70,7 @@ import { last_failure_message, } from '../common/schemas'; -const createSchema = < +export const createSchema = < Required extends t.Props, Optional extends t.Props, Defaultable extends t.Props @@ -118,7 +118,7 @@ const responseSchema = < ]); }; -const buildAPISchemas = ( +export const buildAPISchemas = ( params: APIParams ) => { return { @@ -216,6 +216,7 @@ const { patch: eqlPatchParams, response: eqlResponseParams, } = buildAPISchemas(eqlRuleParams); +export { eqlCreateParams }; const threatMatchRuleParams = { required: { @@ -244,6 +245,7 @@ const { patch: threatMatchPatchParams, response: threatMatchResponseParams, } = buildAPISchemas(threatMatchRuleParams); +export { threatMatchCreateParams }; const queryRuleParams = { required: { @@ -265,6 +267,8 @@ const { response: queryResponseParams, } = buildAPISchemas(queryRuleParams); +export { queryCreateParams }; + const savedQueryRuleParams = { required: { type: t.literal('saved_query'), @@ -287,6 +291,8 @@ const { response: savedQueryResponseParams, } = buildAPISchemas(savedQueryRuleParams); +export { savedQueryCreateParams }; + const thresholdRuleParams = { required: { type: t.literal('threshold'), @@ -308,6 +314,8 @@ const { response: thresholdResponseParams, } = buildAPISchemas(thresholdRuleParams); +export { thresholdCreateParams }; + const machineLearningRuleParams = { required: { type: t.literal('machine_learning'), @@ -323,6 +331,8 @@ const { response: machineLearningResponseParams, } = buildAPISchemas(machineLearningRuleParams); +export { machineLearningCreateParams }; + const createTypeSpecific = t.union([ eqlCreateParams, threatMatchCreateParams, diff --git a/x-pack/plugins/security_solution/common/endpoint/types/index.ts b/x-pack/plugins/security_solution/common/endpoint/types/index.ts index 055b3f6a34378..512adffc70eef 100644 --- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts +++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts @@ -59,9 +59,9 @@ export type Immutable = T extends undefined | null | boolean | string | numbe : ImmutableObject; export type ImmutableArray = ReadonlyArray>; -type ImmutableMap = ReadonlyMap, Immutable>; -type ImmutableSet = ReadonlySet>; -type ImmutableObject = { readonly [K in keyof T]: Immutable }; +export type ImmutableMap = ReadonlyMap, Immutable>; +export type ImmutableSet = ReadonlySet>; +export type ImmutableObject = { readonly [K in keyof T]: Immutable }; /** * Utility type that will return back a union of the given [T]ype and an Immutable version of it diff --git a/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx b/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx index e58d7b6f9b4d9..f24a8fafe1be2 100644 --- a/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx +++ b/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx @@ -14,7 +14,7 @@ import { useHttp } from '../../../lib/kibana'; import { useGetMlCapabilities } from '../hooks/use_get_ml_capabilities'; import * as i18n from './translations'; -interface MlCapabilitiesProvider extends MlCapabilitiesResponse { +export interface MlCapabilitiesProvider extends MlCapabilitiesResponse { capabilitiesFetched: boolean; } diff --git a/x-pack/plugins/security_solution/public/common/components/page/manage_query.tsx b/x-pack/plugins/security_solution/public/common/components/page/manage_query.tsx index 89d89d33150af..684092dbac5c8 100644 --- a/x-pack/plugins/security_solution/public/common/components/page/manage_query.tsx +++ b/x-pack/plugins/security_solution/public/common/components/page/manage_query.tsx @@ -12,7 +12,7 @@ import React from 'react'; import { inputsModel } from '../../store'; import { GlobalTimeArgs } from '../../containers/use_global_time'; -interface OwnProps extends Pick { +export interface OwnProps extends Pick { headerChildren?: React.ReactNode; id: string; legendPosition?: Position; @@ -21,7 +21,9 @@ interface OwnProps extends Pick { inspect?: inputsModel.InspectQuery; } -export function manageQuery(WrappedComponent: React.ComponentClass | React.ComponentType) { +export function manageQuery( + WrappedComponent: React.ComponentClass | React.ComponentType +): React.ComponentClass { class ManageQuery extends React.PureComponent { static displayName: string; public componentDidUpdate(prevProps: OwnProps) { diff --git a/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.tsx b/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.tsx index 4374d7d22bd50..c57ae1d11b8da 100644 --- a/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.tsx @@ -47,13 +47,13 @@ interface Range { display: string; } -interface UpdateReduxTime extends OnTimeChangeProps { +export interface UpdateReduxTime extends OnTimeChangeProps { id: InputsModelId; kql?: inputsModel.GlobalKqlQuery | undefined; timelineId?: string; } -interface ReturnUpdateReduxTime { +export interface ReturnUpdateReduxTime { kqlHaveBeenUpdated: boolean; } diff --git a/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx b/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx index a325285ad9c1f..f643c5690e284 100644 --- a/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx @@ -73,7 +73,7 @@ const connector = connect(makeMapStateToProps); // this component is rendered in the context of the active timeline. This // behavior enables the 'All events' view by appending the alerts index // to the index pattern. -interface OwnProps { +export interface OwnProps { browserFields: BrowserFields; field: string; indexPattern: IIndexPattern; @@ -172,4 +172,6 @@ const StatefulTopNComponent: React.FC = ({ StatefulTopNComponent.displayName = 'StatefulTopNComponent'; -export const StatefulTopN = connector(React.memo(StatefulTopNComponent)); +export const StatefulTopN: React.FunctionComponent = connector( + React.memo(StatefulTopNComponent) +); diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts index e9161703550b6..08c02bdeaa7c0 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts @@ -16,93 +16,94 @@ import { GetPackagesResponse } from '../../../../../../fleet/common'; import { EndpointState } from '../types'; import { IIndexPattern } from '../../../../../../../../src/plugins/data/public'; -interface ServerReturnedEndpointList { +export interface ServerReturnedEndpointList { type: 'serverReturnedEndpointList'; payload: HostResultList; } -interface ServerFailedToReturnEndpointList { +export interface ServerFailedToReturnEndpointList { type: 'serverFailedToReturnEndpointList'; payload: ServerApiError; } -interface ServerReturnedEndpointDetails { +export interface ServerReturnedEndpointDetails { type: 'serverReturnedEndpointDetails'; payload: HostInfo; } -interface ServerFailedToReturnEndpointDetails { +export interface ServerFailedToReturnEndpointDetails { type: 'serverFailedToReturnEndpointDetails'; payload: ServerApiError; } -interface ServerReturnedEndpointPolicyResponse { +export interface ServerReturnedEndpointPolicyResponse { type: 'serverReturnedEndpointPolicyResponse'; payload: GetHostPolicyResponse; } -interface ServerFailedToReturnEndpointPolicyResponse { +export interface ServerFailedToReturnEndpointPolicyResponse { type: 'serverFailedToReturnEndpointPolicyResponse'; payload: ServerApiError; } -interface ServerReturnedPoliciesForOnboarding { +export interface ServerReturnedPoliciesForOnboarding { type: 'serverReturnedPoliciesForOnboarding'; payload: { policyItems: GetPolicyListResponse['items']; }; } -interface ServerFailedToReturnPoliciesForOnboarding { +export interface ServerFailedToReturnPoliciesForOnboarding { type: 'serverFailedToReturnPoliciesForOnboarding'; payload: ServerApiError; } -interface UserSelectedEndpointPolicy { +export interface UserSelectedEndpointPolicy { type: 'userSelectedEndpointPolicy'; payload: { selectedPolicyId: string; }; } -interface ServerCancelledEndpointListLoading { +export interface ServerCancelledEndpointListLoading { type: 'serverCancelledEndpointListLoading'; } -interface ServerCancelledPolicyItemsLoading { +export interface ServerCancelledPolicyItemsLoading { type: 'serverCancelledPolicyItemsLoading'; } -interface ServerReturnedEndpointPackageInfo { +export interface ServerReturnedEndpointPackageInfo { type: 'serverReturnedEndpointPackageInfo'; payload: GetPackagesResponse['response'][0]; } -interface ServerReturnedEndpointNonExistingPolicies { +export interface ServerReturnedEndpointNonExistingPolicies { type: 'serverReturnedEndpointNonExistingPolicies'; payload: EndpointState['nonExistingPolicies']; } -interface ServerReturnedEndpointAgentPolicies { +export interface ServerReturnedEndpointAgentPolicies { type: 'serverReturnedEndpointAgentPolicies'; payload: EndpointState['agentPolicies']; } -interface ServerReturnedEndpointExistValue { +export interface ServerReturnedEndpointExistValue { type: 'serverReturnedEndpointExistValue'; payload: boolean; } -interface ServerReturnedMetadataPatterns { +export interface ServerReturnedMetadataPatterns { type: 'serverReturnedMetadataPatterns'; payload: IIndexPattern[]; } -interface ServerFailedToReturnMetadataPatterns { +export interface ServerFailedToReturnMetadataPatterns { type: 'serverFailedToReturnMetadataPatterns'; payload: ServerApiError; } -interface UserUpdatedEndpointListRefreshOptions { + +export interface UserUpdatedEndpointListRefreshOptions { type: 'userUpdatedEndpointListRefreshOptions'; payload: { isAutoRefreshEnabled?: boolean; @@ -110,26 +111,26 @@ interface UserUpdatedEndpointListRefreshOptions { }; } -interface AppRequestedEndpointList { +export interface AppRequestedEndpointList { type: 'appRequestedEndpointList'; } -interface ServerReturnedAgenstWithEndpointsTotal { +export interface ServerReturnedAgenstWithEndpointsTotal { type: 'serverReturnedAgenstWithEndpointsTotal'; payload: number; } -interface ServerFailedToReturnAgenstWithEndpointsTotal { +export interface ServerFailedToReturnAgenstWithEndpointsTotal { type: 'serverFailedToReturnAgenstWithEndpointsTotal'; payload: ServerApiError; } -interface ServerReturnedEndpointsTotal { +export interface ServerReturnedEndpointsTotal { type: 'serverReturnedEndpointsTotal'; payload: number; } -interface ServerFailedToReturnEndpointsTotal { +export interface ServerFailedToReturnEndpointsTotal { type: 'serverFailedToReturnEndpointsTotal'; payload: ServerApiError; } diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action.ts index af511cf45c4b8..6bd39e9c24f96 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action.ts +++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action.ts @@ -11,14 +11,14 @@ import { PolicyData, UIPolicyConfig } from '../../../../../../common/endpoint/ty import { ServerApiError } from '../../../../../common/types'; import { PolicyDetailsState } from '../../types'; -interface ServerReturnedPolicyDetailsData { +export interface ServerReturnedPolicyDetailsData { type: 'serverReturnedPolicyDetailsData'; payload: { policyItem: PolicyData | undefined; }; } -interface ServerFailedToReturnPolicyDetailsData { +export interface ServerFailedToReturnPolicyDetailsData { type: 'serverFailedToReturnPolicyDetailsData'; payload: ServerApiError; } @@ -26,33 +26,33 @@ interface ServerFailedToReturnPolicyDetailsData { /** * When users change a policy via forms, this action is dispatched with a payload that modifies the configuration of a cloned policy config. */ -interface UserChangedPolicyConfig { +export interface UserChangedPolicyConfig { type: 'userChangedPolicyConfig'; payload: { policyConfig: UIPolicyConfig; }; } -interface UserChangedAntivirusRegistration { +export interface UserChangedAntivirusRegistration { type: 'userChangedAntivirusRegistration'; payload: { enabled: boolean; }; } -interface ServerReturnedPolicyDetailsAgentSummaryData { +export interface ServerReturnedPolicyDetailsAgentSummaryData { type: 'serverReturnedPolicyDetailsAgentSummaryData'; payload: { agentStatusSummary: GetAgentStatusResponse['results']; }; } -interface ServerReturnedPolicyDetailsUpdateFailure { +export interface ServerReturnedPolicyDetailsUpdateFailure { type: 'serverReturnedPolicyDetailsUpdateFailure'; payload: PolicyDetailsState['updateStatus']; } -interface ServerReturnedUpdatedPolicyDetailsData { +export interface ServerReturnedUpdatedPolicyDetailsData { type: 'serverReturnedUpdatedPolicyDetailsData'; payload: { policyItem: PolicyData; @@ -60,11 +60,11 @@ interface ServerReturnedUpdatedPolicyDetailsData { }; } -interface UserClickedPolicyDetailsSaveButton { +export interface UserClickedPolicyDetailsSaveButton { type: 'userClickedPolicyDetailsSaveButton'; } -interface LicenseChanged { +export interface LicenseChanged { type: 'licenseChanged'; payload: ILicense; } diff --git a/x-pack/plugins/security_solution/public/resolver/store/camera/selectors.ts b/x-pack/plugins/security_solution/public/resolver/store/camera/selectors.ts index 21d05ea3c1035..f1023bc643210 100644 --- a/x-pack/plugins/security_solution/public/resolver/store/camera/selectors.ts +++ b/x-pack/plugins/security_solution/public/resolver/store/camera/selectors.ts @@ -19,7 +19,7 @@ import { import * as scalingConstants from './scaling_constants'; import { Vector2, CameraState, AABB, Matrix3, CameraAnimationState } from '../../types'; -interface ClippingPlanes { +export interface ClippingPlanes { renderWidth: number; renderHeight: number; clippingPlaneRight: number; diff --git a/x-pack/plugins/security_solution/public/resolver/types.ts b/x-pack/plugins/security_solution/public/resolver/types.ts index e6a004938a267..8f6d40b259495 100644 --- a/x-pack/plugins/security_solution/public/resolver/types.ts +++ b/x-pack/plugins/security_solution/public/resolver/types.ts @@ -6,6 +6,7 @@ */ /* eslint-disable no-duplicate-imports */ +import type ResizeObserver from 'resize-observer-polyfill'; import type React from 'react'; import { Store } from 'redux'; import { Middleware, Dispatch } from 'redux'; diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts index 23ea6cc29c3d2..cdf057b8f2bb6 100644 --- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts +++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts @@ -10,7 +10,7 @@ import { IScopedClusterClient, SavedObjectsClientContract } from '../../../../.. import { listMock } from '../../../lists/server/mocks'; import { securityMock } from '../../../security/server/mocks'; import { alertsMock } from '../../../alerting/server/mocks'; -import { xpackMocks } from '../../../../mocks'; +import { xpackMocks } from '../fixtures'; import { FleetStartContract, ExternalCallback, PackageService } from '../../../fleet/server'; import { createPackagePolicyServiceMock, diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/handlers.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/handlers.test.ts index 5e60fcd4bb115..f7a0135ff5ae5 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/handlers.test.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/handlers.test.ts @@ -7,7 +7,7 @@ import { KibanaResponseFactory } from 'kibana/server'; -import { xpackMocks } from '../../../../../../mocks'; +import { xpackMocks } from '../../../fixtures'; import { loggingSystemMock, httpServerMock } from '../../../../../../../src/core/server/mocks'; import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types'; import { listMock } from '../../../../../lists/server/mocks'; diff --git a/x-pack/mocks.ts b/x-pack/plugins/security_solution/server/fixtures.ts similarity index 81% rename from x-pack/mocks.ts rename to x-pack/plugins/security_solution/server/fixtures.ts index 03abb89e17022..cc8f7966cdd1f 100644 --- a/x-pack/mocks.ts +++ b/x-pack/plugins/security_solution/server/fixtures.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { coreMock } from '../src/core/server/mocks'; -import { licensingMock } from './plugins/licensing/server/mocks'; +import { coreMock } from '../../../../src/core/server/mocks'; +import { licensingMock } from '../../licensing/server/mocks'; function createCoreRequestHandlerContextMock() { return { diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/test_adapters.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/test_adapters.ts index 662081b9999a8..f5d652ef34236 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/test_adapters.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/test_adapters.ts @@ -17,7 +17,10 @@ interface ResponseCall { status: number; } -interface Response extends ResponseCall { +/** + * @internal + */ +export interface Response extends ResponseCall { calls: ResponseCall[]; } diff --git a/x-pack/plugins/security_solution/tsconfig.json b/x-pack/plugins/security_solution/tsconfig.json new file mode 100644 index 0000000000000..bebfd9ca88c23 --- /dev/null +++ b/x-pack/plugins/security_solution/tsconfig.json @@ -0,0 +1,46 @@ + +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true + }, + "include": [ + "common/**/*", + "public/**/*", + "server/**/*", + "scripts/**/*", + // have to declare *.json explicitly due to https://github.com/microsoft/TypeScript/issues/25636 + "server/**/*.json", + "public/**/*.json", + "../../../typings/**/*" + ], + "references": [ + { "path": "../../../src/core/tsconfig.json" }, + { "path": "../../../src/plugins/data/tsconfig.json" }, + { "path": "../../../src/plugins/embeddable/tsconfig.json" }, + { "path": "../../../src/plugins/home/tsconfig.json" }, + { "path": "../../../src/plugins/inspector/tsconfig.json" }, + { "path": "../../../src/plugins/ui_actions/tsconfig.json" }, + { "path": "../../../src/plugins/newsfeed/tsconfig.json" }, + { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, + { "path": "../../../src/plugins/telemetry/tsconfig.json" }, + { "path": "../../../src/plugins/telemetry_management_section/tsconfig.json" }, + { "path": "../actions/tsconfig.json" }, + { "path": "../alerting/tsconfig.json" }, + { "path": "../cases/tsconfig.json" }, + { "path": "../data_enhanced/tsconfig.json" }, + { "path": "../encrypted_saved_objects/tsconfig.json" }, + { "path": "../features/tsconfig.json" }, + { "path": "../fleet/tsconfig.json" }, + { "path": "../licensing/tsconfig.json" }, + { "path": "../lists/tsconfig.json" }, + { "path": "../maps/tsconfig.json" }, + { "path": "../ml/tsconfig.json" }, + { "path": "../spaces/tsconfig.json" }, + { "path": "../security/tsconfig.json"}, + ] + } diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index ab4bdb654e98d..0e5e45c4a39b5 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -69,6 +69,7 @@ { "path": "../plugins/lens/tsconfig.json" }, { "path": "../plugins/license_management/tsconfig.json" }, { "path": "../plugins/licensing/tsconfig.json" }, + { "path": "../plugins/lists/tsconfig.json" }, { "path": "../plugins/logstash/tsconfig.json" }, { "path": "../plugins/metrics_entities/tsconfig.json" }, { "path": "../plugins/ml/tsconfig.json" }, @@ -79,6 +80,7 @@ { "path": "../plugins/runtime_fields/tsconfig.json" }, { "path": "../plugins/saved_objects_tagging/tsconfig.json" }, { "path": "../plugins/security/tsconfig.json" }, + { "path": "../plugins/security_solution/tsconfig.json" }, { "path": "../plugins/snapshot_restore/tsconfig.json" }, { "path": "../plugins/spaces/tsconfig.json" }, { "path": "../plugins/stack_alerts/tsconfig.json" },