From d6555d887c3dbb9d41fe1ec0db3cf4bfff765aba Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Mon, 7 Dec 2020 15:03:41 +0000 Subject: [PATCH] provide a location for create_bucket this is required when the boto3.resource itself is given a region --- tests/app/celery/test_letters_pdf_tasks.py | 45 +++++++++++++++++----- tests/app/letters/test_letter_utils.py | 35 +++++++++++++---- 2 files changed, 64 insertions(+), 16 deletions(-) diff --git a/tests/app/celery/test_letters_pdf_tasks.py b/tests/app/celery/test_letters_pdf_tasks.py index 6badc3bce..de150a472 100644 --- a/tests/app/celery/test_letters_pdf_tasks.py +++ b/tests/app/celery/test_letters_pdf_tasks.py @@ -747,9 +747,18 @@ def test_process_sanitised_letter_with_valid_letter( destination_bucket_name = current_app.config[destination_bucket] conn = boto3.resource('s3', region_name='eu-west-1') - scan_bucket = conn.create_bucket(Bucket=scan_bucket_name) - template_preview_bucket = conn.create_bucket(Bucket=template_preview_bucket_name) - destination_bucket = conn.create_bucket(Bucket=destination_bucket_name) + scan_bucket = conn.create_bucket( + Bucket=scan_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) + template_preview_bucket = conn.create_bucket( + Bucket=template_preview_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) + destination_bucket = conn.create_bucket( + Bucket=destination_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) s3 = boto3.client('s3', region_name='eu-west-1') s3.put_object(Bucket=scan_bucket_name, Key=filename, Body=b'original_pdf_content') @@ -802,9 +811,18 @@ def test_process_sanitised_letter_sets_postage_international( template_preview_bucket_name = current_app.config['LETTER_SANITISE_BUCKET_NAME'] destination_bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME'] conn = boto3.resource('s3', region_name='eu-west-1') - conn.create_bucket(Bucket=scan_bucket_name) - conn.create_bucket(Bucket=template_preview_bucket_name) - conn.create_bucket(Bucket=destination_bucket_name) + conn.create_bucket( + Bucket=scan_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) + conn.create_bucket( + Bucket=template_preview_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) + conn.create_bucket( + Bucket=destination_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) s3 = boto3.client('s3', region_name='eu-west-1') s3.put_object(Bucket=scan_bucket_name, Key=filename, Body=b'original_pdf_content') @@ -842,9 +860,18 @@ def test_process_sanitised_letter_with_invalid_letter(sample_letter_notification invalid_letter_bucket_name = current_app.config['INVALID_PDF_BUCKET_NAME'] conn = boto3.resource('s3', region_name='eu-west-1') - scan_bucket = conn.create_bucket(Bucket=scan_bucket_name) - template_preview_bucket = conn.create_bucket(Bucket=template_preview_bucket_name) - invalid_letter_bucket = conn.create_bucket(Bucket=invalid_letter_bucket_name) + scan_bucket = conn.create_bucket( + Bucket=scan_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) + template_preview_bucket = conn.create_bucket( + Bucket=template_preview_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) + invalid_letter_bucket = conn.create_bucket( + Bucket=invalid_letter_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) s3 = boto3.client('s3', region_name='eu-west-1') s3.put_object(Bucket=scan_bucket_name, Key=filename, Body=b'original_pdf_content') diff --git a/tests/app/letters/test_letter_utils.py b/tests/app/letters/test_letter_utils.py index 5f96988a8..b9f4f4405 100644 --- a/tests/app/letters/test_letter_utils.py +++ b/tests/app/letters/test_letter_utils.py @@ -191,7 +191,10 @@ def test_get_letter_pdf_gets_pdf_from_correct_bucket( bucket_name = current_app.config[bucket_config_name] filename = datetime.utcnow().strftime(filename_format) conn = boto3.resource('s3', region_name='eu-west-1') - conn.create_bucket(Bucket=bucket_name) + conn.create_bucket( + Bucket=bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) s3 = boto3.client('s3', region_name='eu-west-1') s3.put_object(Bucket=bucket_name, Key=filename, Body=b'pdf_content') @@ -265,7 +268,10 @@ def test_move_failed_pdf_error(notify_api): bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME'] conn = boto3.resource('s3', region_name='eu-west-1') - bucket = conn.create_bucket(Bucket=bucket_name) + bucket = conn.create_bucket( + Bucket=bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) s3 = boto3.client('s3', region_name='eu-west-1') s3.put_object(Bucket=bucket_name, Key=filename, Body=b'pdf_content') @@ -283,7 +289,10 @@ def test_move_failed_pdf_scan_failed(notify_api): bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME'] conn = boto3.resource('s3', region_name='eu-west-1') - bucket = conn.create_bucket(Bucket=bucket_name) + bucket = conn.create_bucket( + Bucket=bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) s3 = boto3.client('s3', region_name='eu-west-1') s3.put_object(Bucket=bucket_name, Key=filename, Body=b'pdf_content') @@ -323,8 +332,14 @@ def test_move_sanitised_letter_to_live_pdf_bucket(notify_api, mocker): target_bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME'] conn = boto3.resource('s3', region_name='eu-west-1') - source_bucket = conn.create_bucket(Bucket=source_bucket_name) - target_bucket = conn.create_bucket(Bucket=target_bucket_name) + source_bucket = conn.create_bucket( + Bucket=source_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) + target_bucket = conn.create_bucket( + Bucket=target_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) s3 = boto3.client('s3', region_name='eu-west-1') s3.put_object(Bucket=source_bucket_name, Key=filename, Body=b'pdf_content') @@ -347,8 +362,14 @@ def test_move_sanitised_letter_to_test_pdf_bucket(notify_api, mocker): target_bucket_name = current_app.config['TEST_LETTERS_BUCKET_NAME'] conn = boto3.resource('s3', region_name='eu-west-1') - source_bucket = conn.create_bucket(Bucket=source_bucket_name) - target_bucket = conn.create_bucket(Bucket=target_bucket_name) + source_bucket = conn.create_bucket( + Bucket=source_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) + target_bucket = conn.create_bucket( + Bucket=target_bucket_name, + CreateBucketConfiguration={'LocationConstraint': 'eu-west-1'} + ) s3 = boto3.client('s3', region_name='eu-west-1') s3.put_object(Bucket=source_bucket_name, Key=filename, Body=b'pdf_content')