updates based off feedback

cdklabs · Aug 29, 2024 · 463f0c5 · 463f0c5
1 parent 004e854
commit 463f0c5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/lib/aws.ts b/lib/aws.ts
@@ -21,7 +21,7 @@ export interface IAws {
   s3Client(options: ClientOptions): Promise<S3Client>;
   ecrClient(options: ClientOptions): Promise<ECRClient>;
   secretsManagerClient(options: ClientOptions): Promise<SecretsManagerClient>;
-  upload(params: PutObjectCommandInput, options: ClientOptions): Promise<CompleteMultipartUploadCommandOutput>
+  upload(params: PutObjectCommandInput, options?: ClientOptions): Promise<CompleteMultipartUploadCommandOutput>;
 }
 
 export interface ClientOptions {
@@ -82,7 +82,7 @@ export class DefaultAwsClient implements IAws {
     return new S3Client(await this.awsOptions(options));
   }
 
-  public async upload(params: PutObjectCommandInput, options: ClientOptions): Promise<CompleteMultipartUploadCommandOutput> {
+  public async upload(params: PutObjectCommandInput, options: ClientOptions = {}): Promise<CompleteMultipartUploadCommandOutput> {
     try {
       const upload = new Upload({
         client: await this.s3Client(options),

diff --git a/lib/private/handlers/files.ts b/lib/private/handlers/files.ts
@@ -131,7 +131,7 @@ export class FileAssetHandler implements IAssetHandler {
       paramsEncryption
     );
 
-    await this.host.aws.upload(params, {});
+    await this.host.aws.upload(params);
   }
 
   private async packageFile(source: FileSource): Promise<PackagedFileAsset> {

diff --git a/test/files.test.ts b/test/files.test.ts
@@ -177,8 +177,7 @@ test('upload with server side encryption AES256 header', async () => {
       Key: 'some_key',
       ContentType: 'application/octet-stream',
       ServerSideEncryption: 'AES256',
-    }),
-    {}
+    })
   );
 
   // We'll just have to assume the contents are correct
@@ -211,8 +210,7 @@ test('upload with server side encryption aws:kms header and key id', async () =>
       ContentType: 'application/octet-stream',
       ServerSideEncryption: 'aws:kms',
       SSEKMSKeyId: 'the-key-id',
-    }),
-    {}
+    })
   );
 
   // We'll just have to assume the contents are correct
@@ -235,15 +233,13 @@ test('no server side encryption header if access denied for bucket encryption',
   expect(upload).toHaveBeenCalledWith(
     expect.not.objectContaining({
       ServerSideEncryption: 'aws:kms',
-    }),
-    {}
+    })
   );
 
   expect(upload).toHaveBeenCalledWith(
     expect.not.objectContaining({
       ServerSideEncryption: 'AES256',
-    }),
-    {}
+    })
   );
 });
 
@@ -260,17 +256,15 @@ test('correctly looks up content type', async () => {
       Bucket: 'some_bucket',
       Key: 'some_key.txt',
       ContentType: 'text/plain',
-    }),
-    {}
+    })
   );
 
   expect(upload).toHaveBeenCalledWith(
     expect.objectContaining({
       Bucket: 'some_bucket',
       Key: 'some_key.png',
       ContentType: 'image/png',
-    }),
-    {}
+    })
   );
 
   // We'll just have to assume the contents are correct
@@ -287,8 +281,7 @@ test('upload file if new (list returns no key)', async () => {
     expect.objectContaining({
       Bucket: 'some_bucket',
       Key: 'some_key',
-    }),
-    {}
+    })
   );
 
   // We'll just have to assume the contents are correct