mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-18 13:39:41 -04:00
Remove direct use of aws creds from deployed environments
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import uuid
|
||||
from io import BytesIO
|
||||
from os import getenv
|
||||
from unittest.mock import ANY
|
||||
|
||||
import pytest
|
||||
@@ -7,7 +8,6 @@ from flask import url_for
|
||||
from freezegun import freeze_time
|
||||
|
||||
from app.formatters import normalize_spaces
|
||||
from app.s3_client import default_access_key, default_secret_key
|
||||
from tests import contact_list_json
|
||||
from tests.conftest import SERVICE_ONE_ID
|
||||
|
||||
@@ -210,8 +210,8 @@ def test_upload_csv_file_shows_error_banner(
|
||||
region='us-west-2',
|
||||
bucket_name='test-contact-list',
|
||||
file_location=f"service-{SERVICE_ONE_ID}-notify/{fake_uuid}.csv",
|
||||
access_key=default_access_key,
|
||||
secret_key=default_secret_key,
|
||||
access_key=getenv('AWS_ACCESS_KEY_ID'),
|
||||
secret_key=getenv('AWS_SECRET_ACCESS_KEY'),
|
||||
)
|
||||
mock_set_metadata.assert_called_once_with(
|
||||
ANY,
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
from collections import namedtuple
|
||||
from os import getenv
|
||||
from unittest.mock import call
|
||||
|
||||
import pytest
|
||||
|
||||
from app.s3_client import default_access_key, default_region, default_secret_key
|
||||
from app.s3_client.s3_logo_client import (
|
||||
EMAIL_LOGO_LOCATION_STRUCTURE,
|
||||
TEMP_TAG,
|
||||
@@ -14,6 +14,9 @@ from app.s3_client.s3_logo_client import (
|
||||
upload_email_logo,
|
||||
)
|
||||
|
||||
default_access_key = getenv('AWS_ACCESS_KEY_ID')
|
||||
default_secret_key = getenv('AWS_SECRET_ACCESS_KEY')
|
||||
default_region = getenv('AWS_REGION')
|
||||
bucket = 'test_bucket'
|
||||
bucket_credentials = {
|
||||
'bucket': bucket,
|
||||
|
||||
Reference in New Issue
Block a user