merge: resolve import conflicts

Hweinstock · Hweinstock · commit 438f2b5d2c9c · 2025-03-14T16:11:31.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-2ce6a8ba-dbc9-4798-92f4-db2abb4de17b.json b/packages/amazonq/.changes/next-release/Bug Fix-2ce6a8ba-dbc9-4798-92f4-db2abb4de17b.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: @Folders and @Files are missing `@` prefix in chat history"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-4116a3e0-6c6d-48bf-a991-3f872a68a121.json b/packages/amazonq/.changes/next-release/Bug Fix-4116a3e0-6c6d-48bf-a991-3f872a68a121.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: Progress indicator height is stretched"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-5bc056f9-796f-45e8-b04c-574821cb5171.json b/packages/amazonq/.changes/next-release/Bug Fix-5bc056f9-796f-45e8-b04c-574821cb5171.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: Long descriptions in context list are cut off"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-b5a4a16d-16a4-40d2-985b-0d76abe475db.json b/packages/amazonq/.changes/next-release/Bug Fix-b5a4a16d-16a4-40d2-985b-0d76abe475db.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: Animation timings are too long"
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -496,30 +496,31 @@
     "dependencies": {
         "@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-cloudformation": "<3.696.0",
         "@aws-sdk/client-cloudwatch-logs": "<3.696.0",
+        "@aws-sdk/client-codecatalyst": "<3.696.0",
         "@aws-sdk/client-cognito-identity": "<3.696.0",
         "@aws-sdk/client-docdb": "<3.696.0",
         "@aws-sdk/client-docdb-elastic": "<3.696.0",
         "@aws-sdk/client-ec2": "<3.696.0",
         "@aws-sdk/client-iam": "<3.696.0",
-        "@aws-sdk/client-s3": "<3.696.0",
-        "@aws-sdk/client-api-gateway": "<3.696.0",
-        "@aws-sdk/lib-storage": "<3.696.0",
         "@aws-sdk/client-lambda": "<3.696.0",
+        "@aws-sdk/client-s3": "<3.696.0",
         "@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-cloudcontrol": "<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",
+        "@aws-sdk/lib-storage": "<3.696.0",
         "@aws-sdk/property-provider": "<3.696.0",
         "@aws-sdk/protocol-http": "<3.696.0",
+        "@aws-sdk/s3-request-presigner": "<3.696.0",
         "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
-        "@aws-sdk/client-codecatalyst": "<3.696.0",
-        "@aws-sdk/s3-request-presigner": "<3.696.0",
-        "@aws/mynah-ui": "^4.23.1",
+        "@aws/mynah-ui": "^4.25.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/dynamicResources/commands/deleteResource.ts b/packages/core/src/dynamicResources/commands/deleteResource.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
 import { getLogger } from '../../shared/logger/logger'
 import { showConfirmationMessage, showViewLogsMessage } from '../../shared/utilities/messages'
-import { CloudControlClient } from '../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../shared/clients/cloudControl'
 import globals from '../../shared/extensionGlobals'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { millisecondsSince, Result } from '../../shared/telemetry/telemetry'
diff --git a/packages/core/src/dynamicResources/commands/saveResource.ts b/packages/core/src/dynamicResources/commands/saveResource.ts
@@ -12,7 +12,7 @@ import { compare, Operation } from 'fast-json-patch'
 import { ResourceNode } from '../explorer/nodes/resourceNode'
 import { ResourceTypeNode } from '../explorer/nodes/resourceTypeNode'
 import { AwsResourceManager } from '../awsResourceManager'
-import { CloudControlClient } from '../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../shared/clients/cloudControl'
 import { CloudControl } from 'aws-sdk'
 import globals from '../../shared/extensionGlobals'
 import { telemetry } from '../../shared/telemetry/telemetry'
diff --git a/packages/core/src/dynamicResources/explorer/nodes/resourceTypeNode.ts b/packages/core/src/dynamicResources/explorer/nodes/resourceTypeNode.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode'
 import { ChildNodeLoader, ChildNodePage } from '../../../awsexplorer/childNodeLoader'
-import { CloudControlClient } from '../../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
 import { getLogger } from '../../../shared/logger/logger'
 import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
diff --git a/packages/core/src/dynamicResources/explorer/nodes/resourcesNode.ts b/packages/core/src/dynamicResources/explorer/nodes/resourcesNode.ts
@@ -11,7 +11,7 @@ import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
 import { makeChildrenNodes } from '../../../shared/treeview/utils'
 import { toArrayAsync, updateInPlace } from '../../../shared/utilities/collectionUtils'
 import { ResourceTypeNode } from './resourceTypeNode'
-import { CloudControlClient, DefaultCloudControlClient } from '../../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
 import { memoizedGetResourceTypes, ResourceTypeMetadata } from '../../model/resources'
 import { ResourcesSettings } from '../../commands/configure'
 import { TypeSummary } from '@aws-sdk/client-cloudformation'
@@ -24,7 +24,7 @@ export class ResourcesNode extends AWSTreeNodeBase {
     public constructor(
         public readonly region: string,
         public readonly cloudFormation: CloudFormationClient = new CloudFormationClient(region),
-        private readonly cloudControl: CloudControlClient = new DefaultCloudControlClient(region),
+        private readonly cloudControl: CloudControlClient = new CloudControlClient(region),
         private readonly settings = new ResourcesSettings()
     ) {
         super(localize('AWS.explorerNode.resources.label', 'Resources'), vscode.TreeItemCollapsibleState.Collapsed)
diff --git a/packages/core/src/shared/clients/cloudControl.ts b/packages/core/src/shared/clients/cloudControl.ts
@@ -3,54 +3,59 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CloudControl } from 'aws-sdk'
+import * as CloudControl from '@aws-sdk/client-cloudcontrol'
 import globals from '../extensionGlobals'
-import { ClassToInterfaceType } from '../utilities/tsUtils'
 import { localize } from '../utilities/vsCodeUtils'
+import { ClientWrapper } from './clientWrapper'
 
-export type CloudControlClient = ClassToInterfaceType<DefaultCloudControlClient>
-export class DefaultCloudControlClient implements CloudControlClient {
-    public constructor(public readonly regionCode: string) {}
+export class CloudControlClient extends ClientWrapper<CloudControl.CloudControlClient> {
+    public constructor(regionCode: string) {
+        super(regionCode, CloudControl.CloudControlClient)
+    }
 
     public async createResource(request: CloudControl.CreateResourceInput): Promise<CloudControl.CreateResourceOutput> {
-        const client = await this.createSdkClient()
-
-        const createResponse = await client.createResource(request).promise()
+        const createResponse: CloudControl.CreateResourceOutput = await this.makeRequest(
+            CloudControl.CreateResourceCommand,
+            request
+        )
 
-        await this.pollForCompletion(client, createResponse.ProgressEvent!)
+        await this.pollForCompletion(createResponse.ProgressEvent!)
         return createResponse
     }
 
     public async deleteResource(request: CloudControl.DeleteResourceInput): Promise<void> {
-        const client = await this.createSdkClient()
-
-        const deleteResponse = await client.deleteResource(request).promise()
+        const deleteResponse: CloudControl.DeleteResourceOutput = await this.makeRequest(
+            CloudControl.DeleteResourceCommand,
+            request
+        )
 
-        await this.pollForCompletion(client, deleteResponse.ProgressEvent!)
+        await this.pollForCompletion(deleteResponse.ProgressEvent!)
     }
 
     public async listResources(request: CloudControl.ListResourcesInput): Promise<CloudControl.ListResourcesOutput> {
-        const client = await this.createSdkClient()
-
-        return await client.listResources(request).promise()
+        return await this.makeRequest(CloudControl.ListResourcesCommand, request)
     }
 
     public async getResource(request: CloudControl.GetResourceInput): Promise<CloudControl.GetResourceOutput> {
-        const client = await this.createSdkClient()
-
-        return await client.getResource(request).promise()
+        return await this.makeRequest(CloudControl.GetResourceCommand, request)
     }
 
     public async updateResource(request: CloudControl.UpdateResourceInput): Promise<void> {
-        const client = await this.createSdkClient()
+        const updateResponse: CloudControl.UpdateResourceOutput = await this.makeRequest(
+            CloudControl.UpdateResourceCommand,
+            request
+        )
 
-        const updateResponse = await client.updateResource(request).promise()
+        await this.pollForCompletion(updateResponse.ProgressEvent!)
+    }
 
-        await this.pollForCompletion(client, updateResponse.ProgressEvent!)
+    private async getResourceRequestStatus(
+        request: CloudControl.GetResourceRequestStatusInput
+    ): Promise<CloudControl.GetResourceRequestStatusOutput> {
+        return await this.makeRequest(CloudControl.GetResourceRequestStatusCommand, request)
     }
 
     private async pollForCompletion(
-        client: CloudControl,
         progressEvent: CloudControl.ProgressEvent,
         baseDelay: number = 500,
         maxRetries: number = 10
@@ -94,11 +99,9 @@ export class DefaultCloudControlClient implements CloudControlClient {
 
             if (i + 1 < maxRetries) {
                 await new Promise<void>((resolve) => globals.clock.setTimeout(resolve, baseDelay * 2 ** i))
-                const resourceRequestStatus = await client
-                    .getResourceRequestStatus({
-                        RequestToken: progressEvent.RequestToken!,
-                    })
-                    .promise()
+                const resourceRequestStatus = await this.getResourceRequestStatus({
+                    RequestToken: progressEvent.RequestToken,
+                })
                 progressEvent = resourceRequestStatus.ProgressEvent!
             }
         }
@@ -110,8 +113,4 @@ export class DefaultCloudControlClient implements CloudControlClient {
             )
         )
     }
-
-    private async createSdkClient(): Promise<CloudControl> {
-        return await globals.sdkClientBuilder.createAwsService(CloudControl, undefined, this.regionCode)
-    }
 }
diff --git a/packages/core/src/test/dynamicResources/awsResourceManager.test.ts b/packages/core/src/test/dynamicResources/awsResourceManager.test.ts
@@ -12,15 +12,15 @@ import { ResourcesNode } from '../../dynamicResources/explorer/nodes/resourcesNo
 import { ResourceNode } from '../../dynamicResources/explorer/nodes/resourceNode'
 import { ResourceTypeNode } from '../../dynamicResources/explorer/nodes/resourceTypeNode'
 import { formatResourceModel, AwsResourceManager } from '../../dynamicResources/awsResourceManager'
-import { CloudControlClient, DefaultCloudControlClient } from '../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../shared/clients/cloudControl'
 import { CloudFormationClient } from '../../shared/clients/cloudFormation'
 import { makeTemporaryToolkitFolder, readFileAsString } from '../../shared/filesystemUtilities'
 import { FakeExtensionContext } from '../fakeExtensionContext'
 import { existsSync } from 'fs' // eslint-disable-line no-restricted-imports
 import { ResourceTypeMetadata } from '../../dynamicResources/model/resources'
 import globals from '../../shared/extensionGlobals'
 import { Stub, stub } from '../utilities/stubber'
-import { CloudControl } from 'aws-sdk'
+import * as CloudControl from '@aws-sdk/client-cloudcontrol'
 import { fs } from '../../shared'
 import { DescribeTypeOutput } from '@aws-sdk/client-cloudformation'
 
@@ -49,7 +49,7 @@ describe('ResourceManager', function () {
     }
 
     beforeEach(async function () {
-        cloudControl = stub(DefaultCloudControlClient, {
+        cloudControl = stub(CloudControlClient, {
             regionCode: '',
         })
         cloudFormation = stub(CloudFormationClient, {
diff --git a/packages/core/src/test/dynamicResources/commands/deleteResource.test.ts b/packages/core/src/test/dynamicResources/commands/deleteResource.test.ts
@@ -6,13 +6,13 @@
 import * as sinon from 'sinon'
 import assert from 'assert'
 import { deleteResource } from '../../../dynamicResources/commands/deleteResource'
-import { DefaultCloudControlClient } from '../../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
 import { assertNoErrorMessages, getTestWindow } from '../../shared/vscode/window'
 
 describe('deleteResource', function () {
     const fakeType = 'fakeType'
     const fakeIdentifier = 'fakeIdentifier'
-    const cloudControl = new DefaultCloudControlClient('')
+    const cloudControl = new CloudControlClient('')
     let sandbox: sinon.SinonSandbox
 
     beforeEach(function () {
diff --git a/packages/core/src/test/dynamicResources/commands/saveResource.test.ts b/packages/core/src/test/dynamicResources/commands/saveResource.test.ts
@@ -6,7 +6,7 @@
 import assert from 'assert'
 import { createResource, updateResource } from '../../../dynamicResources/commands/saveResource'
 import { AddOperation } from 'fast-json-patch'
-import { CloudControlClient } from '../../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
 import { getTestWindow } from '../../shared/vscode/window'
 import sinon from 'sinon'
 
diff --git a/packages/core/src/test/dynamicResources/explorer/moreResourcesNode.test.ts b/packages/core/src/test/dynamicResources/explorer/moreResourcesNode.test.ts
@@ -10,7 +10,7 @@ import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resou
 import { CloudFormationClient } from '../../../shared/clients/cloudFormation'
 import { assertNodeListOnlyHasPlaceholderNode } from '../../utilities/explorerNodeAssertions'
 import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
-import { CloudControlClient } from '../../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
 import { Settings } from '../../../shared/settings'
 import { ResourcesSettings } from '../../../dynamicResources/commands/configure'
 import sinon from 'sinon'
diff --git a/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts b/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts
@@ -12,7 +12,7 @@ import {
     assertNodeListOnlyHasErrorNode,
     assertNodeListOnlyHasPlaceholderNode,
 } from '../../utilities/explorerNodeAssertions'
-import { CloudControlClient } from '../../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
 import { CloudControl } from 'aws-sdk'
 import { ResourceTypeMetadata } from '../../../dynamicResources/model/resources'
 import sinon from 'sinon'

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Amazon Q chat: @Folders and @Files are missing `@` prefix in chat history"
 +}