refactor: remove remaining s3 imports

Author: Hweinstock

packages/core/src/test/awsService/s3/commands/uploadFile.test.ts

@@ -5,7 +5,6 @@
 
 import assert from 'assert'
 import * as vscode from 'vscode'
-import { S3 } from 'aws-sdk'
 import {
     FileSizeBytes,
     getFilesToUpload,
@@ -20,6 +19,7 @@ import { MockOutputChannel } from '../../../mockOutputChannel'
 import { getTestWindow } from '../../../shared/vscode/window'
 import sinon from 'sinon'
 import { Upload } from '@aws-sdk/lib-storage'
+import { Bucket } from '@aws-sdk/client-s3'
 
 describe('uploadFileCommand', function () {
     const bucketName = 'bucket-name'
@@ -253,7 +253,7 @@ describe('promptUserForBucket', async function () {
     const fileLocation = vscode.Uri.file('/file.jpg')
 
     let s3: S3Client
-    let buckets: S3.Bucket[]
+    let buckets: Bucket[]
 
     const promptUndef: <T extends vscode.QuickPickItem>(opts: {
         picker: vscode.QuickPick<T>

packages/core/src/test/shared/ui/sam/bucketPrompter.test.ts

@@ -4,14 +4,14 @@
  */
 
 import assert from 'assert'
-import { S3 } from 'aws-sdk'
 import sinon from 'sinon'
 import { S3Client } from '../../../../shared/clients/s3'
 import * as SamUtilsModule from '../../../../shared/sam/utils'
 import { createBucketNamePrompter } from '../../../../shared/ui/sam/bucketPrompter'
 import { AsyncCollection } from '../../../../shared/utilities/asyncCollection'
 import { RequiredProps } from '../../../../shared/utilities/tsUtils'
 import { samDeployUrl } from '../../../../shared/constants'
+import { Bucket } from '@aws-sdk/client-s3'
 
 describe('createBucketNamePrompter', () => {
     let sandbox: sinon.SinonSandbox
@@ -32,7 +32,7 @@ describe('createBucketNamePrompter', () => {
             { Name: 'bucket1', region: 'us-east-1' },
             { Name: 'bucket2', region: 'us-east-1' },
             { Name: 'bucket3', region: 'us-east-1' },
-        ] as unknown as AsyncCollection<RequiredProps<S3.Bucket, 'Name'> & { readonly region: string }>
+        ] as unknown as AsyncCollection<RequiredProps<Bucket, 'Name'> & { readonly region: string }>
 
         const stub = sandbox.stub(s3Client, 'listBucketsIterable').callsFake(() => {
             return buckets
@@ -59,7 +59,7 @@ describe('createBucketNamePrompter', () => {
 
     it('should include no items found message if no stacks exist', () => {
         const stub = sandbox.stub(s3Client, 'listBucketsIterable').callsFake(() => {
-            return [] as unknown as AsyncCollection<RequiredProps<S3.Bucket, 'Name'> & { readonly region: string }>
+            return [] as unknown as AsyncCollection<RequiredProps<Bucket, 'Name'> & { readonly region: string }>
         })
         sandbox.stub(SamUtilsModule, 'getRecentResponse').returns(undefined) // Mock recent bucket