Fixing up problems from merge

elastic · Mar 25, 2021 · f55c6bf · f55c6bf
1 parent b0a2fb0
commit f55c6bf
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 159 deletions.
diff --git a/x-pack/plugins/cases/server/client/cases/create.ts b/x-pack/plugins/cases/server/client/cases/create.ts
@@ -45,7 +45,6 @@ interface CreateCaseArgs {
   userActionService: CaseUserActionServiceSetup;
   theCase: CasePostRequest;
   logger: Logger;
-  subCasesEnabled: boolean;
 }
 
 /**
@@ -59,7 +58,6 @@ export const create = async ({
   user,
   theCase,
   logger,
-  subCasesEnabled,
 }: CreateCaseArgs): Promise<CaseResponse> => {
   // default to an individual case if the type is not defined.
   const { type = CaseType.individual, ...nonTypeCaseFields } = theCase;

diff --git a/x-pack/plugins/cases/server/client/cases/get.ts b/x-pack/plugins/cases/server/client/cases/get.ts
@@ -20,7 +20,6 @@ interface GetParams {
   includeComments?: boolean;
   includeSubCaseComments?: boolean;
   logger: Logger;
-  subCasesEnabled: boolean;
 }
 
 /**
@@ -33,7 +32,6 @@ export const get = async ({
   logger,
   includeComments = false,
   includeSubCaseComments = false,
-  subCasesEnabled,
 }: GetParams): Promise<CaseResponse> => {
   try {
     let theCase: SavedObject<ESCaseAttributes>;

diff --git a/x-pack/plugins/cases/server/client/cases/push.ts b/x-pack/plugins/cases/server/client/cases/push.ts
@@ -69,7 +69,6 @@ interface PushParams {
   casesClient: CasesClientHandler;
   actionsClient: ActionsClient;
   logger: Logger;
-  subCasesEnabled: boolean;
 }
 
 export const push = async ({
@@ -83,7 +82,6 @@ export const push = async ({
   caseId,
   user,
   logger,
-  subCasesEnabled,
 }: PushParams): Promise<CaseResponse> => {
   /* Start of push to external service */
   let theCase: CaseResponse;

