From 3ce0205980cb1a5e091b502301741e838e6cb01a Mon Sep 17 00:00:00 2001 From: Sandros94 Date: Wed, 12 Feb 2025 21:07:34 +0100 Subject: [PATCH 1/3] fix(s3): missing `getInstance` --- src/drivers/s3.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/drivers/s3.ts b/src/drivers/s3.ts index 22efd6ce9..e4c295c81 100644 --- a/src/drivers/s3.ts +++ b/src/drivers/s3.ts @@ -162,6 +162,7 @@ export default defineDriver((options: S3DriverOptions) => { return { name: DRIVER_NAME, options, + getInstance: getAwsClient, getItem(key) { return getObject(key).then((res) => (res ? res.text() : null)); }, From 8c3f59e3f088702e5e14b283a0ace6f175832c07 Mon Sep 17 00:00:00 2001 From: Sandros94 Date: Wed, 19 Feb 2025 19:09:49 +0100 Subject: [PATCH 2/3] test(s3): add `getInstance` --- test/drivers/s3.test.ts | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/test/drivers/s3.test.ts b/test/drivers/s3.test.ts index e507a9df4..c4d5da4c7 100644 --- a/test/drivers/s3.test.ts +++ b/test/drivers/s3.test.ts @@ -12,15 +12,16 @@ const region = process.env.VITE_S3_REGION; describe.skipIf( !accessKeyId || !secretAccessKey || !bucket || !endpoint || !region )("drivers: s3", () => { + const driver = s3Driver({ + accessKeyId: accessKeyId!, + secretAccessKey: secretAccessKey!, + bucket: bucket!, + endpoint: endpoint!, + region: region!, + }); + testDriver({ - driver: () => - s3Driver({ - accessKeyId: accessKeyId!, - secretAccessKey: secretAccessKey!, - bucket: bucket!, - endpoint: endpoint!, - region: region!, - }), + driver, additionalTests(ctx) { it("can access directly with / separator", async () => { await ctx.storage.set("foo/bar:baz", "ok"); @@ -40,6 +41,10 @@ describe.skipIf( expect(response.status).toBe(200); expect(await response.text()).toBe("ok"); }); + + it("exposes instance", () => { + expect(driver.getInstance?.()).toBeInstanceOf(AwsClient); + }); }, }); }); From a87d1f1d4dd0c10b538d29b6a2a1511fe9083a6a Mon Sep 17 00:00:00 2001 From: Sandros94 Date: Thu, 20 Feb 2025 16:24:20 +0100 Subject: [PATCH 3/3] up --- test/drivers/s3.test.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/test/drivers/s3.test.ts b/test/drivers/s3.test.ts index c4d5da4c7..87ebce99d 100644 --- a/test/drivers/s3.test.ts +++ b/test/drivers/s3.test.ts @@ -12,13 +12,14 @@ const region = process.env.VITE_S3_REGION; describe.skipIf( !accessKeyId || !secretAccessKey || !bucket || !endpoint || !region )("drivers: s3", () => { - const driver = s3Driver({ - accessKeyId: accessKeyId!, - secretAccessKey: secretAccessKey!, - bucket: bucket!, - endpoint: endpoint!, - region: region!, - }); + const driver = () => + s3Driver({ + accessKeyId: accessKeyId!, + secretAccessKey: secretAccessKey!, + bucket: bucket!, + endpoint: endpoint!, + region: region!, + }); testDriver({ driver, @@ -43,7 +44,7 @@ describe.skipIf( }); it("exposes instance", () => { - expect(driver.getInstance?.()).toBeInstanceOf(AwsClient); + expect(driver().getInstance?.()).toBeInstanceOf(AwsClient); }); }, });