@directus/storage-driver-s3 12.0.12 → 12.1.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { ObjectCannedACL, ServerSideEncryption } from "@aws-sdk/client-s3";
 import { Readable } from "node:stream";
+import { ObjectCannedACL, ServerSideEncryption } from "@aws-sdk/client-s3";
 import { TusDriver } from "@directus/storage";
 import { ChunkedUploadContext, ReadOptions } from "@directus/types";
 
@@ -11,6 +11,7 @@ type DriverS3Config = {
   bucket: string;
   acl?: ObjectCannedACL;
   serverSideEncryption?: ServerSideEncryption;
+  serverSideEncryptionKmsKeyId?: string;
   endpoint?: string;
   region?: string;
   forcePathStyle?: boolean;
@@ -22,6 +23,7 @@ type DriverS3Config = {
   maxSockets?: number;
   keepAlive?: boolean;
 };
+declare const kmsKeyIdCheck: ServerSideEncryption[];
 declare class DriverS3 implements TusDriver {
   private config;
   private readonly client;
@@ -57,4 +59,4 @@ declare class DriverS3 implements TusDriver {
   private calcOptimalPartSize;
 }
 //#endregion
-export { DriverS3, DriverS3 as default, DriverS3Config };
+export { DriverS3, DriverS3 as default, DriverS3Config, kmsKeyIdCheck };

package/dist/index.js

@@ -1,4 +1,10 @@
-import { AbortMultipartUploadCommand, CompleteMultipartUploadCommand, CopyObjectCommand, CreateMultipartUploadCommand, DeleteObjectCommand, DeleteObjectsCommand, GetObjectCommand, HeadObjectCommand, ListObjectsV2Command, ListPartsCommand, S3Client, UploadPartCommand } from "@aws-sdk/client-s3";
+import fs, { promises } from "node:fs";
+import { Agent } from "node:http";
+import { Agent as Agent$1 } from "node:https";
+import os from "node:os";
+import { join } from "node:path";
+import { promises as promises$1 } from "node:stream";
+import { AbortMultipartUploadCommand, CompleteMultipartUploadCommand, CopyObjectCommand, CreateMultipartUploadCommand, DeleteObjectCommand, DeleteObjectsCommand, GetObjectCommand, HeadObjectCommand, ListObjectsV2Command, ListPartsCommand, S3Client, ServerSideEncryption, UploadPartCommand } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { normalizePath } from "@directus/utils";
 import { isReadableStream } from "@directus/utils/node";
@@ -6,14 +12,9 @@ import { Semaphore } from "@shopify/semaphore";
 import { NodeHttpHandler } from "@smithy/node-http-handler";
 import { ERRORS, StreamSplitter, TUS_RESUMABLE } from "@tus/utils";
 import ms from "ms";
-import fs, { promises } from "node:fs";
-import { Agent } from "node:http";
-import { Agent as Agent$1 } from "node:https";
-import os from "node:os";
-import { join } from "node:path";
-import { promises as promises$1 } from "node:stream";
 
 //#region src/index.ts
+const kmsKeyIdCheck = [ServerSideEncryption.aws_kms, ServerSideEncryption.aws_kms_dsse];
 var DriverS3 = class {
 	config;
 	client;
@@ -106,7 +107,10 @@ var DriverS3 = class {
 			Bucket: this.config.bucket,
 			CopySource: `/${this.config.bucket}/${this.fullPath(src)}`
 		};
-		if (this.config.serverSideEncryption) params.ServerSideEncryption = this.config.serverSideEncryption;
+		if (this.config.serverSideEncryption) {
+			params.ServerSideEncryption = this.config.serverSideEncryption;
+			if (kmsKeyIdCheck.includes(this.config.serverSideEncryption) && this.config.serverSideEncryptionKmsKeyId) params.SSEKMSKeyId = this.config.serverSideEncryptionKmsKeyId;
+		}
 		if (this.config.acl) params.ACL = this.config.acl;
 		await this.client.send(new CopyObjectCommand(params));
 	}
@@ -118,7 +122,10 @@ var DriverS3 = class {
 		};
 		if (type) params.ContentType = type;
 		if (this.config.acl) params.ACL = this.config.acl;
-		if (this.config.serverSideEncryption) params.ServerSideEncryption = this.config.serverSideEncryption;
+		if (this.config.serverSideEncryption) {
+			params.ServerSideEncryption = this.config.serverSideEncryption;
+			if (kmsKeyIdCheck.includes(this.config.serverSideEncryption) && this.config.serverSideEncryptionKmsKeyId) params.SSEKMSKeyId = this.config.serverSideEncryptionKmsKeyId;
+		}
 		await new Upload({
 			client: this.client,
 			params
@@ -158,13 +165,18 @@ var DriverS3 = class {
 		];
 	}
 	async createChunkedUpload(filepath, context) {
-		const command = new CreateMultipartUploadCommand({
+		const params = {
 			Bucket: this.config.bucket,
 			Key: this.fullPath(filepath),
 			Metadata: { "tus-version": TUS_RESUMABLE },
 			...context.metadata?.["contentType"] ? { ContentType: context.metadata["contentType"] } : {},
 			...context.metadata?.["cacheControl"] ? { CacheControl: context.metadata["cacheControl"] } : {}
-		});
+		};
+		if (this.config.serverSideEncryption) {
+			params.ServerSideEncryption = this.config.serverSideEncryption;
+			if (kmsKeyIdCheck.includes(this.config.serverSideEncryption) && this.config.serverSideEncryptionKmsKeyId) params.SSEKMSKeyId = this.config.serverSideEncryptionKmsKeyId;
+		}
+		const command = new CreateMultipartUploadCommand(params);
 		const res = await this.client.send(command);
 		context.metadata["upload-id"] = res.UploadId;
 		return context;
@@ -318,4 +330,4 @@ var DriverS3 = class {
 var src_default = DriverS3;
 
 //#endregion
-export { DriverS3, src_default as default };
+export { DriverS3, src_default as default, kmsKeyIdCheck };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/storage-driver-s3",
-  "version": "12.0.12",
+  "version": "12.1.0",
   "description": "S3 file storage abstraction for `@directus/storage`",
   "homepage": "https://directus.io",
   "repository": {
@@ -28,7 +28,7 @@
     "@tus/utils": "0.6.0",
     "ms": "2.1.3",
     "@directus/storage": "12.0.3",
-    "@directus/utils": "13.0.13"
+    "@directus/utils": "13.1.1"
   },
   "devDependencies": {
     "@directus/tsconfig": "3.0.0",
@@ -38,7 +38,7 @@
     "tsdown": "0.15.11",
     "typescript": "5.9.3",
     "vitest": "3.2.4",
-    "@directus/types": "13.4.0"
+    "@directus/types": "14.0.0"
   },
   "scripts": {
     "build": "tsdown src/index.ts --dts",