Merge master into feature/q-utg

Author: aws-toolkit-automation

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Code Review: Fixed a bug where issues are double counted in the Q chat"
+}

packages/amazonq/.changes/next-release/Bug Fix-a24316fe-1ff9-44e4-9d5c-6b78aa7f0d1e.json

@@ -510,6 +510,7 @@
         "@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",

packages/core/package.json

@@ -74,11 +74,13 @@ export async function listScanResults(
     for (const [key, issues] of codeScanIssueMap.entries()) {
         // Project path example: /Users/username/project
         // Key example: project/src/main/java/com/example/App.java
+        const mappedProjectPaths: Set<string> = new Set()
         for (const projectPath of projectPaths) {
             // We need to remove the project path from the key to get the absolute path to the file
             // Do not use .. in between because there could be multiple project paths in the same parent dir.
             const filePath = path.join(projectPath, key.split('/').slice(1).join('/'))
             if (existsSync(filePath) && statSync(filePath).isFile()) {
+                mappedProjectPaths.add(filePath)
                 const document = await vscode.workspace.openTextDocument(filePath)
                 const aggregatedCodeScanIssue: AggregatedCodeScanIssue = {
                     filePath: filePath,
@@ -88,7 +90,11 @@ export async function listScanResults(
             }
         }
         const maybeAbsolutePath = `/${key}`
-        if (existsSync(maybeAbsolutePath) && statSync(maybeAbsolutePath).isFile()) {
+        if (
+            !mappedProjectPaths.has(maybeAbsolutePath) &&
+            existsSync(maybeAbsolutePath) &&
+            statSync(maybeAbsolutePath).isFile()
+        ) {
             const document = await vscode.workspace.openTextDocument(maybeAbsolutePath)
             const aggregatedCodeScanIssue: AggregatedCodeScanIssue = {
                 filePath: maybeAbsolutePath,

packages/core/src/codewhisperer/service/securityScanHandler.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'

packages/core/src/dynamicResources/commands/deleteResource.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'

packages/core/src/dynamicResources/commands/saveResource.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'

packages/core/src/dynamicResources/explorer/nodes/resourceTypeNode.ts

@@ -12,7 +12,7 @@ import { makeChildrenNodes } from '../../../shared/treeview/utils'
 import { toArrayAsync, updateInPlace } from '../../../shared/utilities/collectionUtils'
 import { ResourceTypeNode } from './resourceTypeNode'
 import { CloudFormation } from 'aws-sdk'
-import { CloudControlClient, DefaultCloudControlClient } from '../../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
 import { memoizedGetResourceTypes, ResourceTypeMetadata } from '../../model/resources'
 import { ResourcesSettings } from '../../commands/configure'
 
@@ -24,7 +24,7 @@ export class ResourcesNode extends AWSTreeNodeBase {
     public constructor(
         public readonly region: string,
         public readonly cloudFormation: CloudFormationClient = new DefaultCloudFormationClient(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)

packages/core/src/dynamicResources/explorer/nodes/resourcesNode.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)
-    }
 }

packages/core/src/shared/clients/cloudControlClient.ts renamed to packages/core/src/shared/clients/cloudControl.ts

@@ -12,15 +12,16 @@ 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, DefaultCloudFormationClient } from '../../shared/clients/cloudFormationClient'
 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, CloudFormation } from 'aws-sdk'
+import { CloudFormation } from 'aws-sdk'
+import * as CloudControl from '@aws-sdk/client-cloudcontrol'
 import { fs } from '../../shared'
 
 describe('ResourceManager', function () {
@@ -48,7 +49,7 @@ describe('ResourceManager', function () {
     }
 
     beforeEach(async function () {
-        cloudControl = stub(DefaultCloudControlClient, {
+        cloudControl = stub(CloudControlClient, {
             regionCode: '',
         })
         cloudFormation = stub(DefaultCloudFormationClient, {