Merge master into feature/q-dev-ux

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Feature-79cd3c68-8432-44b5-a004-dd98b8e858d8.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Security Scan: Auto-scan now supports JSX, TSX, Kotlin, Scala, and Shell files."
+}

packages/amazonq/test/unit/codewhisperer/util/securityScanLanguageContext.test.ts

@@ -17,20 +17,20 @@ describe('securityScanLanguageContext', function () {
             ['javascript', true],
             ['typescript', true],
             ['jsx', false],
-            ['javascriptreact', false],
-            ['typescriptreact', false],
+            ['javascriptreact', true],
+            ['typescriptreact', true],
             ['tsx', false],
             ['csharp', true],
             ['python', true],
             ['c', true],
             ['cpp', true],
             ['go', true],
-            ['kotlin', false],
+            ['kotlin', true],
             ['php', true],
             ['ruby', true],
             ['rust', false],
-            ['scala', false],
-            ['shellscript', false],
+            ['scala', true],
+            ['shellscript', true],
             ['sql', false],
             ['json', true],
             ['yaml', true],
@@ -92,7 +92,9 @@ describe('securityScanLanguageContext', function () {
             ['java', 'java'],
             ['python', 'python'],
             ['javascript', 'javascript'],
+            ['javascriptreact', 'javascript'],
             ['typescript', 'typescript'],
+            ['typescriptreact', 'typescript'],
             ['csharp', 'csharp'],
             ['go', 'go'],
             ['ruby', 'ruby'],
@@ -112,6 +114,9 @@ describe('securityScanLanguageContext', function () {
             ['java-properties', 'plaintext'],
             ['go.mod', 'plaintext'],
             ['go.sum', 'plaintext'],
+            ['kotlin', 'kotlin'],
+            ['scala', 'scala'],
+            ['shellscript', 'shell'],
         ]
 
         for (const [securityScanLanguageId, expectedCwsprLanguageId] of securityScanLanguageIds) {

packages/core/src/codewhisperer/models/constants.ts

@@ -263,7 +263,9 @@ export const securityScanLanguageIds = [
     'java',
     'python',
     'javascript',
+    'javascriptreact',
     'typescript',
+    'typescriptreact',
     'csharp',
     'go',
     'ruby',
@@ -286,6 +288,11 @@ export const securityScanLanguageIds = [
     'java-properties',
     'go.mod',
     'go.sum',
+    'kotlin',
+    'scala',
+    'sh',
+    'shell',
+    'shellscript',
 ] as const
 
 export type SecurityScanLanguageId = (typeof securityScanLanguageIds)[number]

packages/core/src/codewhisperer/util/securityScanLanguageContext.ts

@@ -17,7 +17,9 @@ export class SecurityScanLanguageContext {
             java: 'java',
             python: 'python',
             javascript: 'javascript',
+            javascriptreact: 'javascript',
             typescript: 'typescript',
+            typescriptreact: 'typescript',
             csharp: 'csharp',
             go: 'go',
             golang: 'go',
@@ -40,6 +42,11 @@ export class SecurityScanLanguageContext {
             'java-properties': 'plaintext',
             'go.mod': 'plaintext',
             'go.sum': 'plaintext',
+            kotlin: 'kotlin',
+            scala: 'scala',
+            sh: 'shell',
+            shell: 'shell',
+            shellscript: 'shell',
         })
     }