Support for JSON with comments for security scans (#4090)

* Support for JSON with comments for security scans

* Update Telemetry version

* CW: Test case to validate getDependencyGraph for JSON

* CW: Added Test Cases for sendTelemetryEvent for codeScan

* Removing test case: Redundant

---------

Co-authored-by: Laxman Reddy <[email protected]>

Author: laileni-aws

src/codewhisperer/models/constants.ts

@@ -98,6 +98,7 @@ export const platformLanguageIds = [
     'terragrunt',
     'packer',
     'plaintext',
+    'jsonc',
 ] as const
 
 export type PlatformLanguageId = (typeof platformLanguageIds)[number]

src/codewhisperer/util/dependencyGraph/dependencyGraphFactory.ts

@@ -32,6 +32,8 @@ export class DependencyGraphFactory {
     static getDependencyGraphFromFileExtensions<K extends Keys>(fileName: string): ClassType<K> {
         if (fileName.endsWith(DependencyGraphConstants.tfExt) || fileName.endsWith(DependencyGraphConstants.hclExt)) {
             return new languageMap['terraform']('tf' satisfies CodeWhispererConstants.PlatformLanguageId)
+        } else if (fileName.endsWith(DependencyGraphConstants.jsonExt)) {
+            return new languageMap['cloudformation']('json' satisfies CodeWhispererConstants.PlatformLanguageId)
         } else {
             return undefined
         }
@@ -51,8 +53,6 @@ export class DependencyGraphFactory {
                 return new languageMap['csharp']('csharp' satisfies CodeWhispererConstants.PlatformLanguageId)
             case 'yaml' satisfies CodeWhispererConstants.PlatformLanguageId:
                 return new languageMap['cloudformation']('yaml' satisfies CodeWhispererConstants.PlatformLanguageId)
-            case 'json' satisfies CodeWhispererConstants.PlatformLanguageId:
-                return new languageMap['cloudformation']('json' satisfies CodeWhispererConstants.PlatformLanguageId)
             default:
                 return this.getDependencyGraphFromFileExtensions(editor.document.fileName)
         }

src/codewhisperer/util/runtimeLanguageContext.ts

@@ -65,7 +65,7 @@ export class RuntimeLanguageContext {
             javascript: 'javascript',
             javascriptreact: 'jsx',
             json: 'json',
-            jsonc: 'jsonc',
+            jsonc: 'json',
             jsx: 'jsx',
             kotlin: 'kotlin',
             packer: 'tf',
@@ -97,7 +97,7 @@ export class RuntimeLanguageContext {
             java: 'java',
             javascript: 'js',
             json: 'json',
-            jsonc: 'jsonc',
+            jsonc: 'json',
             jsx: 'jsx',
             kotlin: 'kt',
             plaintext: 'txt',

src/test/codewhisperer/util/dependencyGraphFactory.test.ts

@@ -9,6 +9,7 @@ import { join } from 'path'
 import { getTestWorkspaceFolder } from '../../../testInteg/integrationTestsUtilities'
 import { DependencyGraphFactory } from '../../../codewhisperer/util/dependencyGraph/dependencyGraphFactory'
 import { terraformDependencyGraph } from './../../../codewhisperer/util/dependencyGraph/terraformDependencyGraph'
+import { cloudformationDependencyGraph } from '../../../codewhisperer/util/dependencyGraph/cloudformationDependencyGraph'
 
 describe('DependencyGraphFactory', function () {
     const workspaceFolder = getTestWorkspaceFolder()
@@ -27,4 +28,13 @@ describe('DependencyGraphFactory', function () {
         const isTerraformDependencyGraph = dependencyGraph instanceof terraformDependencyGraph
         assert.ok(isTerraformDependencyGraph)
     })
+
+    it('codescan request for file in supported json language find generate dependency graph using file extension', async function () {
+        const appRoot = join(workspaceFolder, 'cloudformation-plain-sam-app')
+        const appCodePath = join(appRoot, 'src', 'app.json')
+        const editor = await openTestFile(appCodePath)
+        const dependencyGraph = DependencyGraphFactory.getDependencyGraph(editor)
+        const isCloudFormationDependencyGraph = dependencyGraph instanceof cloudformationDependencyGraph
+        assert.ok(isCloudFormationDependencyGraph)
+    })
 })