Skip to content

Commit

Permalink
fix: AWS_EXPORTS_STORAGE_BUCKET_NAME envs
Browse files Browse the repository at this point in the history
  • Loading branch information
mkleszcz committed Jul 3, 2024
1 parent 8334169 commit a2d90a2
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion packages/workers/.env.shared
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ CONTENTFUL_ACCESS_TOKEN=<CHANGE-ME>
CONTENTFUL_ENVIRONMENT=<CHANGE-ME>
DB_CONNECTION={"engine":"postgresql","dbname":"backend","username":"backend","password":"backend","host":"172.17.0.1","port":5432}
HASHID_SALT=X&*az9nsBNykh!hXMczbaeH2oAm%jR6ZalWcXDW0#PUjHn0Xjs
AWS_EXPORTS_STORAGE_BUCKET_NAME=exports-bucket
AWS_STORAGE_BUCKET_NAME=test-bucket
WORKERS_EVENT_BUS_NAME=workers
1 change: 0 additions & 1 deletion packages/workers/.env.test
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ DB_CONNECTION={"engine":"postgresql","conndbname":"backend","dbname":"workers_te
WEB_APP_URL=http://localhost
JWT_SECRET=secret
HASHID_SALT=salt
AWS_EXPORTS_STORAGE_BUCKET_NAME=exports-bucket
AWS_STORAGE_BUCKET_NAME=test-bucket
WORKERS_EVENT_BUS_NAME=workers
8 changes: 0 additions & 8 deletions packages/workers/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@ def ses_client():
yield client


@pytest.fixture
def s3_exports_bucket():
with mock_s3():
s3 = boto3.client("s3", region_name='us-east-1', endpoint_url=settings.AWS_S3_ENDPOINT_URL)
s3.create_bucket(Bucket=settings.AWS_EXPORTS_STORAGE_BUCKET_NAME)
yield


@pytest.fixture
def uuid_mock(mocker):
mocked_uuid = UUID('76697d3f-ee2f-4c23-b2a4-b54ae2fc6015')
Expand Down
1 change: 0 additions & 1 deletion packages/workers/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ def fetch_db_secret(db_secret_arn):
JWT_SECRET = env('JWT_SECRET', None)
HASHID_SALT = env('HASHID_SALT', None)

AWS_EXPORTS_STORAGE_BUCKET_NAME = env("AWS_EXPORTS_STORAGE_BUCKET_NAME", None)
AWS_STORAGE_BUCKET_NAME = env("AWS_STORAGE_BUCKET_NAME", default=None)
AWS_S3_ENDPOINT_URL = AWS_ENDPOINT_URL
USER_DATA_EXPORT_EXPIRY_SECONDS = env.int("USER_DATA_EXPORT_EXPIRY_SECONDS", 172800) # 2 days default
Expand Down

0 comments on commit a2d90a2

Please sign in to comment.