If any S3 cred is passed, use it instead. (#483)

raw-labs · Aug 9, 2024 · 3c5c420 · 3c5c420
1 parent e306269
commit 3c5c420
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java b/...java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java
@@ -68,10 +68,13 @@ public Object executeGeneric(VirtualFrame frame) {
     // The docs say:
     // "If the S3 bucket is not registered in the credentials storage, then the region, accessKey
     // and secretKey must be provided as arguments."
+    // However, if the access key/secret key are passed, they should be used.
     RawContext context = RawContext.get(this);
     S3Path location;
-
-    if (context.existsLocationConfig(bucket) && context.getLocationConfig(bucket).hasS3()) {
+    if (this.accessKey == null
+        && this.secretKey == null
+        && context.existsLocationConfig(bucket)
+        && context.getLocationConfig(bucket).hasS3()) {
       LocationConfig l = context.getLocationConfig(bucket);
       S3Config s3Config = l.getS3();
       Option<String> maybeAccessKey =