darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-11 09:27:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1528 from GSA/notify-api-1526

Browse Source 
make sure we reuse boto3 clients and resources
This commit is contained in:
Kenneth Kehl
2025-01-17 09:00:11 -08:00
committed by GitHub
parent e9206c3602 981fedaa01
commit 687819a213
3 changed files with 101 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
notifications_utils/s3.py
View File

@@ -13,14 +13,30 @@ AWS_CLIENT_CONFIG = Config(
s3={
"addressing_style": "virtual",
},
max_pool_connections=50,
use_fips_endpoint=True,
)
# Global variable
noti_s3_resource = None
default_access_key_id = os.environ.get("AWS_ACCESS_KEY_ID")
default_secret_access_key = os.environ.get("AWS_SECRET_ACCESS_KEY")
default_region = os.environ.get("AWS_REGION")
def get_s3_resource():
global noti_s3_resource
if noti_s3_resource is None:
session = Session(
aws_access_key_id=os.environ.get("AWS_ACCESS_KEY_ID"),
aws_secret_access_key=os.environ.get("AWS_SECRET_ACCESS_KEY"),
region_name=os.environ.get("AWS_REGION"),
)
noti_s3_resource = session.resource("s3", config=AWS_CLIENT_CONFIG)
return noti_s3_resource
def s3upload(
filedata,
region,
@@ -32,12 +48,7 @@ def s3upload(
access_key=default_access_key_id,
secret_key=default_secret_access_key,
):
session = Session(
aws_access_key_id=access_key,
aws_secret_access_key=secret_key,
region_name=region,
)
_s3 = session.resource("s3", config=AWS_CLIENT_CONFIG)
_s3 = get_s3_resource()
key = _s3.Object(bucket_name, file_location)
@@ -73,12 +84,7 @@ def s3download(
secret_key=default_secret_access_key,
):
try:
session = Session(
aws_access_key_id=access_key,
aws_secret_access_key=secret_key,
region_name=region,
)
s3 = session.resource("s3", config=AWS_CLIENT_CONFIG)
s3 = get_s3_resource()
key = s3.Object(bucket_name, filename)
return key.get()["Body"]
except botocore.exceptions.ClientError as error: