Merge 1062432 into d3ce3bc

README.md

@@ -1,4 +1,4 @@
-# Fence
+# Fence 
 
 [![Build Status](https://travis-ci.org/uc-cdis/fence.svg?branch=master)](https://travis-ci.org/uc-cdis/fence)
 

fence/blueprints/data/indexd.py

@@ -605,13 +605,24 @@ def get_signed_url(
         aws_creds = get_value(
             config, "AWS_CREDENTIALS", InternalError("credentials not configured")
         )
-
-        http_url = "https://{}.s3.amazonaws.com/{}".format(
-            self.parsed_url.netloc, self.parsed_url.path.strip("/")
+        s3_buckets = get_value(
+            config, "S3_BUCKETS", InternalError("buckets not configured")
         )
 
+        bucket_name = self.bucket_name()
+        bucket = s3_buckets.get(bucket_name)
+
+        if bucket and bucket.get("endpoint_url"):
+            http_url = bucket["endpoint_url"].strip("/") + "/{}/{}".format(
+                self.parsed_url.netloc, self.parsed_url.path.strip("/")
+            )
+        else:
+            http_url = "https://{}.s3.amazonaws.com/{}".format(
+                self.parsed_url.netloc, self.parsed_url.path.strip("/")
+            )
+
         credential = S3IndexedFileLocation.get_credential_to_access_bucket(
-            self.bucket_name(), aws_creds, expires_in
+            bucket_name, aws_creds, expires_in
         )
 
         # if it's public and we don't need to force the signed url, just return the raw

fence/config-default.yaml

@@ -492,6 +492,8 @@ S3_BUCKETS: {}
 #   bucket1:
 #     cred: 'CRED1'
 #     region: 'us-east-1'
+#     # optionally you can manually specify an s3-compliant endpoint for this bucket
+#     endpoint_url: 'https://cleversafe.example.com/'
 #   bucket2:
 #     cred: 'CRED2'
 #     region: 'us-east-1'

tests/conftest.py

@@ -461,8 +461,8 @@ def indexd_client(app, request):
             "baseid": "",
             "rev": "",
             "size": 10,
-            "file_name": "file1",
-            "urls": ["s3://bucket1/key"],
+            "file_name": "file2",
+            "urls": ["s3://bucket2/key"],
             "hashes": {},
             "acl": ["phs000178", "phs000218"],
             "form": "",

tests/test-fence-config.yaml

@@ -397,6 +397,7 @@ S3_BUCKETS:
     cred: 'CRED1'
   bucket2:
     cred: 'CRED2'
+    endpoint_url: 'https://cleversafe.example.com/'
     region: 'us-east-1' 
   bucket3:
     cred: 'CRED1'