Skip to content

Commit 4883d4b

Browse files
authored
Fixed ci type check errors for alerting and actions properties for SIEM RouteHandlerContext (#59400)
* Fixed ci type check errors for alerting and actions optional properties on RouteHandlerContext * Reverted git revert b83f814
1 parent d55524c commit 4883d4b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+144
-29
lines changed

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe('add_prepackaged_rules_route', () => {
6363
});
6464

6565
test('returns 404 if alertClient is not available on the route', async () => {
66-
context.alerting.getAlertsClient = jest.fn();
66+
context.alerting!.getAlertsClient = jest.fn();
6767
const request = addPrepackagedRulesRequest();
6868
const response = await server.inject(request, context);
6969

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ export const addPrepackedRulesRoute = (router: IRouter) => {
3333
const siemResponse = buildSiemResponse(response);
3434

3535
try {
36+
if (!context.alerting || !context.actions) {
37+
return siemResponse.error({ statusCode: 404 });
38+
}
3639
const alertsClient = context.alerting.getAlertsClient();
3740
const actionsClient = context.actions.getActionsClient();
3841
const clusterClient = context.core.elasticsearch.dataClient;

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('create_rules_bulk', () => {
3939
});
4040

4141
test('returns 404 if alertClient is not available on the route', async () => {
42-
context.alerting.getAlertsClient = jest.fn();
42+
context.alerting!.getAlertsClient = jest.fn();
4343
const response = await server.inject(getReadBulkRequest(), context);
4444
expect(response.status).toEqual(404);
4545
expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@ export const createRulesBulkRoute = (router: IRouter) => {
3535
},
3636
},
3737
async (context, request, response) => {
38+
const siemResponse = buildSiemResponse(response);
39+
if (!context.alerting || !context.actions) {
40+
return siemResponse.error({ statusCode: 404 });
41+
}
3842
const alertsClient = context.alerting.getAlertsClient();
3943
const actionsClient = context.actions.getActionsClient();
4044
const clusterClient = context.core.elasticsearch.dataClient;
4145
const siemClient = context.siem.getSiemClient();
42-
const siemResponse = buildSiemResponse(response);
4346

4447
if (!actionsClient || !alertsClient) {
4548
return siemResponse.error({ statusCode: 404 });

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('create_rules', () => {
4141
});
4242

4343
test('returns 404 if alertClient is not available on the route', async () => {
44-
context.alerting.getAlertsClient = jest.fn();
44+
context.alerting!.getAlertsClient = jest.fn();
4545
const response = await server.inject(getCreateRequest(), context);
4646
expect(response.status).toEqual(404);
4747
expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ export const createRulesRoute = (router: IRouter): void => {
5959
const siemResponse = buildSiemResponse(response);
6060

6161
try {
62+
if (!context.alerting || !context.actions) {
63+
return siemResponse.error({ statusCode: 404 });
64+
}
6265
const alertsClient = context.alerting.getAlertsClient();
6366
const actionsClient = context.actions.getActionsClient();
6467
const clusterClient = context.core.elasticsearch.dataClient;

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ describe('delete_rules', () => {
8282
});
8383

8484
test('returns 404 if alertClient is not available on the route', async () => {
85-
context.alerting.getAlertsClient = jest.fn();
85+
context.alerting!.getAlertsClient = jest.fn();
8686
const response = await server.inject(getDeleteBulkRequest(), context);
8787
expect(response.status).toEqual(404);
8888
expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,14 @@ export const deleteRulesBulkRoute = (router: IRouter) => {
3232
},
3333
};
3434
const handler: Handler = async (context, request, response) => {
35+
const siemResponse = buildSiemResponse(response);
36+
37+
if (!context.alerting || !context.actions) {
38+
return siemResponse.error({ statusCode: 404 });
39+
}
3540
const alertsClient = context.alerting.getAlertsClient();
3641
const actionsClient = context.actions.getActionsClient();
3742
const savedObjectsClient = context.core.savedObjects.client;
38-
const siemResponse = buildSiemResponse(response);
3943

4044
if (!actionsClient || !alertsClient) {
4145
return siemResponse.error({ statusCode: 404 });

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ describe('delete_rules', () => {
5656
});
5757

5858
test('returns 404 if alertClient is not available on the route', async () => {
59-
context.alerting.getAlertsClient = jest.fn();
59+
context.alerting!.getAlertsClient = jest.fn();
6060
const response = await server.inject(getDeleteRequest(), context);
6161

6262
expect(response.status).toEqual(404);

x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ export const deleteRulesRoute = (router: IRouter) => {
3333

3434
try {
3535
const { id, rule_id: ruleId } = request.query;
36+
if (!context.alerting || !context.actions) {
37+
return siemResponse.error({ statusCode: 404 });
38+
}
3639

3740
const alertsClient = context.alerting.getAlertsClient();
3841
const actionsClient = context.actions.getActionsClient();

0 commit comments

Comments
 (0)