Update env vars to building configs

Change MONGO_SSL env var to false and update docker-compose
Update default metax url if one is not found
Update github workflow file

.env.example

@@ -21,7 +21,7 @@ MONGO_DATABASE=default
 MONGO_AUTHDB=admin
 MONGO_INITDB_ROOT_PASSWORD=admin
 MONGO_INITDB_ROOT_USERNAME=admin
-MONGO_SSL=true
+MONGO_SSL=false
 MONGO_SSL_CA=/tls/cacert
 MONGO_SSL_CLIENT_KEY=/tls/key
 MONGO_SSL_CLIENT_CERT=/tls/cert

.github/workflows/int.yml

@@ -43,10 +43,7 @@ jobs:
       env:
         BASE_URL: http://localhost:5430
         OIDC_URL: http://localhost:8000
-        MONGO_HOST: localhost:27017
-        MONGO_DATABASE: default
-        MONGO_AUTHDB: admin
-
+
     - name: Collect logs from docker
       if: ${{ failure() }}
       run: docker-compose logs --no-color -t > tests/dockerlogs || true
@@ -78,7 +75,8 @@ jobs:
         MONGO_HOST: localhost:27017
         MONGO_DATABASE: default
         MONGO_AUTHDB: admin
-
+        MONGO_SSL: True
+
     - name: Run Integration test
       run: |
         python tests/integration/run_tests.py

docker-compose-tls.yml

@@ -4,6 +4,7 @@ services:
     build:
       dockerfile: Dockerfile-dev
       context: .
+      target: develop
     image: cscfi/metadata-submitter-dev
     container_name: "metadata_submitter_backend_dev"
     volumes:
@@ -14,6 +15,7 @@ services:
       - database
       - mockauth
       - mockdoi
+      - mockmetax
     restart: on-failure
     environment:
       - "MONGO_HOST=${MONGO_HOST}"
@@ -57,6 +59,7 @@ services:
     build:
       dockerfile: Dockerfile-dev
       context: .
+      target: develop
     image: cscfi/metadata-submitter-dev
     environment:
       - "LOG_LEVEL=${LOG_LEVEL}"
@@ -74,6 +77,7 @@ services:
     build:
       dockerfile: Dockerfile-dev
       context: .
+      target: develop
     image: cscfi/metadata-submitter-dev
     hostname: mockdoi
     expose:
@@ -87,6 +91,7 @@ services:
     build:
       dockerfile: Dockerfile-dev
       context: .
+      target: develop
     image: cscfi/metadata-submitter-dev
     hostname: mockmetax
     expose:
@@ -97,4 +102,4 @@ services:
       - ./tests/integration/mock_metax_api.py:/mock_metax_api.py
     entrypoint: ["python", "/mock_metax_api.py", "0.0.0.0", "8002"]
 volumes:
-  data: 
+  data:

docker-compose.yml

@@ -13,6 +13,7 @@ services:
       - database
       - mockauth
       - mockdoi
+      - mockmetax
     restart: on-failure
     environment:
       - "MONGO_HOST=${MONGO_HOST}"
@@ -63,7 +64,7 @@ services:
       - 8000:8000
     volumes:
       - ./tests/integration/mock_auth.py:/mock_auth.py
-    entrypoint: [ "python", "/mock_auth.py", "0.0.0.0", "8000" ]
+    entrypoint: ["python", "/mock_auth.py", "0.0.0.0", "8000"]
   mockdoi:
     build:
       dockerfile: Dockerfile-dev
@@ -77,11 +78,12 @@ services:
       - 8001:8001
     volumes:
       - ./tests/integration/mock_doi_api.py:/mock_doi_api.py
-    entrypoint: [ "python", "/mock_doi_api.py", "0.0.0.0", "8001" ]
+    entrypoint: ["python", "/mock_doi_api.py", "0.0.0.0", "8001"]
   mockmetax:
     build:
       dockerfile: Dockerfile-dev
       context: .
+      target: develop
     image: cscfi/metadata-submitter-dev
     hostname: mockmetax
     expose:

metadata_backend/api/metax_api_handler.py

@@ -26,7 +26,7 @@ def __init__(self, req: Request) -> None:
 
         self.username = os.getenv("METAX_USER", "sd")
         self.password = os.getenv("METAX_PASS", "test")
-        self.metax_url = os.getenv("METAX_URL", "http://mockmetax:8002")
+        self.metax_url = os.getenv("METAX_URL", "http://localhost:8002")
         self.rest_route = "/rest/v2/datasets"
         self.publish_route = "/rpc/v2/datasets/publish_dataset"
 

tests/integration/run_tests.py

@@ -61,7 +61,7 @@
 users_url = f"{base_url}/users"
 submit_url = f"{base_url}/submit"
 publish_url = f"{base_url}/publish"
-metax_url = "http://mockmetax:8002/rest/v2/datasets"
+metax_url = f"{os.getenv('METAX_URL', 'http://localhost:8002')}/rest/v2/datasets"
 # to form direct contact to db with create_folder()
 DATABASE = os.getenv("MONGO_DATABASE", "default")
 AUTHDB = os.getenv("MONGO_AUTHDB", "admin")