codewhisperer: remove build requirement (#4114)

* fix(codewhisperer): remove build requirement for java

* add change log

Author: ctlai95

.changes/next-release/Bug Fix-d086954c-0bde-4ab8-9d07-7eac324faaf8.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "CodeWhisperer: Security scans for Java no longer require build artifacts"
+}

src/codewhisperer/util/dependencyGraph/javaDependencyGraph.ts

@@ -152,19 +152,6 @@ export class JavaDependencyGraph extends DependencyGraph {
         })
     }
 
-    private async getFileLevelBuildFilePaths(uri: vscode.Uri, projectPath: string) {
-        const filePath = uri.fsPath
-        this._pickedSourceFiles.clear()
-        this._pickedSourceFiles.add(filePath)
-        this._totalSize = statSync(filePath).size
-        const content = await readFileAsString(uri.fsPath)
-        this._totalLines = content.split(DependencyGraphConstants.newlineRegex).length
-        const javaStatement = this.extractStatement(content)
-        this._buildFileRelativePaths.clear()
-        const buildFileRelativePath = this.generateBuildFileRelativePath(uri, projectPath, javaStatement.packages)
-        return this.generateOneBuildFilePaths(buildFileRelativePath)
-    }
-
     async searchDependency(uri: vscode.Uri): Promise<Set<string>> {
         const filePath = uri.fsPath
         const q: string[] = []
@@ -229,26 +216,6 @@ export class JavaDependencyGraph extends DependencyGraph {
         this._fetchedDirs.add(dirPath)
     }
 
-    private generateOneBuildFilePaths(buildFileRelativePath: string) {
-        const oneBuildFilePaths: string[] = []
-        this._outputDirs.forEach(dir => {
-            const builFilePath = path.join(dir, buildFileRelativePath)
-            if (existsSync(builFilePath) && oneBuildFilePaths.length === 0) {
-                oneBuildFilePaths.push(builFilePath)
-            }
-        })
-        this._outputNonStrictDirs.forEach(dir => {
-            const builFilePath = path.join(dir, buildFileRelativePath)
-            if (existsSync(builFilePath) && oneBuildFilePaths.length === 0) {
-                oneBuildFilePaths.push(builFilePath)
-            }
-        })
-        if (oneBuildFilePaths.length === 0) {
-            throw new Error(`${buildFileRelativePath} is not found.`)
-        }
-        return oneBuildFilePaths
-    }
-
     private generateBuildFilePaths() {
         const buildFiles: Set<string> = new Set<string>()
         this._buildFileRelativePaths.forEach(relativePath => {
@@ -372,17 +339,13 @@ export class JavaDependencyGraph extends DependencyGraph {
             await sleep(1000)
             this.autoDetectClasspath(projectPath, projectName, DependencyGraphConstants.javaBuildExt)
             if (this._outputDirs.size === 0 && this._outputNonStrictDirs.size === 0) {
-                throw new Error(`Classpath auto-detection failed.`)
-            }
-            let buildFiles: string[] = this.generateBuildFilePaths()
-            if (buildFiles.length === 0) {
-                getLogger().debug('Project level compile error:')
-                buildFiles = await this.getFileLevelBuildFilePaths(uri, projectPath)
+                getLogger().debug(`Classpath auto-detection failed.`)
             }
+            const buildFiles: string[] = this.generateBuildFilePaths()
             const truncDirPath = this.getTruncDirPath(uri)
-            getLogger().debug(`Picked source files:`)
+            getLogger().debug(`Picked source files: [${[...this._pickedSourceFiles].join(', ')}]`)
             this.copyFilesToTmpDir(this._pickedSourceFiles, truncDirPath)
-            getLogger().debug(`Picked build artifacts:`)
+            getLogger().debug(`Picked build artifacts: [${buildFiles}]`)
             this.copyFilesToTmpDir(buildFiles, truncDirPath)
             const totalBuildSize = this.getFilesTotalSize(Array.from(buildFiles.values()))
             const zipFilePath = this.zipDir(truncDirPath, CodeWhispererConstants.codeScanZipExt)

src/test/codewhisperer/util/dependencyGraph/javaDependencyGraph.test.ts

@@ -59,22 +59,37 @@ describe('javaDependencyGraph', function () {
     })
 
     describe('generateTruncation', function () {
+        let javaDependencyGraph: JavaDependencyGraph
         beforeEach(function () {
-            sinon.stub(JavaDependencyGraph.prototype, <any>'generateBuildFilePaths').returns([appCodePath])
+            javaDependencyGraph = new JavaDependencyGraph(languageId)
         })
         afterEach(function () {
             sinon.restore()
         })
         it('Should generate and return expected truncation', async function () {
-            const javaDependencyGraph = new JavaDependencyGraph(languageId)
-            sinon.stub(javaDependencyGraph, <any>'_outputDirs').value(new Set<string>('build'))
+            sinon.stub(JavaDependencyGraph.prototype, <any>'generateBuildFilePaths').returns([appCodePath])
+            sinon.stub(javaDependencyGraph, <any>'_outputDirs').value(new Set<string>(['build']))
             const truncation = await javaDependencyGraph.generateTruncation(vscode.Uri.parse(appCodePath))
             assert.ok(truncation.lines > 0)
             assert.ok(truncation.rootDir.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
             assert.ok(truncation.srcPayloadSizeInBytes > 0)
             assert.ok(truncation.scannedFiles.size > 0)
             assert.ok(truncation.zipFilePath.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
         })
+        it('should not throw error if java compilation output path is not set', async () => {
+            sinon.stub(JavaDependencyGraph.prototype, <any>'generateBuildFilePaths').returns([appCodePath])
+            sinon.stub(javaDependencyGraph, <any>'_outputDirs').value(new Set<string>([]))
+            await assert.doesNotReject(async () => {
+                await javaDependencyGraph.generateTruncation(vscode.Uri.parse(appCodePath))
+            })
+        })
+        it('should not throw error no build files are found', async () => {
+            sinon.stub(JavaDependencyGraph.prototype, <any>'generateBuildFilePaths').returns([])
+            sinon.stub(javaDependencyGraph, <any>'_outputDirs').value(new Set<string>(['build']))
+            await assert.doesNotReject(async () => {
+                await javaDependencyGraph.generateTruncation(vscode.Uri.parse(appCodePath))
+            })
+        })
     })
 
     describe('isTestFile', () => {