Merge branch 'aws:master' into master

Author: laileni-aws

package-lock.json

@@ -0,0 +1,18 @@
+{
+	"date": "2024-07-18",
+	"version": "1.16.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon q /dev: include granular error handling for code generation failed state"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: always show build logs from last job run"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Unexpected SSO expiration on Windows due to EPERM"
+		}
+	]
+}

packages/amazonq/.changes/1.16.0.json

@@ -1,3 +1,9 @@
+## 1.16.0 2024-07-18
+
+- **Bug Fix** Amazon q /dev: include granular error handling for code generation failed state
+- **Bug Fix** Amazon Q Code Transformation: always show build logs from last job run
+- **Bug Fix** Unexpected SSO expiration on Windows due to EPERM
+
 ## 1.15.0 2024-07-15
 
 - **Bug Fix** Amazon Q Chat: Fixes a bug when the prompt input exceeds the width of the chat box it's not always wrapped correctly.

packages/amazonq/.changes/next-release/Bug Fix-9b858707-a679-437f-b2f4-c3163d80e1b7.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "Amazon Q is your generative AI-powered assistant across the software development lifecycle.",
-    "version": "1.16.0-SNAPSHOT",
+    "version": "1.17.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/.changes/next-release/Bug Fix-acc20495-b700-47cd-b3fc-d73a34c7c720.json

@@ -15,8 +15,11 @@ type samInitStateKey =
     | 'SAM_INIT_IMAGE_BOOLEAN_KEY'
     | 'SAM_INIT_ARCH_KEY'
 
+type stepFunctionsKey = 'SCRIPT_LAST_DOWNLOADED_URL' | 'CSS_LAST_DOWNLOADED_URL'
+
 type globalKey =
     | samInitStateKey
+    | stepFunctionsKey
     | 'aws.downloadPath'
     | 'aws.lastTouchedS3Folder'
     | 'aws.lastUploadedToS3Folder'

packages/amazonq/.changes/next-release/Bug Fix-e36701b2-54c6-4be5-9a9c-d82a91e00060.json

@@ -62,7 +62,7 @@ export async function activate(
  */
 export const previewStateMachineCommand = Commands.declare(
     'aws.previewStateMachine',
-    (globalState: vscode.Memento, manager: AslVisualizationManager) => async (arg?: vscode.TextEditor | vscode.Uri) => {
+    (manager: AslVisualizationManager) => async (arg?: vscode.TextEditor | vscode.Uri) => {
         try {
             arg ??= vscode.window.activeTextEditor
             const input = arg instanceof vscode.Uri ? arg : arg?.document
@@ -71,7 +71,7 @@ export const previewStateMachineCommand = Commands.declare(
                 throw new ToolkitError('No active text editor or document found')
             }
 
-            return await manager.visualizeStateMachine(globalState, input)
+            return await manager.visualizeStateMachine(input)
         } finally {
             // TODO: Consider making the metric reflect the success/failure of the above call
             telemetry.stepfunctions_previewstatemachine.emit()
@@ -88,8 +88,8 @@ async function registerStepFunctionCommands(
     const cdkVisualizationManager = new AslVisualizationCDKManager(extensionContext)
 
     extensionContext.subscriptions.push(
-        previewStateMachineCommand.register(extensionContext.globalState, visualizationManager),
-        renderCdkStateMachineGraph.register(extensionContext.globalState, cdkVisualizationManager),
+        previewStateMachineCommand.register(visualizationManager),
+        renderCdkStateMachineGraph.register(cdkVisualizationManager),
         Commands.register('aws.stepfunctions.createStateMachineFromTemplate', async () => {
             try {
                 await createStateMachineFromTemplate(extensionContext)

packages/amazonq/CHANGELOG.md

@@ -19,10 +19,7 @@ export abstract class AbstractAslVisualizationManager<T extends AslVisualization
 
     public constructor(private readonly extensionContext: vscode.ExtensionContext) {}
 
-    public abstract visualizeStateMachine(
-        globalState: vscode.Memento,
-        uri: vscode.Uri
-    ): Promise<vscode.WebviewPanel | undefined>
+    public abstract visualizeStateMachine(uri: vscode.Uri): Promise<vscode.WebviewPanel | undefined>
 
     protected pushToExtensionContextSubscriptions(visualizationDisposable: vscode.Disposable): void {
         this.extensionContext.subscriptions.push(visualizationDisposable)
@@ -57,9 +54,9 @@ export abstract class AbstractAslVisualizationManager<T extends AslVisualization
         return this.managedVisualizations.get(key)
     }
 
-    protected async updateCache(globalState: vscode.Memento, logger: Logger): Promise<void> {
+    protected async updateCache(logger: Logger): Promise<void> {
         try {
-            await this.cache.updateCache(globalState)
+            await this.cache.updateCache()
         } catch (err) {
             // So we can't update the cache, but can we use an existing on disk version.
             logger.warn('Updating State Machine Graph Visualisation assets failed, checking for fallback local cache.')