Merge master into feature/agentic-chat

justinmk3 · web-flow · commit d9620cf791e5 · 2025-03-28T07:46:26.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.311",
+        "@aws-toolkits/telemetry": "^1.0.312",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",
diff --git a/packages/amazonq/.changes/next-release/Feature-b5f9e589-3415-4e4e-b7b2-f292b5436ad0.json b/packages/amazonq/.changes/next-release/Feature-b5f9e589-3415-4e4e-b7b2-f292b5436ad0.json
diff --git a/packages/amazonq/.vscode/tasks.json b/packages/amazonq/.vscode/tasks.json
@@ -5,8 +5,9 @@
     "tasks": [
         {
             "label": "watch",
-            "type": "npm",
-            "script": "watch",
+            "type": "shell",
+            "command": "npm",
+            "args": ["run", "watch"],
             "problemMatcher": "$tsc-watch",
             "isBackground": true,
             "group": {
diff --git a/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts b/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts
@@ -47,4 +47,17 @@ export function injectJSDOM() {
 
     // jsdom doesn't have support for structuredClone. See https://github.com/jsdom/jsdom/issues/3363
     global.structuredClone = (val: any) => JSON.parse(JSON.stringify(val))
+
+    global.IntersectionObserver = class IntersectionObserver {
+        observe() {}
+        unobserve() {}
+        disconnect() {}
+        takeRecords() {
+            return []
+        }
+        // eslint-disable-next-line unicorn/no-null
+        root = null
+        rootMargin = ''
+        thresholds = []
+    }
 }
diff --git a/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts b/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts
@@ -65,7 +65,7 @@ describe('Amazon Q Code Transformation', function () {
     })
 
     describe('Starting a transformation from chat', () => {
-        it('Can click through all user input forms for a Java upgrade', async () => {
+        it.skip('Can click through all user input forms for a Java upgrade', async () => {
             sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([])
             sinon.stub(GumbyController.prototype, 'validateLanguageUpgradeProjects' as keyof GumbyController).resolves([
                 {
diff --git a/packages/core/.vscode/tasks.json b/packages/core/.vscode/tasks.json
@@ -10,8 +10,9 @@
         },
         {
             "label": "watch",
-            "type": "npm",
-            "script": "watch",
+            "type": "shell",
+            "command": "npm",
+            "args": ["run", "watch"],
             "problemMatcher": "$tsc-watch",
             "isBackground": true
         },
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -439,9 +439,9 @@
         "serveVue": "Local server for Vue.js code for development purposes. Provides faster iteration when updating Vue files"
     },
     "devDependencies": {
-        "@aws/language-server-runtimes": "^0.2.44",
-        "@aws/chat-client-ui-types": "^0.0.8",
         "@aws-sdk/types": "^3.13.1",
+        "@aws/chat-client-ui-types": "^0.0.8",
+        "@aws/language-server-runtimes": "^0.2.44",
         "@cspotcode/source-map-support": "^0.8.1",
         "@sinonjs/fake-timers": "^10.0.2",
         "@types/adm-zip": "^0.4.34",
@@ -498,6 +498,7 @@
         "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
         "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
         "@aws-sdk/client-api-gateway": "<3.696.0",
+        "@aws-sdk/client-apprunner": "<3.696.0",
         "@aws-sdk/client-cloudcontrol": "<3.696.0",
         "@aws-sdk/client-cloudformation": "<3.696.0",
         "@aws-sdk/client-cloudwatch-logs": "<3.696.0",
@@ -512,7 +513,6 @@
         "@aws-sdk/client-ssm": "<3.696.0",
         "@aws-sdk/client-sso": "<3.696.0",
         "@aws-sdk/client-sso-oidc": "<3.696.0",
-        "@aws-sdk/client-apprunner": "<3.696.0",
         "@aws-sdk/credential-provider-env": "<3.696.0",
         "@aws-sdk/credential-provider-process": "<3.696.0",
         "@aws-sdk/credential-provider-sso": "<3.696.0",
@@ -522,7 +522,7 @@
         "@aws-sdk/s3-request-presigner": "<3.696.0",
         "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
-        "@aws/mynah-ui": "^4.26.0",
+        "@aws/mynah-ui": "^4.26.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^3.0.0",
diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts
@@ -547,7 +547,8 @@ export class Messenger {
             message === CodeWhispererConstants.viewProposedChangesChatMessage
         ) {
             // get permission to re-run job and view logs after partially successful job is downloaded
-            this.sendFeedbackFormMessage(tabID)
+            // TODO: uncomment this when feature is ready
+            // this.sendFeedbackFormMessage(tabID)
         }
 
         this.dispatcher.sendChatMessage(
diff --git a/packages/core/src/awsService/appBuilder/explorer/openTemplate.ts b/packages/core/src/awsService/appBuilder/explorer/openTemplate.ts
@@ -5,8 +5,7 @@
 
 import { samSyncUrl } from '../../../shared/constants'
 import { CloudFormationTemplateRegistry } from '../../../shared/fs/templateRegistry'
-import { syncMementoRootKey } from '../../../shared/sam/sync'
-
+import { syncMementoRootKey } from '../../../shared/sam/constants'
 import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
 import { createTemplatePrompter, TemplateItem } from '../../../shared/ui/sam/templatePrompter'
 import { Wizard } from '../../../shared/wizards/wizard'
diff --git a/packages/core/src/codewhisperer/service/securityScanHandler.ts b/packages/core/src/codewhisperer/service/securityScanHandler.ts
@@ -384,20 +384,24 @@ export async function uploadArtifactToS3(
         headersObj['x-amz-server-side-encryption-aws-kms-key-id'] = resp.kmsKeyArn
     }
 
+    let requestId: string | undefined = undefined
+    let id2: string | undefined = undefined
+    let responseCode: string = ''
+
     try {
         const response = await request.fetch('PUT', resp.uploadUrl, {
             body: readFileSync(fileName),
             headers: resp?.requestHeaders ?? headersObj,
         }).response
         logger.debug(`StatusCode: ${response.status}, Text: ${response.statusText}`)
+        requestId = response.headers?.get('x-amz-request-id') ?? undefined
+        id2 = response.headers?.get('x-amz-id-2') ?? undefined
+        responseCode = response.status.toString()
     } catch (error) {
         if (span && error instanceof RequestError) {
-            const requestId = error.response.headers.get('x-amz-request-id') ?? undefined
-            span.record({
-                requestId: requestId,
-                requestServiceType: 's3',
-                httpStatusCode: error.code.toString(),
-            })
+            requestId = error.response.headers.get('x-amz-request-id') ?? undefined
+            id2 = error.response.headers.get('x-amz-id-2') ?? undefined
+            responseCode = error.code.toString()
         }
         let errorMessage = ''
         const isCodeScan = featureUseCase === FeatureUseCase.CODE_SCAN
@@ -419,6 +423,16 @@ export async function uploadArtifactToS3(
             ChatSessionManager.Instance.getSession().startTestGenerationRequestId = error.requestId
         }
         throw isCodeScan ? new UploadArtifactToS3Error(errorMessage) : new UploadTestArtifactToS3Error(errorMessage)
+    } finally {
+        getLogger().debug(`Upload to S3 response details: x-amz-request-id: ${requestId}, x-amz-id-2: ${id2}`)
+        if (span) {
+            span.record({
+                requestId: requestId,
+                requestId2: id2,
+                requestServiceType: 's3',
+                httpStatusCode: responseCode,
+            })
+        }
     }
 }
 
diff --git a/packages/core/src/shared/sam/build.ts b/packages/core/src/shared/sam/build.ts
@@ -22,16 +22,17 @@ import { getSpawnEnv } from '../env/resolveEnv'
 import {
     getErrorCode,
     getProjectRoot,
+    getRecentResponse,
     getSamCliPathAndVersion,
     getTerminalFromError,
     isDotnetRuntime,
     updateRecentResponse,
 } from './utils'
 import { getConfigFileUri, validateSamBuildConfig } from './config'
 import { runInTerminal } from './processTerminal'
+import { buildMementoRootKey, buildProcessMementoRootKey, globalIdentifier } from './constants'
 import { SemVer } from 'semver'
 
-const buildMementoRootKey = 'samcli.build.params'
 export interface BuildParams {
     readonly template: TemplateItem
     readonly projectRoot: vscode.Uri
@@ -208,6 +209,9 @@ export async function runBuild(arg?: TreeNode): Promise<SamBuildResult> {
         throw new CancellationError('user')
     }
 
+    throwIfTemplateIsBeingBuilt(params.template.uri.path)
+    await registerTemplateBuild(params.template.uri.path)
+
     const projectRoot = params.projectRoot
 
     const defaultFlags: string[] = ['--cached', '--parallel', '--save-params', '--use-container']
@@ -233,16 +237,30 @@ export async function runBuild(arg?: TreeNode): Promise<SamBuildResult> {
     await updateRecentResponse(buildMementoRootKey, 'global', 'templatePath', templatePath)
 
     try {
-        // Create a child process to run the SAM build command
-        const buildProcess = new ChildProcess(samCliPath, ['build', ...buildFlags], {
-            spawnOptions: await addTelemetryEnvVar({
-                cwd: params.projectRoot.fsPath,
-                env: await getSpawnEnv(process.env),
-            }),
-        })
+        await vscode.window.withProgress(
+            {
+                cancellable: true,
+                location: vscode.ProgressLocation.Notification,
+            },
+            async (progress, token) => {
+                token.onCancellationRequested(async () => {
+                    throw new CancellationError('user')
+                })
 
-        // Run SAM build in Terminal
-        await runInTerminal(buildProcess, 'build')
+                progress.report({ message: `Building SAM template at ${params.template.uri.path}` })
+
+                // Create a child process to run the SAM build command
+                const buildProcess = new ChildProcess(samCliPath, ['build', ...buildFlags], {
+                    spawnOptions: await addTelemetryEnvVar({
+                        cwd: params.projectRoot.fsPath,
+                        env: await getSpawnEnv(process.env),
+                    }),
+                })
+
+                // Run SAM build in Terminal
+                await runInTerminal(buildProcess, 'build')
+            }
+        )
 
         return {
             isSuccess: true,
@@ -252,6 +270,8 @@ export async function runBuild(arg?: TreeNode): Promise<SamBuildResult> {
             details: { terminal: getTerminalFromError(error), ...resolveBuildArgConflict(buildFlags) },
             code: getErrorCode(error),
         })
+    } finally {
+        await unregisterTemplateBuild(params.template.uri.path)
     }
 }
 
@@ -293,3 +313,34 @@ export async function resolveBuildFlags(buildFlags: string[], samCliVersion: Sem
     }
     return buildFlags
 }
+
+/**
+ * Returns true if there's an ongoing build process for the provided template, false otherwise
+ * @Param templatePath The path to the template.yaml file
+ */
+function isBuildInProgress(templatePath: string): boolean {
+    const expirationDate = getRecentResponse(buildProcessMementoRootKey, globalIdentifier, templatePath)
+    if (expirationDate) {
+        return Date.now() < parseInt(expirationDate)
+    }
+    return false
+}
+
+/**
+ * Throws an error if there's a build in progress for the provided template
+ * @Param templatePath The path to the template.yaml file
+ */
+export function throwIfTemplateIsBeingBuilt(templatePath: string) {
+    if (isBuildInProgress(templatePath)) {
+        throw new ToolkitError('This template is already being built', { code: 'BuildInProgress' })
+    }
+}
+
+export async function registerTemplateBuild(templatePath: string) {
+    const expirationDate = Date.now() + 5 * 60 * 1000 // five minutes
+    await updateRecentResponse(buildProcessMementoRootKey, globalIdentifier, templatePath, expirationDate.toString())
+}
+
+export async function unregisterTemplateBuild(templatePath: string) {
+    await updateRecentResponse(buildProcessMementoRootKey, globalIdentifier, templatePath, undefined)
+}
diff --git a/packages/core/src/shared/sam/constants.ts b/packages/core/src/shared/sam/constants.ts
@@ -0,0 +1,10 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const buildProcessMementoRootKey = 'samcli.build.processes'
+export const globalIdentifier = 'global'
+export const buildMementoRootKey = 'samcli.build.params'
+export const deployMementoRootKey = 'samcli.deploy.params'
+export const syncMementoRootKey = 'samcli.sync.params'
diff --git a/packages/core/src/shared/sam/deploy.ts b/packages/core/src/shared/sam/deploy.ts
@@ -26,6 +26,7 @@ import { TemplateItem, createTemplatePrompter } from '../ui/sam/templatePrompter
 import { createDeployParamsSourcePrompter, ParamsSource } from '../ui/sam/paramsSourcePrompter'
 import { getErrorCode, getProjectRoot, getSamCliPathAndVersion, getSource, updateRecentResponse } from './utils'
 import { runInTerminal } from './processTerminal'
+import { deployMementoRootKey } from './constants'
 import {
     TemplateParametersForm,
     TemplateParametersWizard,
@@ -64,7 +65,6 @@ function getDeployEntryPoint(arg: vscode.Uri | AWSTreeNodeBase | TreeNode | unde
         return SamDeployEntryPoints.CommandPalette
     }
 }
-const deployMementoRootKey = 'samcli.deploy.params'
 
 type DeployResult = {
     isSuccess: boolean
diff --git a/packages/core/src/shared/sam/sync.ts b/packages/core/src/shared/sam/sync.ts
@@ -51,6 +51,7 @@ import { ParamsSource, createSyncParamsSourcePrompter } from '../ui/sam/paramsSo
 import { createEcrPrompter } from '../ui/sam/ecrPrompter'
 import { BucketSource, createBucketNamePrompter, createBucketSourcePrompter } from '../ui/sam/bucketPrompter'
 import { runInTerminal } from './processTerminal'
+import { syncMementoRootKey } from './constants'
 import {
     TemplateParametersForm,
     TemplateParametersWizard,
@@ -73,8 +74,6 @@ export interface SyncParams {
     readonly syncFlags?: string
 }
 
-export const syncMementoRootKey = 'samcli.sync.params'
-
 // TODO: hook this up so it prompts the user when more than 1 environment is present in `samconfig.toml`
 export function createEnvironmentPrompter(config: SamConfig, environments = config.listEnvironments()) {
     const recentEnvironmentName = getRecentResponse(syncMementoRootKey, config.location.fsPath, 'environmentName')
diff --git a/packages/core/src/shared/sam/utils.ts b/packages/core/src/shared/sam/utils.ts
@@ -108,6 +108,7 @@ export async function updateRecentResponse(
         getLogger().warn(`sam: unable to save response at key "${key}": %s`, err)
     }
 }
+
 export function getSamCliErrorMessage(stderr: string): string {
     // Split the stderr string by newline, filter out empty lines, and get the last line
     const lines = stderr
diff --git a/packages/core/src/test/shared/sam/build.test.ts b/packages/core/src/test/shared/sam/build.test.ts
diff --git a/packages/core/src/testInteg/sam.test.ts b/packages/core/src/testInteg/sam.test.ts
diff --git a/packages/toolkit/.changes/next-release/Bug Fix-db0d3605-5cb7-4b78-b4ae-29be86f51f99.json b/packages/toolkit/.changes/next-release/Bug Fix-db0d3605-5cb7-4b78-b4ae-29be86f51f99.json
diff --git a/packages/toolkit/.vscode/tasks.json b/packages/toolkit/.vscode/tasks.json

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ describe('Amazon Q Code Transformation', function () {`
`65`	`65`	`})`
`66`	`66`
`67`	`67`	`describe('Starting a transformation from chat', () => {`
`68`		`- it('Can click through all user input forms for a Java upgrade', async () => {`
	`68`	`+ it.skip('Can click through all user input forms for a Java upgrade', async () => {`
`69`	`69`	`sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([])`
`70`	`70`	`sinon.stub(GumbyController.prototype, 'validateLanguageUpgradeProjects' as keyof GumbyController).resolves([`
`71`	`71`	`{`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,8 @@ export class Messenger {`
`547`	`547`	`message === CodeWhispererConstants.viewProposedChangesChatMessage`
`548`	`548`	`) {`
`549`	`549`	`// get permission to re-run job and view logs after partially successful job is downloaded`
`550`		`- this.sendFeedbackFormMessage(tabID)`
	`550`	`+ // TODO: uncomment this when feature is ready`
	`551`	`+ // this.sendFeedbackFormMessage(tabID)`
`551`	`552`	`}`
`552`	`553`
`553`	`554`	`this.dispatcher.sendChatMessage(`