test: avoid overriding region

zirkelc · Jul 21, 2024 · 25024a2 · 25024a2
1 parent 2191947
commit 25024a2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/core/src/store.ts b/packages/core/src/store.ts
@@ -22,6 +22,8 @@ export type Resolveable<TResolved, TArgs extends any[] = []> =
 	| TResolved
 	| ((...args: TArgs) => TResolved);
 
+// export type ResolvedFn<TResolved, TArgs extends any[] = []> = ((...args: TArgs) => TResolved);
+
 export type Payload<TPayload = any> = TPayload;
 export type Reference<TReference = any> = TReference;
 

diff --git a/packages/store-s3/src/store.ts b/packages/store-s3/src/store.ts
@@ -123,7 +123,7 @@ export class S3Store<TInput = unknown, TOutput = unknown>
 
 		const reference = input.reference as S3Reference;
 		const bucketFn = resolvableFn(this.#bucket);
-		const bucket = bucketFn();
+		const bucket = this.#bucket();
 
 		if (isS3ObjectArn(reference)) {
 			const { bucket: otherBucket } = parseS3ObjectArn(reference);
@@ -152,7 +152,7 @@ export class S3Store<TInput = unknown, TOutput = unknown>
 
 		const client = new S3Client({
 			...this.#config,
-			region,
+			region: region ?? this.#config.region,
 		});
 
 		const { bucket, key } = parseS3Reference(input.reference);
@@ -225,7 +225,7 @@ export class S3Store<TInput = unknown, TOutput = unknown>
 
 		const client = new S3Client({
 			...this.#config,
-			region,
+			region: region ?? this.#config.region,
 		});
 
 		try {

diff --git a/vitest.root.ts b/vitest.root.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "vitest/config";
 
 // load region from config to prevent error "ConfigError: Missing region in config"
 // https://github.com/aws/aws-sdk-js/pull/1391
-process.env.AWS_SDK_LOAD_CONFIG = "1";
+// process.env.AWS_SDK_LOAD_CONFIG = "1";
 
 export default defineConfig({
 	test: {