Merge branch 'feature/v2-to-v3-migration' into migrate-ssm

Author: ctlai95

packages/amazonq/.changes/next-release/Bug Fix-d95abc3d-f40d-481d-bbc2-523aa572f5cd.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q support web/container environments running Ubuntu/Linux, even when the host machine is Amazon Linux 2."
+}

packages/amazonq/src/lsp/auth.ts

@@ -118,7 +118,8 @@ export class AmazonQLspAuth {
         )
         if (credentials) {
             getLogger().info(
-                `[SageMaker Debug] IAM credentials structure: accessKeyId=${credentials.accessKeyId ? 'present' : 'missing'}, secretAccessKey=${credentials.secretAccessKey ? 'present' : 'missing'}, sessionToken=${credentials.sessionToken ? 'present' : 'missing'}`
+                `[SageMaker Debug] IAM credentials structure: accessKeyId=${credentials.accessKeyId ? 'present' : 'missing'}, secretAccessKey=${credentials.secretAccessKey ? 'present' : 'missing'}, sessionToken=${credentials.sessionToken ? 'present' : 'missing'},  expiration=${credentials.expiration} ? 'pr
+esent' : 'missing'}`
             )
         }
 
@@ -163,6 +164,7 @@ export class AmazonQLspAuth {
             accessKeyId: credentials.accessKeyId,
             secretAccessKey: credentials.secretAccessKey,
             sessionToken: credentials.sessionToken,
+            expiration: credentials.expiration,
         }
         const payload = new TextEncoder().encode(JSON.stringify({ data: iamCredentials }))
 

packages/core/src/auth/credentials/store.ts

@@ -95,14 +95,14 @@ export class CredentialsStore {
         credentialsId: CredentialsId,
         credentialsProvider: CredentialsProvider
     ): Promise<CachedCredentials> {
+        getLogger().debug(`store: Fetch new credentials from provider with id: ${asString(credentialsId)}`)
         const credentials = {
             credentials: await credentialsProvider.getCredentials(),
             credentialsHashCode: credentialsProvider.getHashCode(),
             endpointUrl: credentialsProvider.getEndpointUrl?.(),
         }
 
         this.credentialsCache[asString(credentialsId)] = credentials
-
         return credentials
     }
 }

packages/core/src/codewhisperer/client/codewhisperer.ts

@@ -227,6 +227,7 @@ export class DefaultCodeWhispererClient {
                 product: 'CodeWhisperer', // TODO: update this?
                 clientId: getClientId(globals.globalState),
                 ideVersion: extensionVersion,
+                pluginVersion: extensionVersion,
             },
             profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
         }