Merge branch 'main' into release-3.0.0

Author: LeonLuttenberger

awswrangler/athena/_utils.py

@@ -374,17 +374,16 @@ def create_athena_bucket(boto3_session: Optional[boto3.Session] = None) -> str:
     region_name: str = _utils.get_region_from_session(boto3_session=boto3_session).lower()
     bucket_name = f"aws-athena-query-results-{account_id}-{region_name}"
     path = f"s3://{bucket_name}/"
-    resource = _utils.resource(service_name="s3", session=boto3_session)
-    bucket = resource.Bucket(bucket_name)
+    client_s3 = _utils.client(service_name="s3", session=boto3_session)
     args = {} if region_name == "us-east-1" else {"CreateBucketConfiguration": {"LocationConstraint": region_name}}
     try:
-        bucket.create(**args)  # type: ignore[arg-type]
-    except resource.meta.client.exceptions.BucketAlreadyOwnedByYou as err:
+        client_s3.create_bucket(Bucket=bucket_name, **args)
+    except (client_s3.exceptions.BucketAlreadyExists, client_s3.exceptions.BucketAlreadyOwnedByYou) as err:
         _logger.debug("Bucket %s already exists.", err.response["Error"]["BucketName"])
     except botocore.exceptions.ClientError as err:
         if err.response["Error"]["Code"] == "OperationAborted":
             _logger.debug("A conflicting conditional operation is currently in progress against this resource.")
-    bucket.wait_until_exists()
+    client_s3.get_waiter("bucket_exists").wait(Bucket=bucket_name)
     return path
 
 

awswrangler/redshift.py

@@ -82,10 +82,9 @@ def _does_table_exist(cursor: "redshift_connector.Cursor", schema: Optional[str]
 
 
 def _get_paths_from_manifest(path: str, boto3_session: Optional[boto3.Session] = None) -> List[str]:
-    resource_s3 = _utils.resource(service_name="s3", session=boto3_session)
+    client_s3 = _utils.client(service_name="s3", session=boto3_session)
     bucket, key = _utils.parse_path(path)
-    content_object = resource_s3.Object(bucket, key)
-    manifest_content = json.loads(content_object.get()["Body"].read().decode("utf-8"))
+    manifest_content = json.loads(client_s3.get_object(Bucket=bucket, Key=key)["Body"].read().decode("utf-8"))
     return [path["url"] for path in manifest_content["entries"]]