Skip to content

Commit 36e86cd

Browse files
committed
Revert changes to multipart_upload.py
1 parent fbcb64c commit 36e86cd

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

fence/blueprints/data/multipart_upload.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def initialize_multipart_upload(bucket_name, key, credentials):
3939
aws_secret_access_key=credentials["aws_secret_access_key"],
4040
aws_session_token=credentials.get("aws_session_token"),
4141
)
42+
4243
s3client = None
4344
if url:
4445
s3client = session.client("s3", endpoint_url=url)
@@ -93,6 +94,7 @@ def complete_multipart_upload(bucket_name, key, credentials, uploadId, parts):
9394
aws_secret_access_key=credentials["aws_secret_access_key"],
9495
aws_session_token=credentials.get("aws_session_token"),
9596
)
97+
9698
s3client = None
9799
if url:
98100
s3client = session.client("s3", endpoint_url=url)
@@ -145,12 +147,7 @@ def generate_presigned_url_for_uploading_part(
145147
)
146148
bucket = s3_buckets.get(bucket_name)
147149

148-
s3_buckets = get_value(
149-
config, "S3_BUCKETS", InternalError("S3_BUCKETS not configured")
150-
)
151-
bucket = s3_buckets.get(bucket_name)
152-
153-
if bucket.get("endpoint_url"):
150+
if s3_buckets.get("endpoint_url"):
154151
url = bucket["endpoint_url"].strip("/") + "/{}/{}".format(
155152
bucket_name, key.strip("/")
156153
)

0 commit comments

Comments
 (0)