fix(feature dev): adding required files to upload for execution engine

Author: karanA-aws

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevSessionContextTest.kt

@@ -55,10 +55,9 @@ class FeatureDevSessionContextTest : FeatureDevTestBase(HeavyJavaCodeInsightTest
 
     @Test
     fun testWithInvalidFile() {
-        val txtFile = mock<VirtualFile>()
-        whenever(txtFile.extension).thenReturn("mp4")
-        // whenever(txtFile.path).thenReturn("file.txt")
-        assertFalse(featureDevSessionContext.isFileExtensionAllowed(txtFile))
+        val mediaFile = mock<VirtualFile>()
+        whenever(mediaFile.extension).thenReturn("mp4")
+        assertFalse(featureDevSessionContext.isFileExtensionAllowed(mediaFile))
     }
 
     @Test
@@ -96,7 +95,8 @@ class FeatureDevSessionContextTest : FeatureDevTestBase(HeavyJavaCodeInsightTest
             "License.md",
             "node_modules/express",
             "build/outputs",
-            "dist/bundle.js"
+            "dist/bundle.js",
+            "gradle/wrapper/gradle-wrapper.jar",
         )
 
         val zipResult = featureDevSessionContext.getProjectZip(false)
@@ -120,6 +120,8 @@ class FeatureDevSessionContextTest : FeatureDevTestBase(HeavyJavaCodeInsightTest
             "builder/GetTestBuilder.java",
             "settings.gradle",
             "build.gradle",
+            "gradle/wrapper/gradle-wrapper.jar",
+            ".gitignore",
         )
 
         assertTrue(zippedFiles == expectedFiles)

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt

@@ -34,6 +34,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
     private lateinit var testYaml: VirtualFile
     private lateinit var helperPy: VirtualFile
     private lateinit var testTf: VirtualFile
+    private lateinit var gitIgnore: VirtualFile
 
     private lateinit var sessionConfigSpy: CodeScanSessionConfig
     private lateinit var sessionConfigSpy2: CodeScanSessionConfig
@@ -63,9 +64,9 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
     fun `test createPayload`() {
         val payload = sessionConfigSpy.createPayload()
         assertNotNull(payload)
-        assertThat(payload.context.totalFiles).isEqualTo(10)
+        assertThat(payload.context.totalFiles).isEqualTo(11)
 
-        assertThat(payload.context.scannedFiles.size).isEqualTo(10)
+        assertThat(payload.context.scannedFiles.size).isEqualTo(11)
         assertThat(payload.context.scannedFiles).contains(testYaml, testTf, readMeMd, utilsJs, utilsCs, testJson, testCs, helperPy, helperCs, helpGo)
 
         assertThat(payload.context.srcPayloadSize).isEqualTo(totalSize)
@@ -80,12 +81,12 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
             filesInZip += 1
         }
 
-        assertThat(filesInZip).isEqualTo(10)
+        assertThat(filesInZip).isEqualTo(11)
     }
 
     @Test
     fun `getProjectPayloadMetadata()`() {
-        getProjectPayloadMetadata(sessionConfigSpy, 10, totalSize, this.totalLines, CodewhispererLanguage.Csharp)
+        getProjectPayloadMetadata(sessionConfigSpy, 11, totalSize, this.totalLines, CodewhispererLanguage.Csharp)
     }
 
     @Test
@@ -105,7 +106,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
 
     @Test
     fun `e2e happy path integration test`() = runTest {
-        assertE2ERunsSuccessfully(sessionConfigSpy, project, totalLines, 10, totalSize, 1)
+        assertE2ERunsSuccessfully(sessionConfigSpy, project, totalLines, 11, totalSize, 1)
     }
 
     private fun setupCsharpProject() {
@@ -371,7 +372,10 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
 
         // Adding gitignore file and gitignore file member for testing.
         // The tests include the markdown file but not these two files.
-        projectRule.fixture.addFileToProject("/.gitignore", "node_modules\n.idea\n.vscode\n.DS_Store").virtualFile
+        gitIgnore = projectRule.fixture.addFileToProject("/.gitignore", "node_modules\n.idea\n.vscode\n.DS_Store").virtualFile
+        totalSize += gitIgnore.length
+        totalLines += gitIgnore.toNioPath().toFile().readLines().size
+
         projectRule.fixture.addFileToProject("/.idea/ref", "ref: refs/heads/main")
     }
 }

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt

@@ -47,11 +47,11 @@ class RepoSizeLimitError(override val message: String) : RuntimeException(), Rep
 class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Long? = null) {
     // TODO: Need to correct this class location in the modules going further to support both amazonq and codescan.
 
+    private val requiredFilesForExecution = setOf("gradle/wrapper/gradle-wrapper.jar")
     private val additionalGitIgnoreRules = setOf(
         ".aws-sam",
         ".gem",
         ".git",
-        ".gitignore",
         ".gradle",
         ".hg",
         ".idea",
@@ -136,6 +136,9 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
     suspend fun ignoreFile(file: VirtualFile): Boolean = ignoreFile(file.presentableUrl)
 
     suspend fun ignoreFile(path: String): Boolean {
+        if (requiredFilesForExecution.any { path.endsWith(it) }) {
+            return false
+        }
         // this method reads like something a JS dev would write and doesn't do what the author thinks
         val deferredResults = ignorePatternsWithGitIgnore.map { pattern ->
             withContext(coroutineContext) {