refactor: finish migration

Author: Hweinstock

packages/core/src/shared/clients/cloudControl.ts

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CloudControl } from 'aws-sdk'
 import * as CloudControlV3 from '@aws-sdk/client-cloudcontrol'
 import globals from '../extensionGlobals'
 import { localize } from '../utilities/vsCodeUtils'
@@ -22,36 +21,36 @@ export class CloudControlClient extends ClientWrapper<CloudControlV3.CloudContro
             request
         )
 
-        await this.pollForCompletionV3(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()
+    public async deleteResource(request: CloudControlV3.DeleteResourceInput): Promise<void> {
+        const deleteResponse: CloudControlV3.DeleteResourceOutput = await this.makeRequest(
+            CloudControlV3.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()
+    public async listResources(
+        request: CloudControlV3.ListResourcesInput
+    ): Promise<CloudControlV3.ListResourcesOutput> {
+        return await this.makeRequest(CloudControlV3.ListResourcesCommand, request)
     }
 
-    public async getResource(request: CloudControl.GetResourceInput): Promise<CloudControl.GetResourceOutput> {
-        const client = await this.createSdkClient()
-
-        return await client.getResource(request).promise()
+    public async getResource(request: CloudControlV3.GetResourceInput): Promise<CloudControlV3.GetResourceOutput> {
+        return await this.makeRequest(CloudControlV3.GetResourceCommand, request)
     }
 
-    public async updateResource(request: CloudControl.UpdateResourceInput): Promise<void> {
-        const client = await this.createSdkClient()
-
-        const updateResponse = await client.updateResource(request).promise()
+    public async updateResource(request: CloudControlV3.UpdateResourceInput): Promise<void> {
+        const updateResponse: CloudControlV3.UpdateResourceOutput = await this.makeRequest(
+            CloudControlV3.UpdateResourceCommand,
+            request
+        )
 
-        await this.pollForCompletion(client, updateResponse.ProgressEvent!)
+        await this.pollForCompletion(updateResponse.ProgressEvent!)
     }
 
     private async getResourceRequestStatus(
@@ -60,7 +59,7 @@ export class CloudControlClient extends ClientWrapper<CloudControlV3.CloudContro
         return await this.makeRequest(CloudControlV3.GetResourceRequestStatusCommand, request)
     }
 
-    private async pollForCompletionV3(
+    private async pollForCompletion(
         progressEvent: CloudControlV3.ProgressEvent,
         baseDelay: number = 500,
         maxRetries: number = 10
@@ -118,70 +117,4 @@ export class CloudControlClient extends ClientWrapper<CloudControlV3.CloudContro
             )
         )
     }
-
-    private async pollForCompletion(
-        client: CloudControl,
-        progressEvent: CloudControl.ProgressEvent,
-        baseDelay: number = 500,
-        maxRetries: number = 10
-    ): Promise<void> {
-        for (let i = 0; i < maxRetries; i++) {
-            const operationStatus = progressEvent.OperationStatus
-
-            switch (operationStatus) {
-                case 'SUCCESS':
-                    return
-                case 'FAILED':
-                    throw new Error(
-                        localize(
-                            'AWS.message.error.cloudControl.pollResourceStatus.failed',
-                            'Resource operation failed: {0} ({1})',
-                            progressEvent.StatusMessage,
-                            progressEvent.ErrorCode
-                        )
-                    )
-                case 'CANCEL_COMPLETE':
-                    throw new Error(
-                        localize(
-                            'AWS.message.error.cloudControl.pollResourceStatus.cancelled',
-                            'Resource operation cancelled: {0}',
-                            progressEvent.StatusMessage
-                        )
-                    )
-                case 'IN_PROGRESS':
-                case 'CANCEL_IN_PROGRESS':
-                case 'PENDING':
-                    break
-                default:
-                    throw new Error(
-                        localize(
-                            'AWS.message.error.cloudControl.pollResourceStatus.invalidOperationStatus',
-                            'Invalid resource operation status: {0}',
-                            operationStatus
-                        )
-                    )
-            }
-
-            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()
-                progressEvent = resourceRequestStatus.ProgressEvent!
-            }
-        }
-        throw new Error(
-            localize(
-                'AWS.message.error.cloudControl.pollResourceStatus.timeout',
-                'Failed to get terminal resource operation status for {0} before timeout. Please try again later',
-                progressEvent.Identifier
-            )
-        )
-    }
-
-    private async createSdkClient(): Promise<CloudControl> {
-        return await globals.sdkClientBuilder.createAwsService(CloudControl, undefined, this.regionCode)
-    }
 }

packages/core/src/test/dynamicResources/awsResourceManager.test.ts

@@ -20,7 +20,8 @@ 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 () {