fix integration json loading parser so that it will trim unneeded emp…

…ty spaces from the ndjson file and match the existing behavior of the savedObject import dashboard that works even when empty spaces appear in the ndjson file (opensearch-project#758) (opensearch-project#848) (cherry picked from commit a0a62af) Signed-off-by: YANGDB <yang.db.dev@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> (cherry picked from commit 711a71f)
amsiglan · Sep 28, 2023 · 962e0e5 · 962e0e5
1 parent 266ae6e
commit 962e0e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/auto_sync_commit_metadata.json b/auto_sync_commit_metadata.json
@@ -1,4 +1,4 @@
 {
-    "last_github_commit": "1342df021fca66d1187b2fb84e01c61c50ab469a",
-    "last_gitfarm_commit": "5a804795b2be1b07610a02ffd52b198fcc985e29"
+    "last_github_commit": "711a71fcb348713ef6a02feea968a3a78d1b5d57",
+    "last_gitfarm_commit": "e564e78330a8e9876e41c834275e9ef784a1b192"
 }
diff --git a/server/adaptors/integrations/repository/integration.ts b/server/adaptors/integrations/repository/integration.ts
@@ -211,7 +211,7 @@ export class Integration {
       );
       try {
         const ndjson = await fs.readFile(sobjPath, { encoding: 'utf-8' });
-        const asJson = '[' + ndjson.replace(/\n/g, ',') + ']';
+        const asJson = '[' + ndjson.trim().replace(/\n/g, ',') + ']';
         const parsed = JSON.parse(asJson);
         result.savedObjects = parsed;
       } catch (err: any) {