github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[HTTP] Apply the same behaviour to all 500 errors (except from custom responses) (#85541)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Alejandro Fernández Haro 2021-02-18 17:31:18 +00:00 • committed by GitHub
parent 4304cb9e62
commit 5342877a32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
162 changed files with 1030 additions and 1438 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/remote_clusters/server/routes/api/add_route.ts
View file

@ -88,7 +88,7 @@ export const register = (deps: RouteDependencies): void => {
if (isEsError(error)) {
return response.customError({ statusCode: error.statusCode, body: error });
}
return response.internalError({ body: error });
throw error;
}
};
deps.router.post(

4
x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts
View file

@ -95,7 +95,7 @@ export const register = (deps: RouteDependencies): void => {
if (isEsError(error)) {
return response.customError({ statusCode: error.statusCode, body: error });
}
return response.internalError({ body: error });
throw error;
}
};
@ -132,7 +132,7 @@ export const register = (deps: RouteDependencies): void => {
if (isEsError(error)) {
return response.customError({ statusCode: error.statusCode, body: error });
}
return response.internalError({ body: error });
throw error;
}
};

12
x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
View file

@ -78,10 +78,16 @@ describe('GET remote clusters', () => {
const mockContext = xpackMocks.createRequestHandlerContext();
mockContext.core.elasticsearch.legacy.client = mockScopedClusterClient;
const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
if (asserts.statusCode === 500) {
await expect(handler(mockContext, mockRequest, kibanaResponseFactory)).rejects.toThrowError(
asserts.result as Error
);
} else {
const response = await handler(mockContext, mockRequest, kibanaResponseFactory);
expect(response.status).toBe(asserts.statusCode);
expect(response.payload).toEqual(asserts.result);
expect(response.status).toBe(asserts.statusCode);
expect(response.payload).toEqual(asserts.result);
}
if (Array.isArray(asserts.apiArguments)) {
for (const apiArguments of asserts.apiArguments) {

2
x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
View file

@ -63,7 +63,7 @@ export const register = (deps: RouteDependencies): void => {
if (isEsError(error)) {
return response.customError({ statusCode: error.statusCode, body: error });
}
return response.internalError({ body: error });
throw error;
}
};

2
x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
View file

@ -100,7 +100,7 @@ export const register = (deps: RouteDependencies): void => {
if (isEsError(error)) {
return response.customError({ statusCode: error.statusCode, body: error });
}
return response.internalError({ body: error });
throw error;
}
};