Make the override of environment variable a parameter of env_replace script

Author: sfavre-meritis

.github/workflows/ci.yml

@@ -83,7 +83,7 @@ jobs:
           sleep 30 # ElasticSearch takes few seconds to start, make sure it is available when the build script runs
       - run: curl -v http://localhost:9200
       - name: Run tests
-        run: export $(cat .env | grep -v "^#" | xargs) && pytest c2corg_api/tests/views/test_article.py -s -rA
+        run: export $(cat .env | grep -v "^#" | xargs) && pytest --cov-report term --cov-report xml --cov=c2corg_api
       - name: Send coverage to codacy
         # secrets are not available for PR from forks, and dependabot PRs
         if: ${{ github.event_name != 'pull_request' && github.actor != 'dependabot[bot]' }}

c2corg_api/tests/views/test_article.py

@@ -1,4 +1,3 @@
-import sys
 from c2corg_api.caching import cache_document_version
 from c2corg_api.models.article import ArchiveArticle, Article, ARTICLE_TYPE
 from c2corg_api.models.association import AssociationLog, Association
@@ -117,8 +116,6 @@ def test_get_version_etag(self):
         headers = {
             'If-None-Match': etag
         }
-        print(f"Headers sent to {url} for testing Etag : {headers}",
-              flush=True, file=sys.stderr)
         self.app.get(url, status=304, headers=headers)
 
     def test_get_version_caching(self):

docker/scripts/entrypoint.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-./scripts/env_replace config/env.default .env < production.ini.in > production.ini
-./scripts/env_replace config/env.default .env < common.ini.in > common.ini
+./scripts/env_replace config/env.default --keep-env .env < production.ini.in > production.ini
+./scripts/env_replace config/env.default --keep-env .env < common.ini.in > common.ini
 
 exec "$@"

scripts/env_replace

@@ -4,14 +4,19 @@ import sys
 from dotenv import load_dotenv
 
 if __name__ == "__main__":
+    override_env = True
+    if "--keep-env" in sys.argv:
+        override_env = False
+        sys.argv.remove("--keep-env")
+
     if len(sys.argv) < 2:
-        print("Usage: {} env_file1 env_file2 ...".format(sys.argv[0]))
+        print("Usage: {} [--override-env] env_file1 env_file2 ...".format(sys.argv[0]))
         sys.exit(1)
 
     env_files = sys.argv[1:]
 
     for env_file in env_files:
-        load_dotenv(env_file, override=False)
+        load_dotenv(env_file, override=override_env)
 
     env = dict(**os.environ)
     # Because on Windows, environment variables are upper cased by default