diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt b/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt index 34d990eecd2d85c5bd472041a065c18d4246ce80..c28e5fb691113e5d9910216f9dd62b0aae387314 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt @@ -6,20 +6,20 @@ Flask == 3.0.3 pymongo == 4.7.3 redis == 4.5.4 flask_jwt_extended == 4.6.0 -cryptography == 42.0.8 +cryptography == 43.0.1 rfc3987 == 1.3.8 -opentelemetry-instrumentation == 0.40b0 -opentelemetry-instrumentation-flask == 0.40b0 -opentelemetry-instrumentation-redis == 0.40b0 -opentelemetry-instrumentation-pymongo == 0.40b0 -opentelemetry-exporter-otlp == 1.19.0 -opentelemetry-exporter-jaeger == 1.19.0 +opentelemetry-instrumentation == 0.41b0 +opentelemetry-instrumentation-flask == 0.41b0 +opentelemetry-instrumentation-redis == 0.41b0 +opentelemetry-instrumentation-pymongo == 0.41b0 +opentelemetry-exporter-otlp == 1.20.0 +opentelemetry-exporter-jaeger == 1.20.0 fluent == 0.10.0 fluent-logger == 0.10.0 -opentelemetry-api == 1.19.0 -opentelemetry-sdk == 1.19.0 +opentelemetry-api == 1.20.0 +opentelemetry-sdk == 1.20.0 flask_executor == 1.0.0 Flask-APScheduler == 1.13.1 -werkzeug == 3.0.4 +werkzeug == 3.0.6 gunicorn == 22.0.0 packaging == 24.0 \ No newline at end of file diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py b/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py index c6dae59bf2d3780b68be0f8c5cb6af4c6670fe48..9df3ad409ea2bb44a3e260745e7985c32f8008ec 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py @@ -13,6 +13,7 @@ from flask import current_app import asyncio import aiohttp from util import dict_to_camel_case, clean_empty, serialize_clean_camel_case +import os class Notifications(): @@ -67,7 +68,7 @@ class Notifications(): def request_post(self, url, data): headers = {'content-type': 'application/json'} - return requests.post(url, json={'text': str(data.to_str())}, headers=headers) + return requests.post(url, json={'text': str(data.to_str())}, headers=headers, timeout=os.getenv("TIMEOUT")) async def send_request(self, url, data): async with aiohttp.ClientSession() as session: diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py b/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py index 2efad5f7f28459e561ddcf9d22612275e1435dea..795dd0becf2e7bfa64fe35dc4604cf9ef3d930e5 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py @@ -1,4 +1,5 @@ import requests +import os class Notifications(): @@ -9,4 +10,4 @@ class Notifications(): def request_post(self, url, data): headers = {'content-type': 'application/json'} - return requests.post(url, json={'text': str(data.to_str())}, headers=headers) \ No newline at end of file + return requests.post(url, json={'text': str(data.to_str())}, headers=headers, timeout=int(os.getenv("TIMEOUT"))) \ No newline at end of file diff --git a/services/docker-compose-capif.yml b/services/docker-compose-capif.yml index 45de9c32106ec07a38fccf11e3e7794be6f609a6..037d5f3524b28a9f14a66211096ed63a03027efa 100644 --- a/services/docker-compose-capif.yml +++ b/services/docker-compose-capif.yml @@ -164,6 +164,7 @@ services: - CONTAINER_NAME=api-events - MONITORING=${MONITORING} - LOG_LEVEL=${LOG_LEVEL} + - TIMEOUT=10 extra_hosts: - host.docker.internal:host-gateway - fluent-bit:host-gateway @@ -239,6 +240,7 @@ services: - VAULT_ACCESS_TOKEN=dev-only-token - VAULT_PORT=8200 - LOG_LEVEL=${LOG_LEVEL} + - TIMEOUT=10 extra_hosts: - host.docker.internal:host-gateway - fluent-bit:host-gateway diff --git a/services/docker-compose-mock-server.yml b/services/docker-compose-mock-server.yml index 2529b8d8b5af681bc57c767b505a0c8ea945c606..d769505c6b202843691aa29d2fe432a7dc9300b7 100644 --- a/services/docker-compose-mock-server.yml +++ b/services/docker-compose-mock-server.yml @@ -8,6 +8,8 @@ services: - ./mock_server:/usr/src/app extra_hosts: - host.docker.internal:host-gateway + environment: + - DEBUG_MODE=True restart: unless-stopped image: labs.etsi.org:5050/ocf/capif/mock_server:latest diff --git a/services/docker-compose-register.yml b/services/docker-compose-register.yml index 3e29bb6a250cdcf0128d6a08cb423ec8822b0b68..011e906367ad3f3491a1bdaeb15986f41ef2966f 100644 --- a/services/docker-compose-register.yml +++ b/services/docker-compose-register.yml @@ -12,6 +12,7 @@ services: - VAULT_ACCESS_TOKEN=dev-only-token - VAULT_PORT=8200 - LOG_LEVEL=${LOG_LEVEL} + - TIMEOUT=10 extra_hosts: - host.docker.internal:host-gateway - vault:host-gateway diff --git a/services/mock_server/mock_server.py b/services/mock_server/mock_server.py index a3d26b84f5dacca484b371513c674853370d0868..a07c5ef6868a9498540285027bdb2239d08ab92c 100644 --- a/services/mock_server/mock_server.py +++ b/services/mock_server/mock_server.py @@ -56,5 +56,7 @@ def requests_list(): configure_logging(app) +debug_mode = os.getenv('DEBUG_MODE', 'False').lower() in ['true', '1'] + if __name__ == '__main__': - app.run(host=os.environ.get("IP",'0.0.0.0'),port=os.environ.get("PORT",9100),debug=True) + app.run(host=os.environ.get("IP",'0.0.0.0'),port=os.environ.get("PORT",9100), debug=debug_mode) diff --git a/services/register/register_service/core/register_operations.py b/services/register/register_service/core/register_operations.py index 42627fd304b30322ee27a112405a5a5a2bc1da3d..10850ab3b837ec11b4d230b6268fde03ee1a19a8 100644 --- a/services/register/register_service/core/register_operations.py +++ b/services/register/register_service/core/register_operations.py @@ -5,6 +5,7 @@ from datetime import datetime from config import Config import requests import uuid +import os class RegisterOperations: @@ -73,7 +74,7 @@ class RegisterOperations: try: url = f"https://{self.config["ccf"]["url"]}{self.config["ccf"]["helper_remove_user"]}{uuid}" - requests.delete(url, cert=("certs/superadmin.crt", "certs/superadmin.key"), verify="certs/ca_root.crt") + requests.delete(url, cert=("certs/superadmin.crt", "certs/superadmin.key"), verify="certs/ca_root.crt", timeout=int(os.getenv("TIMEOUT"))) mycol.delete_one({"uuid": uuid}) current_app.logger.debug(f"User with uuid {uuid} removed successfully")