From 5ac3b37aac555700e19d3e4b6d17a85e74220519 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Wed, 15 May 2024 15:44:33 +0200 Subject: [PATCH] Remove env vars in test (we no longer need them) By defining them in environ.Env, we don't need to have the defaults set in the env file --- .github/workflows/run-tests.yml | 13 ------------- greenweb/settings/common.py | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 591dc586..a297e23a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -65,18 +65,5 @@ jobs: source .venv/bin/activate .venv/bin/dotenv -f .env.test run -- pytest env: - DOMAIN_SNAPSHOT_BUCKET: ${{ secrets.TESTING_DOMAIN_SNAPSHOT_BUCKET }} - DATABASE_URL_READ_ONLY: ${{ secrets.TESTING_DATABASE_URL_READ_ONLY }} - OBJECT_STORAGE_ACCESS_KEY_ID: ${{ secrets.TESTING_OBJECT_STORAGE_ACCESS_KEY_ID }} - OBJECT_STORAGE_SECRET_ACCESS_KEY: ${{ secrets.TESTING_OBJECT_STORAGE_SECRET_ACCESS_KEY }} - OBJECT_STORAGE_ENDPOINT: ${{ secrets.TESTING_OBJECT_STORAGE_ENDPOINT }} - OBJECT_STORAGE_REGION: ${{ secrets.TESTING_OBJECT_STORAGE_REGION }} - OBJECT_STORAGE_BUCKET_NAME: ${{ secrets.TESTING_OBJECT_STORAGE_BUCKET_NAME }} - AMAZON_PROVIDER_ID: ${{ secrets.AMAZON_PROVIDER_ID }} - AMAZON_REMOTE_API_ENDPOINT: ${{ secrets.AMAZON_REMOTE_API_ENDPOINT }} - MICROSOFT_PROVIDER_ID: ${{ secrets.MICROSOFT_PROVIDER_ID }} - MICROSOFT_LOCAL_FILE_DIRECTORY: ${{ secrets.MICROSOFT_LOCAL_FILE_DIRECTORY }} - EQUINIX_PROVIDER_ID: ${{ secrets.EQUINIX_PROVIDER_ID }} - EQUINIX_REMOTE_API_ENDPOINT: ${{ secrets.EQUINIX_REMOTE_API_ENDPOINT }} AWS_SHARED_CREDENTIALS_FILE: ${{ secrets.AWS_SHARED_CREDENTIALS_FILE }} AWS_CONFIG_FILE: ${{ secrets.AWS_CONFIG_FILE }} diff --git a/greenweb/settings/common.py b/greenweb/settings/common.py index 90ce25b9..ffa3218d 100644 --- a/greenweb/settings/common.py +++ b/greenweb/settings/common.py @@ -32,6 +32,7 @@ str, "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", ), + OBJECT_STORAGE_BUCKET_NAME=(str, "tgwf-green-domains-dev"), DOMAIN_SNAPSHOT_BUCKET=(str, "tgwf-green-domains-dev"), # basicauth for staging environments BASICAUTH_DISABLE=(bool, True),