Add JSON5 parsing capabilities for integration configs

package.json

@@ -33,6 +33,7 @@
     "antlr4ts": "^0.5.0-alpha.4",
     "cypress-multi-reporters": "^1.6.3",
     "cypress-parallel": "^0.13.0",
+    "json5": "^2.2.3",
     "mime": "^3.0.0",
     "mocha": "10.1.0",
     "performance-now": "^2.1.0",

server/adaptors/integrations/__data__/repository/aws_vpc_flow/assets/vpc_live_all_mv-1.0.0.sql

@@ -1,4 +1,4 @@
-CREATE MATERIALIZED VIEW {table_name}__week_live_mview AS
+CREATE MATERIALIZED VIEW {table_name}__live_mview AS
   SELECT
     cloud.account_uid AS `aws.vpc.cloud_account_uid`,
     cloud.region AS `aws.vpc.cloud_region`,

server/adaptors/integrations/__test__/local_fs_repository.test.ts

@@ -68,3 +68,50 @@ describe('Local Nginx Integration', () => {
     );
   });
 });
+describe('JSON5 Integration', () => {
+  const dataDirectory: string = path.join(__dirname, '../__data__/repository');
+  const fileSystemAdaptor: FileSystemDataAdaptor = new FileSystemDataAdaptor(dataDirectory);
+  let files: string[];
+
+  beforeAll(async () => {
+    files = await fs.readdir(dataDirectory);
+  });
+
+  it('Should parse valid JSON5 content without errors', async () => {
+    if (!files) {
+      throw new Error('File list not initialized');
+    }
+
+    await Promise.all(
+      files.map(async (filename: string) => {
+        const filePath: string = path.join(dataDirectory, filename);
+        try {
+          const result = await fileSystemAdaptor.readFile(filename);
+          expect(result.ok).toBe(true);
+          expect(result.value).toEqual({ key: 'value' });
+        } catch (error) {
+          console.error(`Error reading file ${filePath}:`, error);
+        }
+      })
+    );
+  });
+
+  it('Should handle errors when parsing invalid JSON5 content', async () => {
+    if (!files) {
+      throw new Error('File list not initialized');
+    }
+
+    await Promise.all(
+      files.map(async (filename: string) => {
+        const filePath: string = path.join(dataDirectory, filename);
+        try {
+          const result = await fileSystemAdaptor.readFile(filename);
+          expect(result.ok).toBe(false);
+          expect(result.error).toBeDefined();
+        } catch (error) {
+          console.error(`Error reading file ${filePath}:`, error);
+        }
+      })
+    );
+  });
+});

server/adaptors/integrations/repository/fs_data_adaptor.ts

@@ -5,6 +5,7 @@
 
 import * as fs from 'fs/promises';
 import path from 'path';
+import JSON5 from 'json5';
 import { CatalogDataAdaptor, IntegrationPart } from './catalog_data_adaptor';
 import { tryParseNDJson } from './utils';
 
@@ -45,7 +46,7 @@ export class FileSystemDataAdaptor implements CatalogDataAdaptor {
     }
     // First try to parse as JSON, then NDJSON, then fail.
     try {
-      const parsed = JSON.parse(content);
+      const parsed = JSON5.parse(content);
       return { ok: true, value: parsed };
     } catch (err) {
       const parsed = await tryParseNDJson(content);

server/adaptors/integrations/repository/json_data_adaptor.ts

@@ -37,7 +37,7 @@ export class JsonCatalogDataAdaptor implements CatalogDataAdaptor {
     if (type !== undefined) {
       return {
         ok: false,
-        error: new Error('JSON adaptor does not support subtypes (isConfigLocalized: true)'),
+        error: new Error('JSON5 adaptor does not support subtypes (isConfigLocalized: true)'),
       };
     }
 
@@ -53,7 +53,7 @@ export class JsonCatalogDataAdaptor implements CatalogDataAdaptor {
   async readFileRaw(_filename: string, _type?: IntegrationPart): Promise<Result<Buffer>> {
     return {
       ok: false,
-      error: new Error('JSON adaptor does not support raw files (isConfigLocalized: true)'),
+      error: new Error('JSON5 adaptor does not support raw files (isConfigLocalized: true)'),
     };
   }
 

yarn.lock

@@ -2007,6 +2007,11 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
+json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"