address comments

Author: David Hasani

packages/core/src/codewhisperer/commands/startTransformByQ.ts

@@ -82,7 +82,7 @@ import { makeTemporaryToolkitFolder } from '../../shared'
 import globals from '../../shared/extensionGlobals'
 import { convertDateToTimestamp } from '../../shared/datetime'
 import { isWin } from '../../shared/vscode/env'
-import { ChildProcess } from '../../shared/utilities/processUtils'
+import { findStringInDirectory } from '../../shared/utilities/workspaceUtils'
 
 function getFeedbackCommentData() {
     const jobId = transformByQState.getJobId()
@@ -745,31 +745,19 @@ export async function getValidSQLConversionCandidateProjects() {
         })
         const openProjects = await getOpenProjects()
         const javaProjects = await getJavaProjects(openProjects)
-        let errorLog = ''
-        const isWindows = isWin()
-        const command = isWindows ? 'findstr' : 'grep'
+        let resultLog = ''
         for (const project of javaProjects) {
             // as long as at least one of these strings is found, project contains embedded SQL statements
             const searchStrings = ['oracle.jdbc.OracleDriver', 'jdbc:oracle:thin:@//', 'jdbc:oracle:oci:@//']
             for (const str of searchStrings) {
-                // case-insensitive, recursive search
-                const args = isWindows ? ['/i', '/s', str, '*.*'] : ['-i', '-r', str]
-                const spawnResult = await new ChildProcess(command, args).run({
-                    spawnOptions: { cwd: project.path, shell: false },
-                })
+                const spawnResult = await findStringInDirectory(str, project.path)
                 // just for telemetry purposes
                 if (spawnResult.error || spawnResult.stderr) {
-                    errorLog += `${JSON.stringify(spawnResult)}---`
+                    resultLog += `search failed: ${JSON.stringify(spawnResult)}`
                 } else {
-                    errorLog += `${command} succeeded: ${spawnResult.exitCode}`
+                    resultLog += `search succeeded: ${spawnResult.exitCode}`
                 }
-                /*
-                note:
-                error is set when command fails to spawn; stderr is set when command itself fails.
-                status of 0 means search string was detected (will be printed to stdout).
-                status will be non-zero and stdout / stderr / error will be empty when search string is not detected.
-                */
-                getLogger().info(`CodeTransformation: searching for ${str} in ${project.path}, result = ${errorLog}`)
+                getLogger().info(`CodeTransformation: searching for ${str} in ${project.path}, result = ${resultLog}`)
                 if (spawnResult.exitCode === 0) {
                     embeddedSQLProjects.push(project)
                     break
@@ -780,7 +768,7 @@ export async function getValidSQLConversionCandidateProjects() {
             `CodeTransformation: found ${embeddedSQLProjects.length} projects with embedded SQL statements`
         )
         telemetry.record({
-            codeTransformMetadata: errorLog,
+            codeTransformMetadata: resultLog,
         })
     })
     return embeddedSQLProjects

packages/core/src/shared/utilities/workspaceUtils.ts

@@ -17,6 +17,8 @@ import { sanitizeFilename } from './textUtilities'
 import { GitIgnoreAcceptor } from '@gerhobbelt/gitignore-parser'
 import * as parser from '@gerhobbelt/gitignore-parser'
 import fs from '../fs/fs'
+import { ChildProcess } from './processUtils'
+import { isWin } from '../vscode/env'
 
 type GitIgnoreRelativeAcceptor = {
     folderPath: string
@@ -610,3 +612,24 @@ export async function collectFilesForIndex(
     // pick top 100k files below size limit
     return storage.slice(0, Math.min(100000, i))
 }
+
+/**
+ * Performs a case-insensitive, recursive search for a string in a directory.
+ * note:
+ * 'error' is set when command fails to spawn; 'stderr' is set when command itself fails.
+ * 'exitCode' will be 0 when searchStr is detected (each line where it's found will be printed to 'stdout').
+ * 'exitCode' will be non-zero and 'stdout' / 'stderr' / 'error' will all be empty/undefined when searchStr is not detected.
+ * @param searchStr the string to search for
+ * @param dirPath the path of the directory to search in
+ * @returns the result of the search
+ */
+export async function findStringInDirectory(searchStr: string, dirPath: string) {
+    const isWindows = isWin()
+    const command = isWindows ? 'findstr' : 'grep'
+    // case-insensitive, recursive search
+    const args = isWindows ? ['/i', '/s', searchStr, '*.*'] : ['-i', '-r', searchStr]
+    const spawnResult = await new ChildProcess(command, args).run({
+        spawnOptions: { cwd: dirPath },
+    })
+    return spawnResult
+}

packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts

@@ -10,6 +10,7 @@ import {
     collectFiles,
     collectFilesForIndex,
     findParentProjectFile,
+    findStringInDirectory,
     getWorkspaceFoldersByPrefixes,
     getWorkspaceRelativePath,
 } from '../../../shared/utilities/workspaceUtils'
@@ -509,4 +510,15 @@ describe('workspaceUtils', () => {
             )
         })
     })
+
+    describe('findStringInDirectory', function () {
+        it('prints the line with the detected string to stdout', async () => {
+            const fileAmount = 1
+            const searchStr = 'oracle.jdbc.OracleDriver'
+            const fileContent = `test content ${searchStr} more test content`
+            const workspaceFolder = await createTestWorkspace(fileAmount, { fileContent: fileContent })
+            const spawnResult = await findStringInDirectory(searchStr, workspaceFolder.uri.fsPath)
+            assert.equal(spawnResult.stdout.includes(searchStr), true)
+        })
+    })
 })