Just use netloc to identify bucket name for s3 locations (#2713)

reviewable/pr18780/r1
James Higgins 8 years ago committed by René Moser
parent b58bd264e8
commit 58c6ad6c9e

@ -235,7 +235,7 @@ class MavenDownloader:
parsed_url = urlparse(url) parsed_url = urlparse(url)
if parsed_url.scheme=='s3': if parsed_url.scheme=='s3':
parsed_url = urlparse(url) parsed_url = urlparse(url)
bucket_name = parsed_url.netloc[:parsed_url.netloc.find('.')] bucket_name = parsed_url.netloc
key_name = parsed_url.path[1:] key_name = parsed_url.path[1:]
client = boto3.client('s3',aws_access_key_id=self.module.params.get('username', ''), aws_secret_access_key=self.module.params.get('password', '')) client = boto3.client('s3',aws_access_key_id=self.module.params.get('username', ''), aws_secret_access_key=self.module.params.get('password', ''))
url_to_use = client.generate_presigned_url('get_object',Params={'Bucket':bucket_name,'Key':key_name},ExpiresIn=10) url_to_use = client.generate_presigned_url('get_object',Params={'Bucket':bucket_name,'Key':key_name},ExpiresIn=10)
@ -387,4 +387,4 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
main() main()

Loading…
Cancel
Save