Skip to content
This repository has been archived by the owner on May 31, 2023. It is now read-only.

Patch: use aws_profile correctly #1

Merged
merged 1 commit into from
Jun 5, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions dbt/adapters/athena/impl.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import agate
import re
import boto3
import boto3.session
from botocore.exceptions import ClientError
from itertools import chain
from threading import Lock
Expand Down Expand Up @@ -58,11 +58,12 @@ def clean_up_partitions(
):
# Look up Glue partitions & clean up
conn = self.connections.get_thread_connection()
client = conn.handle
creds = conn.credentials
session = boto3.session.Session(region_name=creds.region_name, profile_name=creds.aws_profile_name)

with boto3_client_lock:
glue_client = boto3.client('glue', region_name=client.region_name)
s3_resource = boto3.resource('s3', region_name=client.region_name)
glue_client = session.client('glue')
s3_resource = session.resource('s3')
partitions = glue_client.get_partitions(
# CatalogId='123456789012', # Need to make this configurable if it is different from default AWS Account ID
DatabaseName=database_name,
Expand All @@ -85,9 +86,10 @@ def clean_up_table(
):
# Look up Glue partitions & clean up
conn = self.connections.get_thread_connection()
client = conn.handle
creds = conn.credentials
session = boto3.session.Session(region_name=creds.region_name, profile_name=creds.aws_profile_name)
with boto3_client_lock:
glue_client = boto3.client('glue', region_name=client.region_name)
glue_client = session.client('glue')
try:
table = glue_client.get_table(
DatabaseName=database_name,
Expand All @@ -105,7 +107,7 @@ def clean_up_table(
if m is not None:
bucket_name = m.group(1)
prefix = m.group(2)
s3_resource = boto3.resource('s3', region_name=client.region_name)
s3_resource = session.resource('s3')
s3_bucket = s3_resource.Bucket(bucket_name)
s3_bucket.objects.filter(Prefix=prefix).delete()

Expand Down