darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 17:19:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from 18F/jim/061522/registration-mods

Browse Source 
config buckets
This commit is contained in:
Jim Moffet
2022-06-23 14:09:22 -07:00
committed by GitHub
parent 28df5fec65 e17c26d1f6
commit 2a918dbe98
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -125,7 +125,7 @@ generate-manifest:
.PHONY: upload-static ## Upload the static files to be served from S3 .PHONY: upload-static ## Upload the static files to be served from S3
upload-static: upload-static:
aws s3 cp --region eu-west-1 --recursive --cache-control max-age=315360000,immutable ./app/static s3://${DNS_NAME}-static aws s3 cp --region us-west-2 --recursive --cache-control max-age=315360000,immutable ./app/static s3://${DNS_NAME}-static
.PHONY: cf-deploy .PHONY: cf-deploy
cf-deploy: ## Deploys the app to Cloud Foundry cf-deploy: ## Deploys the app to Cloud Foundry

6
app/config.py
View File

@@ -31,7 +31,7 @@ class Config(object):
ANTIVIRUS_API_KEY = os.environ.get('ANTIVIRUS_API_KEY') ANTIVIRUS_API_KEY = os.environ.get('ANTIVIRUS_API_KEY')
ASSETS_DEBUG = False ASSETS_DEBUG = False
AWS_REGION = 'eu-west-1' AWS_REGION = 'us-west-2'
DEFAULT_SERVICE_LIMIT = 50 DEFAULT_SERVICE_LIMIT = 50
EMAIL_EXPIRY_SECONDS = 3600 # 1 hour EMAIL_EXPIRY_SECONDS = 3600 # 1 hour
@@ -97,8 +97,8 @@ class Development(Config):
DEBUG = True DEBUG = True
SESSION_COOKIE_SECURE = False SESSION_COOKIE_SECURE = False
SESSION_PROTECTION = None SESSION_PROTECTION = None
CSV_UPLOAD_BUCKET_NAME = 'development-notifications-csv-upload' CSV_UPLOAD_BUCKET_NAME = 'local-notifications-csv-upload'
CONTACT_LIST_UPLOAD_BUCKET_NAME = 'development-contact-list' CONTACT_LIST_UPLOAD_BUCKET_NAME = 'local-contact-list'
LOGO_UPLOAD_BUCKET_NAME = 'public-logos-tools' LOGO_UPLOAD_BUCKET_NAME = 'public-logos-tools'
LOGO_CDN_DOMAIN = 'static-logos.notify.tools' LOGO_CDN_DOMAIN = 'static-logos.notify.tools'
MOU_BUCKET_NAME = 'notify.tools-mou' MOU_BUCKET_NAME = 'notify.tools-mou'

2
scripts/run_app_paas.sh
View File

@@ -61,7 +61,7 @@ function start_application {
} }
function start_aws_logs_agent { function start_aws_logs_agent {
exec aws logs push --region eu-west-1 --config-file /home/vcap/app/awslogs.conf & exec aws logs push --region us-west-2 --config-file /home/vcap/app/awslogs.conf &
AWSLOGS_AGENT_PID=$! AWSLOGS_AGENT_PID=$!
echo "AWS logs agent pid: ${AWSLOGS_AGENT_PID}" echo "AWS logs agent pid: ${AWSLOGS_AGENT_PID}"
} }

4
tests/app/s3_client/test_s3_letter_upload_client.py
View File

@@ -107,13 +107,13 @@ def test_get_letter_s3_object_raises_custom_error(
expected_exception expected_exception
): ):
bucket_name = current_app.config['TRANSIENT_UPLOADED_LETTERS'] bucket_name = current_app.config['TRANSIENT_UPLOADED_LETTERS']
s3 = boto3.client('s3', region_name='eu-west-1') s3 = boto3.client('s3', region_name='us-west-2')
# bucket not existing will trigger some other error # bucket not existing will trigger some other error
if will_raise_custom_error: if will_raise_custom_error:
s3.create_bucket( s3.create_bucket(
Bucket=bucket_name, Bucket=bucket_name,
CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} CreateBucketConfiguration={'LocationConstraint': 'us-west-2'}
) )
with pytest.raises(expected_exception): with pytest.raises(expected_exception):

2
tests/app/s3_client/test_s3_logo_client.py
View File

@@ -24,7 +24,7 @@ data = {'data': 'some_data'}
filename = 'test.png' filename = 'test.png'
svg_filename = 'test.svg' svg_filename = 'test.svg'
upload_id = 'test_uuid' upload_id = 'test_uuid'
region = 'eu-west1' region = 'us-west-2'
@pytest.fixture @pytest.fixture