mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-15 09:42:38 -05:00
fix secret names
This commit is contained in:
@@ -17,23 +17,19 @@ AWS_CLIENT_CONFIG = Config(
|
|||||||
use_fips_endpoint=True,
|
use_fips_endpoint=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Global variable
|
|
||||||
noti_s3_resource = None
|
|
||||||
|
|
||||||
default_access_key_id = os.environ.get("AWS_ACCESS_KEY_ID")
|
default_access_key_id = os.environ.get("CSV_AWS_ACCESS_KEY_ID")
|
||||||
default_secret_access_key = os.environ.get("AWS_SECRET_ACCESS_KEY")
|
default_secret_access_key = os.environ.get("CSV_AWS_SECRET_ACCESS_KEY")
|
||||||
default_region = os.environ.get("AWS_REGION")
|
default_region = os.environ.get("CSV_AWS_REGION")
|
||||||
|
|
||||||
|
|
||||||
def get_s3_resource():
|
def get_s3_resource():
|
||||||
global noti_s3_resource
|
session = Session(
|
||||||
if noti_s3_resource is None:
|
aws_access_key_id=os.environ.get("CSV_AWS_ACCESS_KEY_ID"),
|
||||||
session = Session(
|
aws_secret_access_key=os.environ.get("CSV_AWS_SECRET_ACCESS_KEY"),
|
||||||
aws_access_key_id=os.environ.get("AWS_ACCESS_KEY_ID"),
|
region_name=os.environ.get("CSV_AWS_REGION"),
|
||||||
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)
|
||||||
)
|
|
||||||
noti_s3_resource = session.resource("s3", config=AWS_CLIENT_CONFIG)
|
|
||||||
return noti_s3_resource
|
return noti_s3_resource
|
||||||
|
|
||||||
|
|
||||||
@@ -72,6 +68,7 @@ def s3upload(
|
|||||||
current_app.logger.exception(
|
current_app.logger.exception(
|
||||||
f"Unable to upload {key} to S3 bucket because of {e}"
|
f"Unable to upload {key} to S3 bucket because of {e}"
|
||||||
)
|
)
|
||||||
|
raise e
|
||||||
except botocore.exceptions.ClientError as e:
|
except botocore.exceptions.ClientError as e:
|
||||||
current_app.logger.exception(
|
current_app.logger.exception(
|
||||||
f"Unable to upload {key}to S3 bucket because of {e}"
|
f"Unable to upload {key}to S3 bucket because of {e}"
|
||||||
|
|||||||
Reference in New Issue
Block a user