Merge master into feature/hybridChat-local

aws-toolkit-automation · web-flow · commit 19788ffef618 · 2025-04-28T10:29:38.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/1.62.0.json b/packages/amazonq/.changes/1.62.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-25",
+	"version": "1.62.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Toast message to warn users if Developer Profile is not selected"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix users can not log in successfully with 2+ IDE instnaces open due to throttle error throw by the service"
+		}
+	]
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-489e72aa-bb0d-4964-bd84-002f25db6b5f.json b/packages/amazonq/.changes/next-release/Bug Fix-489e72aa-bb0d-4964-bd84-002f25db6b5f.json
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-8290a06f-ee3f-4235-b8af-faedb1bdfbe4.json b/packages/amazonq/.changes/next-release/Bug Fix-8290a06f-ee3f-4235-b8af-faedb1bdfbe4.json
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.62.0 2025-04-25
+
+- **Bug Fix** Toast message to warn users if Developer Profile is not selected
+- **Bug Fix** Fix users can not log in successfully with 2+ IDE instnaces open due to throttle error throw by the service
+
 ## 1.61.0 2025-04-22
 
 - **Bug Fix** Some users not signaled they needed to select a Region Profile to get features working
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.62.0-SNAPSHOT",
+    "version": "1.63.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
diff --git a/packages/core/src/codewhisperer/util/authUtil.ts b/packages/core/src/codewhisperer/util/authUtil.ts
@@ -143,9 +143,8 @@ export class AuthUtil {
 
             if (!this.isConnected()) {
                 await this.regionProfileManager.invalidateProfile(this.regionProfileManager.activeRegionProfile?.arn)
+                await this.regionProfileManager.clearCache()
             }
-
-            await this.regionProfileManager.clearCache()
         })
 
         this.regionProfileManager.onDidChangeRegionProfile(async () => {
diff --git a/packages/core/src/shared/utilities/resourceCache.ts b/packages/core/src/shared/utilities/resourceCache.ts
@@ -68,24 +68,24 @@ export abstract class CachedResource<V> {
             const duration = now() - resource.timestamp
             if (duration < this.expirationInMilli) {
                 logger.debug(
-                    `cache hit, duration(%sms) is less than expiration(%sms), returning cached value %s`,
+                    `cache hit, duration(%sms) is less than expiration(%sms), returning cached value: %s`,
                     duration,
                     this.expirationInMilli,
                     this.key
                 )
                 // release the lock
                 await this.releaseLock(resource, cachedValue)
                 return resource.result
-            } else {
-                logger.debug(
-                    `cache is stale, duration(%sms) is older than expiration(%sms), pulling latest resource %s`,
-                    duration,
-                    this.expirationInMilli,
-                    this.key
-                )
             }
+
+            logger.debug(
+                `cache is stale, duration(%sms) is older than expiration(%sms), pulling latest resource: %s`,
+                duration,
+                this.expirationInMilli,
+                this.key
+            )
         } else {
-            logger.info(`cache miss, pulling latest resource %s`, this.key)
+            logger.info(`cache miss, pulling latest resource: %s`, this.key)
         }
 
         /**
@@ -104,8 +104,8 @@ export abstract class CachedResource<V> {
                 timestamp: now(),
                 result: latest,
             }
-            logger.info(`doen loading latest resource, updating resource cache: %s`, this.key)
             await this.releaseLock(r)
+            logger.info(`loaded latest resource and updated cache: %s`, this.key)
             return latest
         } catch (e) {
             logger.error(`failed to load latest resource, releasing lock: %s`, this.key)
@@ -129,7 +129,7 @@ export abstract class CachedResource<V> {
 
         const lock = await waitUntil(async () => {
             const lock = await _acquireLock()
-            logger.debug(`try obtain resource cache read write lock for resource %s`, this.key)
+            logger.debug(`trying to acquire resource cache lock: %s`, this.key)
             if (lock) {
                 return lock
             }
diff --git a/packages/toolkit/.changes/3.56.0.json b/packages/toolkit/.changes/3.56.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-04-25",
+	"version": "3.56.0",
+	"entries": []
+}
diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.56.0 2025-04-25
+
+- Miscellaneous non-user-facing changes
+
 ## 3.55.0 2025-04-18
 
 - Miscellaneous non-user-facing changes
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.",
-    "version": "3.56.0-SNAPSHOT",
+    "version": "3.57.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

Original file line number	Diff line number	Diff line change
`@@ -143,9 +143,8 @@ export class AuthUtil {`
`143`	`143`
`144`	`144`	`if (!this.isConnected()) {`
`145`	`145`	`await this.regionProfileManager.invalidateProfile(this.regionProfileManager.activeRegionProfile?.arn)`
	`146`	`+ await this.regionProfileManager.clearCache()`
`146`	`147`	`}`
`147`		`-`
`148`		`- await this.regionProfileManager.clearCache()`
`149`	`148`	`})`
`150`	`149`
`151`	`150`	`this.regionProfileManager.onDidChangeRegionProfile(async () => {`