From 3c38e23a18994aad3f73e666efefe10669695877 Mon Sep 17 00:00:00 2001 From: John Schulz Date: Fri, 6 Nov 2020 09:33:17 -0500 Subject: [PATCH] Remove "uploaded" from two error messages --- .../ingest_manager/server/services/epm/archive/index.ts | 4 ++-- .../apis/epm/install_by_upload.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/ingest_manager/server/services/epm/archive/index.ts b/x-pack/plugins/ingest_manager/server/services/epm/archive/index.ts index dd9afef92fcea..fe5a395804932 100644 --- a/x-pack/plugins/ingest_manager/server/services/epm/archive/index.ts +++ b/x-pack/plugins/ingest_manager/server/services/epm/archive/index.ts @@ -61,7 +61,7 @@ export async function unpackArchiveToCache( }); } catch (error) { throw new PackageInvalidArchiveError( - `Error during extraction of uploaded package: ${error}. Assumed content type was ${contentType}, check if this matches the archive type.` + `Error during extraction of package: ${error}. Assumed content type was ${contentType}, check if this matches the archive type.` ); } @@ -69,7 +69,7 @@ export async function unpackArchiveToCache( // unpacking a zip file with untarBuffer() just results in nothing. if (paths.length === 0) { throw new PackageInvalidArchiveError( - `Uploaded archive seems empty. Assumed content type was ${contentType}, check if this matches the archive type.` + `Archive seems empty. Assumed content type was ${contentType}, check if this matches the archive type.` ); } return paths; diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/install_by_upload.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/install_by_upload.ts index 4ad9501f3936f..a5f1aa8003f04 100644 --- a/x-pack/test/ingest_manager_api_integration/apis/epm/install_by_upload.ts +++ b/x-pack/test/ingest_manager_api_integration/apis/epm/install_by_upload.ts @@ -92,7 +92,7 @@ export default function (providerContext: FtrProviderContext) { .send(buf) .expect(400); expect(res.error.text).to.equal( - '{"statusCode":400,"error":"Bad Request","message":"Uploaded archive seems empty. Assumed content type was application/gzip, check if this matches the archive type."}' + '{"statusCode":400,"error":"Bad Request","message":"Archive seems empty. Assumed content type was application/gzip, check if this matches the archive type."}' ); }); @@ -105,7 +105,7 @@ export default function (providerContext: FtrProviderContext) { .send(buf) .expect(400); expect(res.error.text).to.equal( - '{"statusCode":400,"error":"Bad Request","message":"Error during extraction of uploaded package: Error: end of central directory record signature not found. Assumed content type was application/zip, check if this matches the archive type."}' + '{"statusCode":400,"error":"Bad Request","message":"Error during extraction of package: Error: end of central directory record signature not found. Assumed content type was application/zip, check if this matches the archive type."}' ); });