refactor: migrate request pre-signing

Author: Hweinstock

package-lock.json

@@ -515,6 +515,7 @@
         "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/protocol-http": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
+        "@aws-sdk/s3-request-presigner": "<3.696.0",
         "@aws/mynah-ui": "^4.23.0",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",

packages/core/package.json

@@ -22,10 +22,9 @@ export async function presignedURLCommand(node: S3FileNode): Promise<void> {
             bucketName: node.bucket.name,
             key: node.file.key,
             time: validTime * 60,
-            operation: 'getObject',
         }
 
-        const url = await s3Client.getSignedUrl(request).catch((e) => {
+        const url = await s3Client.getSignedUrlForObject(request).catch((e) => {
             throw ToolkitError.chain(
                 e,
                 'Error creating the presigned URL. Make sure you have access to the requested file.'

packages/core/src/awsService/s3/commands/presignedURL.ts

@@ -38,6 +38,9 @@ import { once } from './utilities/functionUtils'
 import { isWeb } from './extensionGlobals'
 
 export type AwsClientConstructor<C> = new (o: AwsClientOptions) => C
+export type AwsCommandConstructor<CommandInput extends object, Command extends AwsCommand> = new (
+    o: CommandInput
+) => Command
 
 // AWS-SDKv3 does not export generic types for clients so we need to build them as needed
 // https://github.com/aws/aws-sdk-js-v3/issues/5856#issuecomment-2096950979

packages/core/src/shared/awsClientBuilderV3.ts

@@ -4,7 +4,7 @@
  */
 import * as vscode from 'vscode'
 import globals from '../extensionGlobals'
-import { AwsClient, AwsClientConstructor, AwsCommand } from '../awsClientBuilderV3'
+import { AwsClient, AwsClientConstructor, AwsCommand, AwsCommandConstructor } from '../awsClientBuilderV3'
 import { PaginationConfiguration, Paginator } from '@aws-sdk/types'
 import { AsyncCollection, toCollection } from '../utilities/asyncCollection'
 
@@ -29,7 +29,7 @@ export abstract class ClientWrapper<C extends AwsClient> implements vscode.Dispo
     }
 
     protected async makeRequest<CommandInput extends object, CommandOutput extends object, Command extends AwsCommand>(
-        command: new (o: CommandInput) => Command,
+        command: AwsCommandConstructor<CommandInput, Command>,
         commandOptions: CommandInput
     ): Promise<CommandOutput> {
         return await this.getClient().send(new command(commandOptions))

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

@@ -31,6 +31,7 @@ import {
     PutObjectCommand,
     S3Client as S3ClientSDK,
 } from '@aws-sdk/client-s3'
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 import { ClientWrapper } from './clientWrapper'
 import { ToolkitError } from '../errors'
 
@@ -96,8 +97,6 @@ export interface SignedUrlRequest {
     readonly bucketName: string
     readonly key: string
     readonly time: number
-    readonly operation?: string
-    readonly body?: string
 }
 
 export interface UploadFileRequest {
@@ -306,18 +305,14 @@ export class S3Client extends ClientWrapper<S3ClientSDK> {
      *
      * @returns the string of the link to the presigned URL
      */
-    public async getSignedUrl(request: SignedUrlRequest): Promise<string> {
-        const time = request.time
-        const operation = request.operation ? request.operation : 'getObject'
-        const s3 = await this.createS3()
-
-        const url = await s3.getSignedUrlPromise(operation, {
-            Bucket: request.bucketName,
-            Key: request.key,
-            Body: request.body,
-            Expires: time,
-        })
-        return url
+    public async getSignedUrlForObject(request: SignedUrlRequest): Promise<string> {
+        return await getSignedUrl(
+            this.getClient(),
+            new GetObjectCommand({ Bucket: request.bucketName, Key: request.key }),
+            {
+                expiresIn: request.time,
+            }
+        )
     }
 
     /**

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

@@ -36,7 +36,7 @@ describe('presignedURLCommand', function () {
 
     it('calls S3 to get the URL', async function () {
         getTestWindow().onDidShowInputBox((input) => input.acceptValue('20'))
-        s3.getSignedUrl = sinon.stub().resolves(testUrl)
+        s3.getSignedUrlForObject = sinon.stub().resolves(testUrl)
 
         await presignedURLCommand(node)