refactor: finish migration

Author: Hweinstock

packages/core/src/awsService/cloudWatchLogs/commands/viewLogStream.ts

@@ -11,7 +11,7 @@ import * as picker from '../../../shared/ui/picker'
 import { MultiStepWizard, WIZARD_RETRY, WIZARD_TERMINATE, WizardStep } from '../../../shared/wizards/multiStepWizard'
 import { LogGroupNode } from '../explorer/logGroupNode'
 import { CloudWatchLogs } from 'aws-sdk'
-
+import * as CloudWatchLogsV3 from '@aws-sdk/client-cloudwatch-logs'
 import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient'
 import { getPaginatedAwsCallIter, IteratorTransformer } from '../../../shared/utilities/collectionUtils'
 import {
@@ -83,7 +83,7 @@ export class DefaultSelectLogStreamWizardContext implements SelectLogStreamWizar
 
     public async pickLogStream(): Promise<LogSearchChoice> {
         const client = new CloudWatchLogsClient(this.regionCode)
-        const request: CloudWatchLogs.DescribeLogStreamsRequest = {
+        const request: CloudWatchLogsV3.DescribeLogStreamsRequest = {
             logGroupName: this.logGroupName,
             orderBy: 'LastEventTime',
             descending: true,

packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts

@@ -8,7 +8,7 @@ import { createCommonButtons } from '../../../shared/ui/buttons'
 import { createInputBox, InputBoxPrompter } from '../../../shared/ui/inputPrompter'
 import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../../../shared/ui/pickerPrompter'
 import { pageableToCollection } from '../../../shared/utilities/collectionUtils'
-import { CloudWatchLogs } from 'aws-sdk'
+import * as CloudWatchLogs from '@aws-sdk/client-cloudwatch-logs'
 import { isValidResponse, StepEstimator } from '../../../shared/wizards/wizard'
 import { isNonNullable } from '../../../shared/utilities/tsUtils'
 import {

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

@@ -3,22 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CloudWatchLogs } from 'aws-sdk'
 import * as CloudWatchLogsV3 from '@aws-sdk/client-cloudwatch-logs'
-import globals from '../extensionGlobals'
 import { ClientWrapper } from './clientWrapper'
 
+// TODO: each consumer of CWL client implements their own pagination. This should be done here.
 export class CloudWatchLogsClient extends ClientWrapper<CloudWatchLogsV3.CloudWatchLogsClient> {
     public constructor(regionCode: string) {
         super(regionCode, CloudWatchLogsV3.CloudWatchLogsClient)
     }
 
     public async *describeLogGroups(
-        request: CloudWatchLogs.DescribeLogGroupsRequest = {}
-    ): AsyncIterableIterator<CloudWatchLogs.LogGroup> {
-        const sdkClient = await this.createSdkClient()
+        request: CloudWatchLogsV3.DescribeLogGroupsRequest = {}
+    ): AsyncIterableIterator<CloudWatchLogsV3.LogGroup> {
         do {
-            const response = await this.invokeDescribeLogGroups(request, sdkClient)
+            const response: CloudWatchLogsV3.DescribeLogGroupsResponse = await this.makeRequest(
+                CloudWatchLogsV3.DescribeLogGroupsCommand,
+                request
+            )
             if (response.logGroups) {
                 yield* response.logGroups
             }
@@ -27,37 +28,20 @@ export class CloudWatchLogsClient extends ClientWrapper<CloudWatchLogsV3.CloudWa
     }
 
     public async describeLogStreams(
-        request: CloudWatchLogs.DescribeLogStreamsRequest
-    ): Promise<CloudWatchLogs.DescribeLogStreamsResponse> {
-        const sdkClient = await this.createSdkClient()
-
-        return sdkClient.describeLogStreams(request).promise()
+        request: CloudWatchLogsV3.DescribeLogStreamsRequest
+    ): Promise<CloudWatchLogsV3.DescribeLogStreamsResponse> {
+        return await this.makeRequest(CloudWatchLogsV3.DescribeLogStreamsCommand, request)
     }
 
     public async getLogEvents(
-        request: CloudWatchLogs.GetLogEventsRequest
-    ): Promise<CloudWatchLogs.GetLogEventsResponse> {
-        const sdkClient = await this.createSdkClient()
-
-        return sdkClient.getLogEvents(request).promise()
+        request: CloudWatchLogsV3.GetLogEventsRequest
+    ): Promise<CloudWatchLogsV3.GetLogEventsResponse> {
+        return await this.makeRequest(CloudWatchLogsV3.GetLogEventsCommand, request)
     }
 
     public async filterLogEvents(
-        request: CloudWatchLogs.FilterLogEventsRequest
-    ): Promise<CloudWatchLogs.FilterLogEventsResponse> {
-        const sdkClient = await this.createSdkClient()
-
-        return sdkClient.filterLogEvents(request).promise()
-    }
-
-    protected async invokeDescribeLogGroups(
-        request: CloudWatchLogs.DescribeLogGroupsRequest,
-        sdkClient: CloudWatchLogs
-    ): Promise<CloudWatchLogs.DescribeLogGroupsResponse> {
-        return sdkClient.describeLogGroups(request).promise()
-    }
-
-    protected async createSdkClient(): Promise<CloudWatchLogs> {
-        return await globals.sdkClientBuilder.createAwsService(CloudWatchLogs, undefined, this.regionCode)
+        request: CloudWatchLogsV3.FilterLogEventsRequest
+    ): Promise<CloudWatchLogsV3.FilterLogEventsResponse> {
+        return await this.makeRequest(CloudWatchLogsV3.FilterLogEventsCommand, request)
     }
 }