fix(codewhisperer): codescan name is required by api aws#4760

Problem
CreateUploadUrl and CreateCodeScan APIs now require CodeScanName field

Solution
Pass a random UUID to the APIs

Author: ctlai95

packages/core/src/codewhisperer/client/user-service-2.json

@@ -414,6 +414,13 @@
             "type": "string",
             "enum": ["Completed", "Pending", "Failed"]
         },
+        "CodeAnalysisUploadContext": {
+            "type": "structure",
+            "required": ["codeScanName"],
+            "members": {
+                "codeScanName": { "shape": "CodeScanName" }
+            }
+        },
         "CodeCoverageEvent": {
             "type": "structure",
             "required": ["programmingLanguage", "acceptedCharacterCount", "totalCharacterCount", "timestamp"],
@@ -461,6 +468,12 @@
             "max": 128,
             "min": 1
         },
+        "CodeScanName": {
+            "type": "string",
+            "documentation": "<p>Code analysis scan name</p>",
+            "max": 128,
+            "min": 1
+        },
         "CodeScanRemediationsEvent": {
             "type": "structure",
             "members": {
@@ -1243,7 +1256,8 @@
                 "clientToken": {
                     "shape": "StartCodeAnalysisRequestClientTokenString",
                     "idempotencyToken": true
-                }
+                },
+                "codeScanName": { "shape": "CodeScanName" }
             }
         },
         "StartCodeAnalysisRequestClientTokenString": {
@@ -1570,7 +1584,8 @@
         "UploadContext": {
             "type": "structure",
             "members": {
-                "taskAssistPlanningUploadContext": { "shape": "TaskAssistPlanningUploadContext" }
+                "taskAssistPlanningUploadContext": { "shape": "TaskAssistPlanningUploadContext" },
+                "codeAnalysisUploadContext": { "shape": "CodeAnalysisUploadContext" }
             },
             "union": true
         },

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

@@ -32,6 +32,7 @@ import path from 'path'
 import { ZipMetadata, ZipUtil } from '../util/zipUtil'
 import { debounce } from 'lodash'
 import { once } from '../../shared/utilities/functionUtils'
+import { randomUUID } from '../../common/crypto'
 
 const localize = nls.loadMessageBundle()
 export const stopScanButton = localize('aws.codewhisperer.stopscan', 'Stop Scan')
@@ -133,8 +134,9 @@ export async function startSecurityScan(
         throwIfCancelled(scope)
         let artifactMap: ArtifactMap = {}
         const uploadStartTime = performance.now()
+        const scanName = randomUUID()
         try {
-            artifactMap = await getPresignedUrlAndUpload(client, zipMetadata, scope)
+            artifactMap = await getPresignedUrlAndUpload(client, zipMetadata, scope, scanName)
         } catch (error) {
             getLogger().error('Failed to upload code artifacts', error)
             throw error
@@ -148,7 +150,13 @@ export async function startSecurityScan(
          */
         throwIfCancelled(scope)
         serviceInvocationStartTime = performance.now()
-        const scanJob = await createScanJob(client, artifactMap, codeScanTelemetryEntry.codewhispererLanguage, scope)
+        const scanJob = await createScanJob(
+            client,
+            artifactMap,
+            codeScanTelemetryEntry.codewhispererLanguage,
+            scope,
+            scanName
+        )
         if (scanJob.status === 'Failed') {
             throw new Error(scanJob.errorMessage)
         }

packages/core/src/codewhisperer/service/securityScanHandler.ts

@@ -140,7 +140,8 @@ export async function createScanJob(
     client: DefaultCodeWhispererClient,
     artifactMap: codewhispererClient.ArtifactMap,
     languageId: string,
-    scope: CodeWhispererConstants.CodeAnalysisScope
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    scanName: string
 ) {
     getLogger().verbose(`Creating scan job...`)
     const req: codewhispererClient.CreateCodeScanRequest = {
@@ -149,8 +150,12 @@ export async function createScanJob(
             languageName: languageId,
         },
         scope: scope,
+        codeScanName: scanName,
     }
-    const resp = await client.createCodeScan(req)
+    const resp = await client.createCodeScan(req).catch(err => {
+        getLogger().error(`Failed creating scan job. Request id: ${err.requestId}`)
+        throw err
+    })
     getLogger().verbose(`Request id: ${resp.$response.requestId}`)
     TelemetryHelper.instance.sendCodeScanEvent(languageId, resp.$response.requestId)
     return resp
@@ -159,7 +164,8 @@ export async function createScanJob(
 export async function getPresignedUrlAndUpload(
     client: DefaultCodeWhispererClient,
     zipMetadata: ZipMetadata,
-    scope: CodeWhispererConstants.CodeAnalysisScope
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    scanName: string
 ) {
     if (zipMetadata.zipFilePath === '') {
         throw new Error("Zip failure: can't find valid source zip.")
@@ -168,9 +174,17 @@ export async function getPresignedUrlAndUpload(
         contentMd5: getMd5(zipMetadata.zipFilePath),
         artifactType: 'SourceCode',
         uploadIntent: getUploadIntent(scope),
+        uploadContext: {
+            codeAnalysisUploadContext: {
+                codeScanName: scanName,
+            },
+        },
     }
     getLogger().verbose(`Prepare for uploading src context...`)
-    const srcResp = await client.createUploadUrl(srcReq)
+    const srcResp = await client.createUploadUrl(srcReq).catch(err => {
+        getLogger().error(`Failed getting presigned url for uploading src context. Request id: ${err.requestId}`)
+        throw err
+    })
     getLogger().verbose(`Request id: ${srcResp.$response.requestId}`)
     getLogger().verbose(`Complete Getting presigned Url for uploading src context.`)
     getLogger().verbose(`Uploading src context...`)

packages/core/src/testE2E/codewhisperer/securityScan.test.ts

@@ -22,6 +22,7 @@ import {
 import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
 import { fsCommon } from '../../srcShared/fs'
 import { ZipUtil } from '../../codewhisperer/util/zipUtil'
+import { randomUUID } from '../../common/crypto'
 
 const filePromptWithSecurityIssues = `from flask import app
 
@@ -84,7 +85,7 @@ describe('CodeWhisperer security scan', async function () {
         Step 1: Generate context truncations
         Step 2: Get presigned Url and upload
 
-    returns artifactMap and projectPath
+    returns artifactMap, projectPath and codeScanName
     */
     async function securityJobSetup(editor: vscode.TextEditor) {
         const zipUtil = new ZipUtil()
@@ -93,16 +94,18 @@ describe('CodeWhisperer security scan', async function () {
         const projectPath = zipUtil.getProjectPath(editor.document.uri)
         const scope = CodeWhispererConstants.CodeAnalysisScope.PROJECT
         const zipMetadata = await zipUtil.generateZip(uri, scope)
+        const codeScanName = randomUUID()
 
         let artifactMap
         try {
-            artifactMap = await getPresignedUrlAndUpload(client, zipMetadata, scope)
+            artifactMap = await getPresignedUrlAndUpload(client, zipMetadata, scope, codeScanName)
         } finally {
             await zipUtil.removeTmpFiles(zipMetadata)
         }
         return {
             artifactMap: artifactMap,
             projectPath: projectPath,
+            codeScanName: codeScanName,
         }
     }
 
@@ -120,7 +123,13 @@ describe('CodeWhisperer security scan', async function () {
         const scope = CodeWhispererConstants.CodeAnalysisScope.PROJECT
 
         //get job status and result
-        const scanJob = await createScanJob(client, artifactMap, editor.document.languageId, scope)
+        const scanJob = await createScanJob(
+            client,
+            artifactMap,
+            editor.document.languageId,
+            scope,
+            securityJobSetupResult.codeScanName
+        )
         const jobStatus = await pollScanJobStatus(client, scanJob.jobId, scope)
         const securityRecommendationCollection = await listScanResults(
             client,
@@ -146,7 +155,13 @@ describe('CodeWhisperer security scan', async function () {
         const securityJobSetupResult = await securityJobSetup(editor)
         const artifactMap = securityJobSetupResult.artifactMap
         const projectPath = securityJobSetupResult.projectPath
-        const scanJob = await createScanJob(client, artifactMap, editor.document.languageId, scope)
+        const scanJob = await createScanJob(
+            client,
+            artifactMap,
+            editor.document.languageId,
+            scope,
+            securityJobSetupResult.codeScanName
+        )
 
         //get job status and result
         const jobStatus = await pollScanJobStatus(client, scanJob.jobId, scope)