refactor: remove other imports of cwl sdkv2

Author: Hweinstock

packages/core/src/awsService/apprunner/explorer/apprunnerServiceNode.ts

@@ -10,13 +10,13 @@ import { AppRunnerNode } from './apprunnerNode'
 
 import { toArrayAsync, toMap } from '../../../shared/utilities/collectionUtils'
 import { CloudWatchLogsBase } from '../../../awsService/cloudWatchLogs/explorer/cloudWatchLogsNode'
-import { CloudWatchLogs } from 'aws-sdk'
 import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
 
 import * as nls from 'vscode-nls'
 import { getLogger } from '../../../shared/logger/logger'
 import { getIcon } from '../../../shared/icons'
 import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient'
+import { LogGroup } from '@aws-sdk/client-cloudwatch-logs'
 const localize = nls.loadMessageBundle()
 
 const contextBase = 'awsAppRunnerServiceNode'
@@ -63,7 +63,7 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         return `https://${this._info.ServiceUrl}`
     }
 
-    protected async getLogGroups(): Promise<Map<string, CloudWatchLogs.LogGroup>> {
+    protected async getLogGroups(): Promise<Map<string, LogGroup>> {
         return toMap(
             await toArrayAsync(
                 this.cloudwatchClient.describeLogGroups({

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

@@ -21,7 +21,6 @@ import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClie
 import { CancellationError } from '../../../shared/utilities/timeoutUtils'
 import { getLogger } from '../../../shared/logger/logger'
 import { TimeFilterResponse, TimeFilterSubmenu } from '../timeFilterSubmenu'
-import { CloudWatchLogs } from 'aws-sdk'
 import { ExtendedInputBoxOptions, InputBox, InputBoxPrompter } from '../../../shared/ui/inputPrompter'
 import { RegionSubmenu, RegionSubmenuResponse } from '../../../shared/ui/common/regionSubmenu'
 import { truncate } from '../../../shared/utilities/textUtilities'
@@ -30,6 +29,7 @@ import { PromptResult } from '../../../shared/ui/prompter'
 import { ToolkitError } from '../../../shared/errors'
 import { Messages } from '../../../shared/utilities/messages'
 import { showFile } from '../../../shared/utilities/textDocumentUtilities'
+import { LogGroup } from '@aws-sdk/client-cloudwatch-logs'
 
 const localize = nls.loadMessageBundle()
 
@@ -119,7 +119,7 @@ async function getLogGroupsFromRegion(regionCode: string): Promise<DataQuickPick
     return options
 }
 
-async function logGroupsToArray(logGroups: AsyncIterableIterator<CloudWatchLogs.LogGroup>): Promise<string[]> {
+async function logGroupsToArray(logGroups: AsyncIterableIterator<LogGroup>): Promise<string[]> {
     const logGroupsArray = []
     for await (const logGroupObject of logGroups) {
         logGroupObject.logGroupName && logGroupsArray.push(logGroupObject.logGroupName)

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

@@ -10,7 +10,6 @@ import * as vscode from 'vscode'
 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'
@@ -181,7 +180,7 @@ export class DefaultSelectLogStreamWizardContext implements SelectLogStreamWizar
 }
 
 export function convertDescribeLogToQuickPickItems(
-    response: CloudWatchLogs.DescribeLogStreamsResponse
+    response: CloudWatchLogsV3.DescribeLogStreamsResponse
 ): vscode.QuickPickItem[] {
     return (response.logStreams ?? []).map<vscode.QuickPickItem>((stream) => ({
         label: stream.logStreamName!,

packages/core/src/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.ts

@@ -6,7 +6,6 @@
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
-import { CloudWatchLogs } from 'aws-sdk'
 import * as vscode from 'vscode'
 
 import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient'
@@ -16,6 +15,7 @@ import { toMap, updateInPlace, toArrayAsync } from '../../../shared/utilities/co
 import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
 import { makeChildrenNodes } from '../../../shared/treeview/utils'
 import { LogGroupNode } from './logGroupNode'
+import { LogGroup } from '@aws-sdk/client-cloudwatch-logs'
 
 export abstract class CloudWatchLogsBase extends AWSTreeNodeBase {
     protected readonly logGroupNodes: Map<string, LogGroupNode>
@@ -30,7 +30,7 @@ export abstract class CloudWatchLogsBase extends AWSTreeNodeBase {
         this.logGroupNodes = new Map<string, LogGroupNode>()
     }
 
-    protected abstract getLogGroups(client: CloudWatchLogsClient): Promise<Map<string, CloudWatchLogs.LogGroup>>
+    protected abstract getLogGroups(client: CloudWatchLogsClient): Promise<Map<string, LogGroup>>
 
     public override async getChildren(): Promise<AWSTreeNodeBase[]> {
         return await makeChildrenNodes({
@@ -63,7 +63,7 @@ export class CloudWatchLogsNode extends CloudWatchLogsBase {
         this.contextValue = 'awsCloudWatchLogParentNode'
     }
 
-    protected async getLogGroups(client: CloudWatchLogsClient): Promise<Map<string, CloudWatchLogs.LogGroup>> {
+    protected async getLogGroups(client: CloudWatchLogsClient): Promise<Map<string, LogGroup>> {
         return toMap(await toArrayAsync(client.describeLogGroups()), (configuration) => configuration.logGroupName)
     }
 }

packages/core/src/awsService/cloudWatchLogs/explorer/logGroupNode.ts

@@ -3,19 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CloudWatchLogs } from 'aws-sdk'
 import * as os from 'os'
 import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
 import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { getIcon } from '../../../shared/icons'
 import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { LogGroup } from '@aws-sdk/client-cloudwatch-logs'
 
 export const contextValueCloudwatchLog = 'awsCloudWatchLogNode'
 
 export class LogGroupNode extends AWSTreeNodeBase implements AWSResourceNode {
     public constructor(
         public override readonly regionCode: string,
-        public logGroup: CloudWatchLogs.LogGroup
+        public logGroup: LogGroup
     ) {
         super('')
         this.update(logGroup)
@@ -28,7 +28,7 @@ export class LogGroupNode extends AWSTreeNodeBase implements AWSResourceNode {
         }
     }
 
-    public update(logGroup: CloudWatchLogs.LogGroup): void {
+    public update(logGroup: LogGroup): void {
         this.logGroup = logGroup
         this.label = this.logGroup.logGroupName || ''
         this.tooltip = `${this.logGroup.logGroupName}${os.EOL}${this.logGroup.arn}`

packages/core/src/awsService/cloudWatchLogs/registry/logDataRegistry.ts

@@ -4,13 +4,13 @@
  */
 
 import * as vscode from 'vscode'
-import { CloudWatchLogs } from 'aws-sdk'
 import { CloudWatchLogsSettings, uriToKey, msgKey, cwlUriSchema } from '../cloudWatchLogsUtils'
 import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient'
 import { waitTimeout } from '../../../shared/utilities/timeoutUtils'
 import { Messages } from '../../../shared/utilities/messages'
 import { pageableToCollection } from '../../../shared/utilities/collectionUtils'
 import { Settings } from '../../../shared/settings'
+import * as CloudWatchLogs from '@aws-sdk/client-cloudwatch-logs'
 // TODO: Add debug logging statements
 
 /** Uri as a string */
@@ -301,9 +301,9 @@ export type CloudWatchLogsParameters = {
 }
 
 export type CloudWatchLogsResponse = {
-    events: CloudWatchLogs.FilteredLogEvents
-    nextForwardToken?: CloudWatchLogs.NextToken
-    nextBackwardToken?: CloudWatchLogs.NextToken
+    events: CloudWatchLogs.FilteredLogEvent[]
+    nextForwardToken?: string
+    nextBackwardToken?: string
 }
 
 export type CloudWatchLogsAction = (
@@ -323,10 +323,10 @@ export class CloudWatchLogsData {
     logGroupInfo!: CloudWatchLogsGroupInfo
     retrieveLogsFunction!: CloudWatchLogsAction
     next?: {
-        token: CloudWatchLogs.NextToken
+        token: string
     }
     previous?: {
-        token: CloudWatchLogs.NextToken
+        token: string
     }
     busy: boolean = false
 }

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

@@ -6,7 +6,6 @@
 import * as CloudWatchLogsV3 from '@aws-sdk/client-cloudwatch-logs'
 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)

packages/core/src/test/awsService/cloudWatchLogs/explorer/logGroupNode.test.ts

@@ -4,13 +4,13 @@
  */
 
 import assert from 'assert'
-import { CloudWatchLogs } from 'aws-sdk'
 import * as os from 'os'
 import { LogGroupNode } from '../../../../awsService/cloudWatchLogs/explorer/logGroupNode'
+import { LogGroup } from '@aws-sdk/client-cloudwatch-logs'
 
 describe('LogGroupNode', function () {
     let testNode: LogGroupNode
-    let fakeLogGroup: CloudWatchLogs.LogGroup
+    let fakeLogGroup: LogGroup
 
     before(function () {
         fakeLogGroup = {

packages/core/src/test/awsService/cloudWatchLogs/registry/logDataRegistry.test.ts

@@ -25,7 +25,6 @@ import {
     testLogData,
     unregisteredData,
 } from '../utils.test'
-import { CloudWatchLogs } from 'aws-sdk'
 import { FilteredLogEvents } from 'aws-sdk/clients/cloudwatchlogs'
 import { formatDateTimestamp } from '../../../../shared/datetime'
 
@@ -130,7 +129,7 @@ describe('LogDataRegistry', async function () {
         const pageToken2 = 'page2Token'
 
         function createCwlEvents(id: string, count: number): FilteredLogEvents {
-            let events: CloudWatchLogs.FilteredLogEvents = []
+            let events: FilteredLogEvents = []
             for (let i = 0; i < count; i++) {
                 events = events.concat({ message: `message-${id}`, logStreamName: `stream-${id}` })
             }
@@ -141,7 +140,7 @@ describe('LogDataRegistry', async function () {
             return async function (
                 logGroupInfo: CloudWatchLogsGroupInfo,
                 parameters: CloudWatchLogsParameters,
-                nextToken?: CloudWatchLogs.NextToken
+                nextToken?: string
             ) {
                 return getSimulatedCwlResponse(nextToken, isPage1Empty)
             }
@@ -153,10 +152,7 @@ describe('LogDataRegistry', async function () {
          * @param isPage1Empty A flag to indicate if Page 1 should have data/isn't the tail.
          * @returns
          */
-        function getSimulatedCwlResponse(
-            token: CloudWatchLogs.NextToken | undefined,
-            isPage1Empty: boolean
-        ): CloudWatchLogsResponse {
+        function getSimulatedCwlResponse(token: string | undefined, isPage1Empty: boolean): CloudWatchLogsResponse {
             switch (token) {
                 case pageToken1:
                     if (isPage1Empty) {

packages/core/src/test/awsService/cloudWatchLogs/utils.test.ts

@@ -4,7 +4,6 @@
  */
 
 import assert from 'assert'
-import { CloudWatchLogs } from 'aws-sdk'
 import * as vscode from 'vscode'
 import { cwlUriSchema, uriToKey } from '../../../awsService/cloudWatchLogs/cloudWatchLogsUtils'
 import {
@@ -26,7 +25,7 @@ export const backwardToken = 'backward'
 export async function returnPaginatedEvents(
     logGroupInfo: CloudWatchLogsGroupInfo,
     parameters: CloudWatchLogsParameters,
-    nextToken?: CloudWatchLogs.NextToken
+    nextToken?: string
 ) {
     switch (nextToken) {
         case forwardToken:
@@ -45,7 +44,7 @@ export async function returnPaginatedEvents(
 export async function returnNonEmptyPaginatedEvents(
     logGroupInfo: CloudWatchLogsGroupInfo,
     parameters: CloudWatchLogsParameters,
-    nextToken?: CloudWatchLogs.NextToken
+    nextToken?: string
 ) {
     const result = await returnPaginatedEvents(logGroupInfo, parameters, nextToken)
     if (result.events.length === 0) {