diff --git a/x-pack/plugins/cases/server/client/cases/update.ts b/x-pack/plugins/cases/server/client/cases/update.ts
@@ -337,7 +337,6 @@ interface UpdateArgs {
   casesClient: CasesClientHandler;
   cases: CasesPatchRequest;
   logger: Logger;
-  subCasesEnabled: boolean;
 }
 
 export const update = async ({
@@ -348,7 +347,6 @@ export const update = async ({
   casesClient,
   cases,
   logger,
-  subCasesEnabled,
 }: UpdateArgs): Promise<CasesResponse> => {
   const query = pipe(
     excess(CasesPatchRequestRt).decode(cases),

diff --git a/x-pack/plugins/cases/server/client/client.ts b/x-pack/plugins/cases/server/client/client.ts
@@ -51,7 +51,6 @@ export class CasesClientHandler implements CasesClient {
   private readonly _userActionService: CaseUserActionServiceSetup;
   private readonly _alertsService: AlertServiceContract;
   private readonly logger: Logger;
-  private readonly subCasesEnabled: boolean;
 
   constructor(clientArgs: CasesClientFactoryArguments) {
     this._scopedClusterClient = clientArgs.scopedClusterClient;
@@ -63,7 +62,6 @@ export class CasesClientHandler implements CasesClient {
     this._userActionService = clientArgs.userActionService;
     this._alertsService = clientArgs.alertsService;
     this.logger = clientArgs.logger;
-    this.subCasesEnabled = clientArgs.subCasesEnabled;
   }
 
   public async create(caseInfo: CasePostRequest) {
@@ -76,7 +74,6 @@ export class CasesClientHandler implements CasesClient {
         user: this.user,
         theCase: caseInfo,
         logger: this.logger,
-        subCasesEnabled: this.subCasesEnabled,
       });
     } catch (error) {
       throw createCaseError({
@@ -97,7 +94,6 @@ export class CasesClientHandler implements CasesClient {
         cases,
         casesClient: this,
         logger: this.logger,
-        subCasesEnabled: this.subCasesEnabled,
       });
     } catch (error) {
       const caseIDVersions = cases.cases.map((caseInfo) => ({
@@ -123,7 +119,6 @@ export class CasesClientHandler implements CasesClient {
         comment,
         user: this.user,
         logger: this.logger,
-        subCasesEnabled: this.subCasesEnabled,
       });
     } catch (error) {
       throw createCaseError({
@@ -190,7 +185,6 @@ export class CasesClientHandler implements CasesClient {
         caseService: this._caseService,
         savedObjectsClient: this._savedObjectsClient,
         logger: this.logger,
-        subCasesEnabled: this.subCasesEnabled,
       });
     } catch (error) {
       this.logger.error(`Failed to get case using client id: ${args.id}: ${error}`);
@@ -244,7 +238,6 @@ export class CasesClientHandler implements CasesClient {
         casesClient: this,
         caseConfigureService: this._caseConfigureService,
         logger: this.logger,
-        subCasesEnabled: this.subCasesEnabled,
       });
     } catch (error) {
       throw createCaseError({

diff --git a/x-pack/plugins/cases/server/client/comments/add.ts b/x-pack/plugins/cases/server/client/comments/add.ts
@@ -216,13 +216,11 @@ async function getCombinedCase({
   client,
   id,
   logger,
-  subCasesEnabled,
 }: {
   service: CaseServiceSetup;
   client: SavedObjectsClientContract;
   id: string;
   logger: Logger;
-  subCasesEnabled: boolean;
 }): Promise<CommentableCase> {
   const [casePromise, subCasePromise] = await Promise.allSettled([
     service.getCase({
@@ -278,7 +276,6 @@ interface AddCommentArgs {
   userActionService: CaseUserActionServiceSetup;
   user: User;
   logger: Logger;
-  subCasesEnabled: boolean;
 }
 
 export const addComment = async ({
@@ -290,7 +287,6 @@ export const addComment = async ({
   comment,
   user,
   logger,
-  subCasesEnabled,
 }: AddCommentArgs): Promise<CaseResponse> => {
   const query = pipe(
     CommentRequestRt.decode(comment),
@@ -324,7 +320,6 @@ export const addComment = async ({
       client: savedObjectsClient,
       id: caseId,
       logger,
-      subCasesEnabled,
     });
 
     // eslint-disable-next-line @typescript-eslint/naming-convention

diff --git a/x-pack/plugins/cases/server/client/index.test.ts b/x-pack/plugins/cases/server/client/index.test.ts
@@ -44,7 +44,6 @@ describe('createExternalCasesClient()', () => {
       savedObjectsClient,
       userActionService,
       logger,
-      subCasesEnabled: true,
     });
     expect(CasesClientHandler).toHaveBeenCalledTimes(1);
   });

diff --git a/x-pack/plugins/cases/server/client/mocks.ts b/x-pack/plugins/cases/server/client/mocks.ts
@@ -81,7 +81,6 @@ export const createCasesClientWithMockSavedObjectsClient = async ({
     alertsService,
     scopedClusterClient: esClient,
     logger: log,
-    subCasesEnabled: true,
   });
   return {
     client: casesClient,

diff --git a/x-pack/plugins/cases/server/client/types.ts b/x-pack/plugins/cases/server/client/types.ts
@@ -75,7 +75,6 @@ export interface CasesClientFactoryArguments {
   userActionService: CaseUserActionServiceSetup;
   alertsService: AlertServiceContract;
   logger: Logger;
-  subCasesEnabled: boolean;
 }
 
 export interface ConfigureFields {

diff --git a/x-pack/plugins/cases/server/config.ts b/x-pack/plugins/cases/server/config.ts
@@ -9,7 +9,6 @@ import { schema, TypeOf } from '@kbn/config-schema';
 
 export const ConfigSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
-  subCasesEnabled: schema.boolean({ defaultValue: false }),
 });
 
 export type ConfigType = TypeOf<typeof ConfigSchema>;
diff --git a/x-pack/plugins/cases/server/connectors/case/index.ts b/x-pack/plugins/cases/server/connectors/case/index.ts
@@ -93,9 +93,6 @@ async function executor(
     userActionService,
     alertsService,
     logger,
-    // sub-cases-enabled: force this to true because we should never be able to call execute if the feature is disabled in the first
-    // place. The plugin won't register case as a connector if subCasesEnabled is false.
-    subCasesEnabled: true,
   });
 
   if (!supportedSubActions.includes(subAction)) {

diff --git a/x-pack/plugins/cases/server/plugin.ts b/x-pack/plugins/cases/server/plugin.ts
@@ -54,16 +54,15 @@ export class CasePlugin {
   private connectorMappingsService?: ConnectorMappingsServiceSetup;
   private userActionService?: CaseUserActionServiceSetup;
   private alertsService?: AlertService;
-  private config?: ConfigType;
 
   constructor(private readonly initializerContext: PluginInitializerContext) {
     this.log = this.initializerContext.logger.get();
   }
 
   public async setup(core: CoreSetup, plugins: PluginsSetup) {
-    this.config = createConfig(this.initializerContext);
+    const config = createConfig(this.initializerContext);
 
-    if (!this.config.enabled) {
+    if (!config.enabled) {
       return;
     }
 
@@ -109,7 +108,6 @@ export class CasePlugin {
       connectorMappingsService: this.connectorMappingsService,
       userActionService: this.userActionService,
       router,
-      subCasesEnabled: this.config.subCasesEnabled,
     });
 
     if (ENABLE_CASE_CONNECTOR) {
@@ -144,7 +142,6 @@ export class CasePlugin {
         userActionService: this.userActionService!,
         alertsService: this.alertsService!,
         logger: this.log,
-        subCasesEnabled: this.config?.subCasesEnabled ?? false,
       });
     };
 
@@ -189,7 +186,6 @@ export class CasePlugin {
             alertsService,
             user,
             logger,
-            subCasesEnabled: this.config?.subCasesEnabled ?? false,
           });
         },
       };

diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_router.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_router.ts
@@ -36,7 +36,6 @@ export const createRoute = async (
       getUserActions: jest.fn(),
     },
     logger: log,
-    subCasesEnabled: true,
   });
 
   return router[method].mock.calls[0][1];

diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/route_contexts.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/route_contexts.ts
@@ -58,7 +58,6 @@ export const createRouteContext = async (client: any, badAuth = false) => {
     alertsService,
     scopedClusterClient: esClient,
     logger: log,
-    subCasesEnabled: true,
   });
 
   return { context, services: { userActionService } };

diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/delete_all_comments.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/delete_all_comments.ts
@@ -18,25 +18,19 @@ export function initDeleteAllCommentsApi({
   router,
   userActionService,
   logger,
-  subCasesEnabled,
 }: RouteDeps) {
-  const querySchema = subCasesEnabled
-    ? {
-        query: schema.maybe(
-          schema.object({
-            subCaseId: schema.maybe(schema.string()),
-          })
-        ),
-      }
-    : {};
   router.delete(
     {
       path: CASE_COMMENTS_URL,
       validate: {
         params: schema.object({
           case_id: schema.string(),
         }),
-        ...querySchema,
+        query: schema.maybe(
+          schema.object({
+            subCaseId: schema.maybe(schema.string()),
+          })
+        ),
       },
     },
     async (context, request, response) => {

diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/delete_comment.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/delete_comment.ts
@@ -19,17 +19,7 @@ export function initDeleteCommentApi({
   router,
   userActionService,
   logger,
-  subCasesEnabled,
 }: RouteDeps) {
-  const querySchema = subCasesEnabled
-    ? {
-        query: schema.maybe(
-          schema.object({
-            subCaseId: schema.maybe(schema.string()),
-          })
-        ),
-      }
-    : {};
   router.delete(
     {
       path: CASE_COMMENT_DETAILS_URL,
@@ -38,7 +28,11 @@ export function initDeleteCommentApi({
           case_id: schema.string(),
           comment_id: schema.string(),
         }),
-        ...querySchema,
+        query: schema.maybe(
+          schema.object({
+            subCaseId: schema.maybe(schema.string()),
+          })
+        ),
       },
     },
     async (context, request, response) => {

diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/find_comments.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/find_comments.ts
@@ -30,12 +30,7 @@ const FindQueryParamsRt = rt.partial({
   subCaseId: rt.string,
 });
 
-export function initFindCaseCommentsApi({
-  caseService,
-  router,
-  logger,
-  subCasesEnabled,
-}: RouteDeps) {
+export function initFindCaseCommentsApi({ caseService, router, logger }: RouteDeps) {
   router.get(
     {
       path: `${CASE_COMMENTS_URL}/_find`,
@@ -49,17 +44,10 @@ export function initFindCaseCommentsApi({
     async (context, request, response) => {
       try {
         const client = context.core.savedObjects.client;
-        const query = {
-          ...pipe(
-            // sub-cases-enabled: Don't allow subCaseId to be a valid query parameter
-            subCasesEnabled
-              ? FindQueryParamsRt.decode(request.query)
-              : SavedObjectFindOptionsRt.decode(request.query),
-            fold(throwErrors(Boom.badRequest), identity)
-          ),
-          // sub-cases-enabled: Avoid type errors because SavedObjectFindOptionsRt does not have 'subCaseId' field defined
-          ...(subCasesEnabled ? {} : { subCaseId: undefined }),
-        };
+        const query = pipe(
+          FindQueryParamsRt.decode(request.query),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
 
         if (!ENABLE_CASE_CONNECTOR && query.subCaseId !== undefined) {
           throw Boom.badRequest(

diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/get_all_comment.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/get_all_comment.ts
@@ -15,25 +15,20 @@ import { flattenCommentSavedObjects, wrapError } from '../../utils';
 import { CASE_COMMENTS_URL, ENABLE_CASE_CONNECTOR } from '../../../../../common/constants';
 import { defaultSortField } from '../../../../common';
 
-export function initGetAllCommentsApi({ caseService, router, logger, subCasesEnabled }: RouteDeps) {
-  const querySchema = subCasesEnabled
-    ? {
-        query: schema.maybe(
-          schema.object({
-            includeSubCaseComments: schema.maybe(schema.boolean()),
-            subCaseId: schema.maybe(schema.string()),
-          })
-        ),
-      }
-    : {};
+export function initGetAllCommentsApi({ caseService, router, logger }: RouteDeps) {
   router.get(
     {
       path: CASE_COMMENTS_URL,
       validate: {
         params: schema.object({
           case_id: schema.string(),
         }),
-        ...querySchema,
+        query: schema.maybe(
+          schema.object({
+            includeSubCaseComments: schema.maybe(schema.boolean()),
+            subCaseId: schema.maybe(schema.string()),
+          })
+        ),
       },
     },
     async (context, request, response) => {