revert logs

Author: zuoyaofu

packages/amazonq/test/e2e/amazonq/review.test.ts

@@ -210,7 +210,7 @@ describe('Amazon Q Code Review', function () {
 
                 assert.ok(securityDiagnostics.length > 0, 'No security diagnostics found')
 
-                // 1 exact critical issue matches
+                // at least 1 exact critical issue matches
                 assert.ok(
                     matchingSecurityDiagnosticCount(securityDiagnostics, 'CWE-798 - Hardcoded credentials', 21) >= 1
                 )

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

@@ -367,18 +367,11 @@ export const updateReferenceLog = Commands.declare(
 export const openSecurityIssuePanel = Commands.declare(
     'aws.amazonq.openSecurityIssuePanel',
     (context: ExtContext) => async (issue: CodeScanIssue | IssueItem, filePath: string) => {
-        console.log('in open security')
         const targetIssue: CodeScanIssue = issue instanceof IssueItem ? issue.issue : issue
         const targetFilePath: string = issue instanceof IssueItem ? issue.filePath : filePath
         await showSecurityIssueWebview(context.extensionContext, targetIssue, targetFilePath)
-        console.log('in show securityIssueWebview')
-        console.log('targetIssue', targetIssue)
-        console.log('file Path', filePath)
-        console.log('before', targetIssue.suggestedFixes.length === 0)
 
-        console.log('after', targetIssue.suggestedFixes.length === 0)
         if (targetIssue.suggestedFixes.length === 0) {
-            console.log('going to generate fix as suggested fix length is 0')
             await generateFix.execute(targetIssue, targetFilePath, 'webview', true, false)
         }
 

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { fs } from '../../shared/fs/fs'
-// import { getLogger } from '../../shared/logger/logger'
+import { getLogger } from '../../shared/logger/logger'
 import {
     createCodeFixJob,
     getCodeFixJob,
@@ -38,7 +38,7 @@ export async function startCodeFixGeneration(
     let linesOfFixGenerated
     let charsOfFixGenerated
     try {
-        console.log(
+        getLogger().verbose(
             `Starting code fix generation for lines ${issue.startLine + 1} through ${issue.endLine} of file ${filePath}`
         )
 
@@ -91,30 +91,30 @@ export async function startCodeFixGeneration(
         }
         jobId = codeFixJob.jobId
         issue.fixJobId = codeFixJob.jobId
-        console.log(`Created code fix job.`)
+        getLogger().verbose(`Created code fix job.`)
 
         /**
          * Step 4: Polling mechanism on code fix job status
          */
         throwIfCancelled()
         const jobStatus = await pollCodeFixJobStatus(client, String(codeFixJob.jobId), profile)
         if (jobStatus === 'Failed') {
-            console.log(`Code fix generation failed.`)
+            getLogger().verbose(`Code fix generation failed.`)
             throw new CreateCodeFixError()
         }
 
         /**
          * Step 5: Process and render code fix results
          */
         throwIfCancelled()
-        console.log(`Code fix job succeeded and start processing result.`)
+        getLogger().verbose(`Code fix job succeeded and start processing result.`)
 
         const { suggestedFix } = await getCodeFixJob(client, String(codeFixJob.jobId), profile)
         // eslint-disable-next-line aws-toolkits/no-json-stringify-in-log
-        console.log(`Suggested fix: ${JSON.stringify(suggestedFix)}`)
+        getLogger().verbose(`Suggested fix: ${JSON.stringify(suggestedFix)}`)
         return { suggestedFix, jobId }
     } catch (err) {
-        console.log('Code fix generation failed: %s', err)
+        getLogger().error('Code fix generation failed: %s', err)
         throw err
     } finally {
         codeFixState.setToNotStarted()

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

@@ -877,8 +877,6 @@ export class TelemetryHelper {
         result?: string,
         includesFix?: boolean
     ) {
-        // eslint-disable-next-line aws-toolkits/no-console-log
-        console.log('sending telemetry')
         client
             .sendTelemetryEvent({
                 telemetryEvent: {
@@ -909,12 +907,6 @@ export class TelemetryHelper {
                 if (isAwsError(error)) {
                     requestId = error.requestId
                 }
-                // eslint-disable-next-line aws-toolkits/no-console-log
-                console.log(
-                    `Failed to sendCodeScanRemediationsEvent to CodeWhisperer, requestId: ${
-                        requestId ?? ''
-                    }, message: ${error.message}`
-                )
                 getLogger().debug(
                     `Failed to sendCodeScanRemediationsEvent to CodeWhisperer, requestId: ${
                         requestId ?? ''