corrected boto3 issues causing key errors

slacgismo · Nov 9, 2023 · 677ba4e · 677ba4e
1 parent 26e89ca
commit 677ba4e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/valhub/base/utils.py b/valhub/base/utils.py
@@ -50,11 +50,7 @@ def upload_to_s3_bucket(bucket_name, local_path, upload_path):
                 return s3_file_full_path.replace('http://s3:5000/put_object/', 'http://s3:5000/get_object/')
     else:
         """Upload file to S3 bucket and return object URL"""
-        s3 = boto3.client(
-            's3',
-            aws_access_key_id=os.environ["AWS_ACCESS_KEY_ID"],
-            aws_secret_access_key=os.environ["AWS_SECRET_ACCESS_KEY"]
-        )
+        s3 = boto3.client('s3')
 
         try:
             s3.upload_file(local_path, bucket_name, upload_path)

diff --git a/workers/submission_worker.py b/workers/submission_worker.py
@@ -297,8 +297,6 @@ def download_and_extract_zip_file(file_name, download_location, extract_location
         s3 = boto3.client(
             's3',
             region_name=os.environ.get("AWS_DEFAULT_REGION", "us-west-2"),
-            aws_access_key_id=os.environ["AWS_ACCESS_KEY_ID"],
-            aws_secret_access_key=os.environ["AWS_SECRET_ACCESS_KEY"]
         )
         s3.download_file(S3_BUCKET_NAME, file_name, download_location)
     except Exception as e:
@@ -595,8 +593,6 @@ def get_or_create_sqs_queue(queue_name):
         sqs = boto3.resource(
             "sqs",
             region_name=os.environ.get("AWS_DEFAULT_REGION", "us-west-2"),
-            aws_secret_access_key=os.environ.get("AWS_SECRET_ACCESS_KEY"),
-            aws_access_key_id=os.environ.get("AWS_ACCESS_KEY_ID"),
         )
 
     if queue_name == "":
@@ -623,8 +619,6 @@ def get_analysis_pk():
     ec2_resource = boto3.resource(
         'ec2',
         region_name=os.environ.get("AWS_DEFAULT_REGION", "us-west-2"),
-        aws_secret_access_key=os.environ.get("AWS_SECRET_ACCESS_KEY"),
-        aws_access_key_id=os.environ.get("AWS_ACCESS_KEY_ID"),
     )
     ec2_instance = ec2_resource.Instance(instance_id)
     tags = ec2_instance.tags