From 7cee2eefdc820123b6350ec5d33fd723fad7bd79 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Mon, 14 Jun 2021 14:01:22 -0700
Subject: [PATCH] [kbnArchiver] handle archives which have \r\n (#102118)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 .../import_export/parse_archive.test.ts       | 63 +++++++++++++++++++
 .../kbn_client/import_export/parse_archive.ts | 22 +++++++
 .../kbn_client/kbn_client_import_export.ts    | 15 +----
 3 files changed, 86 insertions(+), 14 deletions(-)
 create mode 100644 packages/kbn-test/src/kbn_client/import_export/parse_archive.test.ts
 create mode 100644 packages/kbn-test/src/kbn_client/import_export/parse_archive.ts

diff --git a/packages/kbn-test/src/kbn_client/import_export/parse_archive.test.ts b/packages/kbn-test/src/kbn_client/import_export/parse_archive.test.ts
new file mode 100644
index 00000000000000..25651a0dd21902
--- /dev/null
+++ b/packages/kbn-test/src/kbn_client/import_export/parse_archive.test.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { parseArchive } from './parse_archive';
+
+jest.mock('fs/promises', () => ({
+  readFile: jest.fn(),
+}));
+
+const mockReadFile = jest.requireMock('fs/promises').readFile;
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+it('parses archives with \\n', async () => {
+  mockReadFile.mockResolvedValue(
+    `{
+      "foo": "abc"
+    }\n\n{
+      "foo": "xyz"
+    }`
+  );
+
+  const archive = await parseArchive('mock');
+  expect(archive).toMatchInlineSnapshot(`
+    Array [
+      Object {
+        "foo": "abc",
+      },
+      Object {
+        "foo": "xyz",
+      },
+    ]
+  `);
+});
+
+it('parses archives with \\r\\n', async () => {
+  mockReadFile.mockResolvedValue(
+    `{
+      "foo": "123"
+    }\r\n\r\n{
+      "foo": "456"
+    }`
+  );
+
+  const archive = await parseArchive('mock');
+  expect(archive).toMatchInlineSnapshot(`
+    Array [
+      Object {
+        "foo": "123",
+      },
+      Object {
+        "foo": "456",
+      },
+    ]
+  `);
+});
diff --git a/packages/kbn-test/src/kbn_client/import_export/parse_archive.ts b/packages/kbn-test/src/kbn_client/import_export/parse_archive.ts
new file mode 100644
index 00000000000000..b6b85ba521525b
--- /dev/null
+++ b/packages/kbn-test/src/kbn_client/import_export/parse_archive.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Fs from 'fs/promises';
+
+export interface SavedObject {
+  id: string;
+  type: string;
+  [key: string]: unknown;
+}
+
+export async function parseArchive(path: string): Promise<SavedObject[]> {
+  return (await Fs.readFile(path, 'utf-8'))
+    .split(/\r?\n\r?\n/)
+    .filter((line) => !!line)
+    .map((line) => JSON.parse(line));
+}
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts b/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts
index 88953cdbaed7c9..4adae7d1cd031e 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_import_export.ts
@@ -16,25 +16,12 @@ import { ToolingLog, isAxiosResponseError, createFailError, REPO_ROOT } from '@k
 
 import { KbnClientRequester, uriencode, ReqOptions } from './kbn_client_requester';
 import { KbnClientSavedObjects } from './kbn_client_saved_objects';
+import { parseArchive } from './import_export/parse_archive';
 
 interface ImportApiResponse {
   success: boolean;
   [key: string]: unknown;
 }
-
-interface SavedObject {
-  id: string;
-  type: string;
-  [key: string]: unknown;
-}
-
-async function parseArchive(path: string): Promise<SavedObject[]> {
-  return (await Fs.readFile(path, 'utf-8'))
-    .split('\n\n')
-    .filter((line) => !!line)
-    .map((line) => JSON.parse(line));
-}
-
 export class KbnClientImportExport {
   constructor(
     public readonly log: ToolingLog,