From 8841e8062d8a97248ca9e04b546d14ca5c0dcfb6 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Tue, 11 Jun 2024 13:24:12 +0200 Subject: [PATCH 1/6] Update libraries --- .../requirements.txt | 6 +- .../requirements.txt | 7 +- .../requirements.txt | 13 +- .../requirements.txt | 7 +- .../requirements.txt | 9 +- .../TS29222_CAPIF_Events_API/requirements.txt | 19 +- .../requirements.txt | 7 +- .../requirements.txt | 7 +- .../requirements.txt | 3 +- .../requirements.txt | 9 +- services/helper/requirements.txt | 2 +- services/register/requirements.txt | 18 +- tools/robot/basicRequirements.txt | 204 +++++++++--------- 13 files changed, 158 insertions(+), 153 deletions(-) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt b/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt index ce843e6..49bdd94 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt @@ -1,11 +1,11 @@ connexion[swagger-ui] == 2.14.2; python_version>="3.6" swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 -setuptools >= 21.0.0 +setuptools == 68.2.2 Flask == 2.0.3 pymongo == 4.3.3 flask_jwt_extended == 4.4.4 -pyopenssl == 23.0.0 +cryptography == 42.0.8 rfc3987 == 1.3.8 redis == 4.5.4 opentelemetry-instrumentation == 0.40b0 @@ -19,3 +19,5 @@ fluent-logger == 0.10.0 opentelemetry-api == 1.19.0 opentelemetry-sdk == 1.19.0 flask_executor == 1.0.0 +Werkzeug == 2.2.3 + diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt b/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt index d45d1e5..b44401b 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt +++ b/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt @@ -1,12 +1,12 @@ connexion[swagger-ui] == 2.14.2; python_version>="3.6" swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 -setuptools >= 21.0.0 +setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.0.1 +pymongo == 4.3.3 redis == 4.5.4 flask_jwt_extended == 4.4.4 -pyopenssl == 23.0.0 +cryptography == 42.0.8 rfc3987 == 1.3.8 opentelemetry-instrumentation == 0.38b0 opentelemetry-instrumentation-flask == 0.38b0 @@ -18,4 +18,5 @@ fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 +Werkzeug == 2.2.3 diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt b/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt index 03d8aaf..1c80c12 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt @@ -1,14 +1,9 @@ connexion[swagger-ui] == 2.14.2; python_version>="3.6" -# 2.3 is the last version that supports python 3.4-3.5 -connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4" -# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug -# we must peg werkzeug versions below to fix connexion -# https://github.com/zalando/connexion/pull/1044 -werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4" +Werkzeug == 2.2.3 swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 -setuptools >= 21.0.0 -Flask == 2.1.1 +setuptools == 68.2.2 +Flask == 2.0.3 pymongo == 4.3.3 flask_jwt_extended == 4.4.4 opentelemetry-instrumentation == 0.38b0 @@ -22,7 +17,7 @@ fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 -pyopenssl == 23.0.0 +cryptography == 42.0.8 redis == 4.5.4 flask_executor == 1.0.0 Flask-APScheduler == 1.12.4 diff --git a/services/TS29222_CAPIF_Auditing_API/requirements.txt b/services/TS29222_CAPIF_Auditing_API/requirements.txt index 197399f..18fd92f 100644 --- a/services/TS29222_CAPIF_Auditing_API/requirements.txt +++ b/services/TS29222_CAPIF_Auditing_API/requirements.txt @@ -1,9 +1,9 @@ connexion[swagger-ui] == 2.14.2; python_version>="3.6" swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 -setuptools >= 21.0.0 +setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.0.1 +pymongo == 4.3.3 elasticsearch == 8.4.3 flask_jwt_extended == 4.4.4 opentelemetry-instrumentation == 0.38b0 @@ -17,4 +17,5 @@ fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 -pyopenssl == 23.0.0 +cryptography == 42.0.8 +Werkzeug == 2.2.3 diff --git a/services/TS29222_CAPIF_Discover_Service_API/requirements.txt b/services/TS29222_CAPIF_Discover_Service_API/requirements.txt index 33a22f4..8e4d2e2 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/requirements.txt +++ b/services/TS29222_CAPIF_Discover_Service_API/requirements.txt @@ -1,11 +1,11 @@ connexion[swagger-ui] == 2.14.2; python_version>="3.6" swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 -setuptools >= 21.0.0 +setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.0.1 +pymongo == 4.3.3 flask_jwt_extended == 4.4.4 -pyopenssl == 23.0.0 +cryptography == 42.0.8 rfc3987 == 1.3.8 redis == 4.5.4 opentelemetry-instrumentation == 0.38b0 @@ -19,4 +19,5 @@ fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 -flask_executor == 1.0.0 \ No newline at end of file +flask_executor == 1.0.0 +Werkzeug == 2.2.3 \ No newline at end of file diff --git a/services/TS29222_CAPIF_Events_API/requirements.txt b/services/TS29222_CAPIF_Events_API/requirements.txt index 743f814..e75e20a 100644 --- a/services/TS29222_CAPIF_Events_API/requirements.txt +++ b/services/TS29222_CAPIF_Events_API/requirements.txt @@ -1,9 +1,9 @@ connexion[swagger-ui] == 2.14.2; python_version>="3.6" swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 -setuptools >= 21.0.0 +setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.0.1 +pymongo == 4.3.3 opentelemetry-instrumentation == 0.38b0 opentelemetry-instrumentation-flask == 0.38b0 opentelemetry-instrumentation-redis == 0.38b0 @@ -16,10 +16,11 @@ opentelemetry-api == 1.17.0 opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 flask_jwt_extended -pyopenssl -rfc3987 -redis -flask_executor -Flask-APScheduler -aiohttp==3.9.5 -async-timeout==4.0.3 +cryptography == 42.0.8 +rfc3987 == 1.3.8 +redis == 4.5.4 +flask_executor == 1.0.0 +Flask-APScheduler == 1.12.4 +aiohttp == 3.9.5 +async-timeout == 4.0.3 +Werkzeug == 2.2.3 diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt b/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt index 0dfa8b6..af0caa0 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt @@ -1,9 +1,9 @@ connexion[swagger-ui] == 2.14.2; python_version>="3.6" swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 -setuptools >= 21.0.0 +setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.0.1 +pymongo == 4.3.3 elasticsearch == 8.4.3 flask_jwt_extended == 4.4.4 redis == 4.5.4 @@ -18,4 +18,5 @@ fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 -pyopenssl == 23.0.0 +cryptography == 42.0.8 +Werkzeug == 2.2.3 diff --git a/services/TS29222_CAPIF_Publish_Service_API/requirements.txt b/services/TS29222_CAPIF_Publish_Service_API/requirements.txt index 0ba8fb5..076261e 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/requirements.txt +++ b/services/TS29222_CAPIF_Publish_Service_API/requirements.txt @@ -1,9 +1,9 @@ connexion[swagger-ui] == 2.14.2; python_version>="3.6" swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 -setuptools >= 21.0.0 +setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.0.1 +pymongo == 4.3.3 flask_jwt_extended == 4.4.4 opentelemetry-instrumentation == 0.38b0 opentelemetry-instrumentation-flask == 0.38b0 @@ -16,6 +16,7 @@ fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 -pyopenssl == 23.0.0 +cryptography == 42.0.8 redis == 4.5.4 flask_executor == 1.0.0 +Werkzeug == 2.2.3 diff --git a/services/TS29222_CAPIF_Routing_Info_API/requirements.txt b/services/TS29222_CAPIF_Routing_Info_API/requirements.txt index 1be0346..47ce074 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/requirements.txt +++ b/services/TS29222_CAPIF_Routing_Info_API/requirements.txt @@ -1,5 +1,6 @@ connexion[swagger-ui] == 2.14.2; python_version>="3.6" swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 -setuptools >= 21.0.0 +setuptools == 68.2.2 Flask == 2.0.3 +Werkzeug == 2.2.3 diff --git a/services/TS29222_CAPIF_Security_API/requirements.txt b/services/TS29222_CAPIF_Security_API/requirements.txt index 220adaf..2fde469 100644 --- a/services/TS29222_CAPIF_Security_API/requirements.txt +++ b/services/TS29222_CAPIF_Security_API/requirements.txt @@ -1,11 +1,11 @@ connexion[swagger-ui] == 2.14.2; python_version>="3.6" swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 -setuptools >= 21.0.0 +setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.0.1 +pymongo == 4.3.3 flask_jwt_extended == 4.4.4 -pyopenssl == 23.0.0 +cryptography == 42.0.8 rfc3987 == 1.3.8 redis == 4.5.4 flask_executor == 1.0.0 @@ -19,4 +19,5 @@ fluent == 0.10.0 fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 opentelemetry-sdk == 1.17.0 -flask_executor == 1.0.0 \ No newline at end of file +flask_executor == 1.0.0 +Werkzeug == 2.2.3 \ No newline at end of file diff --git a/services/helper/requirements.txt b/services/helper/requirements.txt index 68d82b2..563f6a3 100644 --- a/services/helper/requirements.txt +++ b/services/helper/requirements.txt @@ -1,7 +1,7 @@ python_dateutil == 2.9.0.post0 setuptools == 68.2.2 Flask == 3.0.3 -pymongo == 4.0.1 +pymongo == 4.3.3 flask_jwt_extended == 4.6.0 pyopenssl == 24.1.0 pyyaml == 6.0.1 diff --git a/services/register/requirements.txt b/services/register/requirements.txt index c5446a6..acd7136 100644 --- a/services/register/requirements.txt +++ b/services/register/requirements.txt @@ -1,10 +1,10 @@ python_dateutil >= 2.6.0 -setuptools >= 21.0.0 -Flask >= 2.0.3 -pymongo == 4.0.1 -flask_jwt_extended -pyopenssl -pyyaml -requests -bcrypt -flask_httpauth \ No newline at end of file +setuptools == 68.2.2 +Flask == 3.0.3 +pymongo == 4.3.3 +flask_jwt_extended == 4.6.0 +pyopenssl == 24.1.0 +pyyaml == 6.0.1 +requests == 2.32.2 +bcrypt == 4.0.1 +flask_httpauth == 4.8.0 diff --git a/tools/robot/basicRequirements.txt b/tools/robot/basicRequirements.txt index aa3e60e..8b56d92 100644 --- a/tools/robot/basicRequirements.txt +++ b/tools/robot/basicRequirements.txt @@ -1,103 +1,103 @@ # Requirements needed when generating releases. See BUILD.rst for details. -appdirs==1.4.4 -argh==0.26.2 -arrow==1.2.3 -async-generator==1.10 -async-timeout==4.0.2 -attrs==22.1.0 -bcrypt==4.0.1 -beautifulsoup4==4.11.1 -binaryornot==0.4.4 -bson==0.5.10 -certifi==2021.10.8 -cffi==1.15.1 -chardet==5.0.0 -charset-normalizer==2.0.12 -click==8.1.7 -configparser==5.3.0 -cookiecutter==2.1.1 -coverage==4.5.4 -cryptography==38.0.1 -Deprecated==1.2.13 -distlib==0.3.6 -dnspython==2.2.1 -docutils==0.19 -exceptiongroup==1.0.0rc9 -filelock==3.8.0 -flake8==3.9.2 -flask==3.0.3 -h11==0.14.0 -idna==3.4 -iniconfig==1.1.1 -invoke==1.6.0 -ipaddress==1.0.23 -Jinja2==3.1.2 -jinja2-time==0.2.0 -lxml==4.9.1 -MarkupSafe==2.1.1 -mccabe==0.6.1 -numpy==1.23.4 -outcome==1.2.0 -packaging==21.3 -pandas==1.5.1 -paramiko==2.11.0 -pathtools==0.1.2 -platformdirs==2.5.2 -pluggy==0.13.1 -psutil==5.9.3 -py==1.11.0 -pyasn1==0.4.8 -pyasn1-modules==0.2.8 -pycodestyle==2.7.0 -pycparser==2.21 -pyflakes==2.3.1 -PyGithub==1.56 -PyJWT==2.6.0 -pymongo==4.3.2 -PyNaCl==1.5.0 -pyOpenSSL==22.1.0 -pyparsing==3.0.9 -PySocks==1.7.1 -pytest==6.2.4 -python-dateutil==2.8.2 -python-ldap==3.4.3 -python-slugify==6.1.2 -pythonping==1.1.3 -pytz==2022.5 -PyYAML==6.0 -redis==4.3.4 -rellu==0.7 -requests==2.28.1 -rfc3987==1.3.8 -robotframework==7.0 -robotframework-archivelibrary == 0.4.2 -robotframework-httpctrl==0.3.1 -robotframework-lint==1.1 -robotframework-mongodb-library==3.2 -robotframework-pythonlibcore==4.4.1 -robotframework-requests==0.9.3 -robotframework-seleniumlibrary==6.0.0 -robotframework-sshlibrary==3.8.0 -robotremoteserver==1.1 -scp==0.14.4 -selenium==4.5.0 -six==1.16.0 -sniffio==1.3.0 -sortedcontainers==2.4.0 -soupsieve==2.3.2.post1 -sshconf==0.2.5 -text-unidecode==1.3 -toml==0.10.2 -tomli==2.0.1 -tox==3.26.0 -tqdm==4.64.1 -trio==0.22.0 -trio-websocket==0.9.2 -typing-extensions==4.11.0 -urllib3==1.26.12 -virtualenv==20.16.5 -watchdog==4.0.0 -webdrivermanager==0.10.0 -wrapt==1.15.0 -wsproto==1.2.0 -xlrd==2.0.1 +appdirs == 1.4.4 +argh == 0.26.2 +arrow == 1.2.3 +async-generator == 1.10 +async-timeout == 4.0.2 +attrs == 22.1.0 +bcrypt == 4.0.1 +beautifulsoup4 == 4.11.1 +binaryornot == 0.4.4 +bson == 0.5.10 +certifi == 2021.10.8 +cffi == 1.15.1 +chardet == 5.0.0 +charset-normalizer == 2.0.12 +click == 8.1.7 +configparser == 5.3.0 +cookiecutter == 2.1.1 +coverage == 4.5.4 +cryptography == 42.0.8 +Deprecated == 1.2.13 +distlib == 0.3.6 +dnspython == 2.2.1 +docutils == 0.19 +exceptiongroup == 1.0.0rc9 +filelock == 3.8.0 +flake8 == 3.9.2 +flask == 3.0.3 +h11 == 0.14.0 +idna == 3.4 +iniconfig == 1.1.1 +invoke == 1.6.0 +ipaddress == 1.0.23 +Jinja2 == 3.1.2 +jinja2-time == 0.2.0 +lxml == 4.9.1 +MarkupSafe == 2.1.1 +mccabe == 0.6.1 +numpy == 1.23.4 +outcome == 1.2.0 +packaging == 21.3 +pandas == 1.5.1 +paramiko == 2.11.0 +pathtools == 0.1.2 +platformdirs == 2.5.2 +pluggy == 0.13.1 +psutil == 5.9.3 +py == 1.11.0 +pyasn1 == 0.4.8 +pyasn1-modules == 0.2.8 +pycodestyle == 2.7.0 +pycparser == 2.21 +pyflakes == 2.3.1 +PyGithub == 1.56 +PyJWT == 2.6.0 +pymongo == 4.3.3 +PyNaCl == 1.5.0 +pyOpenSSL == 24.1.0 +pyparsing == 3.0.9 +PySocks == 1.7.1 +pytest == 6.2.4 +python-dateutil == 2.8.2 +python-ldap == 3.4.3 +python-slugify == 6.1.2 +pythonping == 1.1.3 +pytz == 2022.5 +PyYAML == 6.0 +redis == 4.5.4 +rellu == 0.7 +requests == 2.28.1 +rfc3987 == 1.3.8 +robotframework == 7.0 +robotframework-archivelibrary == 0.4.2 +robotframework-httpctrl == 0.3.1 +robotframework-lint == 1.1 +robotframework-mongodb-library == 3.2 +robotframework-pythonlibcore == 4.4.1 +robotframework-requests == 0.9.3 +robotframework-seleniumlibrary == 6.0.0 +robotframework-sshlibrary == 3.8.0 +robotremoteserver == 1.1 +scp == 0.14.4 +selenium == 4.5.0 +six == 1.16.0 +sniffio == 1.3.0 +sortedcontainers == 2.4.0 +soupsieve == 2.3.2.post1 +sshconf == 0.2.5 +text-unidecode == 1.3 +toml == 0.10.2 +tomli == 2.0.1 +tox == 3.26.0 +tqdm == 4.64.1 +trio == 0.22.0 +trio-websocket == 0.9.2 +typing-extensions == 4.11.0 +urllib3 == 1.26.12 +virtualenv == 20.16.5 +watchdog == 4.0.0 +webdrivermanager == 0.10.0 +wrapt == 1.15.0 +wsproto == 1.2.0 +xlrd == 2.0.1 -- GitLab From be36f960614becf726f2a8851bf0798a499862ed Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Tue, 11 Jun 2024 16:13:08 +0200 Subject: [PATCH 2/6] Fix how MONITOTING Environment variable is checked at __main___ code on each service --- .../api_invoker_management/__main__.py | 3 ++- .../api_provider_management/__main__.py | 3 ++- .../openapi_server/__main__.py | 4 ++-- services/TS29222_CAPIF_Auditing_API/logs/__main__.py | 3 ++- .../service_apis/__main__.py | 3 ++- services/TS29222_CAPIF_Events_API/capif_events/__main__.py | 3 ++- .../capif_events/models/routing_rule.py | 4 ---- .../api_invocation_logs/__main__.py | 3 ++- .../published_apis/__main__.py | 3 ++- .../capif_routing_info/models/ipv4_address_range.py | 4 ++-- .../capif_routing_info/models/routing_rule.py | 4 ---- .../TS29222_CAPIF_Security_API/capif_security/__main__.py | 3 ++- services/clean_capif_docker_services.sh | 2 +- services/run.sh | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/__main__.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/__main__.py index 32ccc2e..84f93cd 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/__main__.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/__main__.py @@ -136,7 +136,8 @@ config = Config() jwt = JWTManager(app.app) configure_logging(app.app) -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": configure_monitoring(app.app, config.get_config()) executor = Executor(app.app) diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/__main__.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/__main__.py index f52d69c..ee71416 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/__main__.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/__main__.py @@ -120,7 +120,8 @@ def main(): config = Config() configure_logging(app.app) - if eval(os.environ.get("MONITORING").lower().capitalize()): + monitoring_value = os.environ.get("MONITORING", "").lower() + if monitoring_value == "true": configure_monitoring(app.app, config.get_config()) app.app.config['JWT_ALGORITHM'] = 'RS256' diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/__main__.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/__main__.py index 215e85e..ae9ad7e 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/__main__.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/__main__.py @@ -125,8 +125,8 @@ config = Config() jwt = JWTManager(app.app) configure_logging(app.app) - -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": configure_monitoring(app.app, config.get_config()) app.app.config["invocations"]=config.get_config()["invocations"] diff --git a/services/TS29222_CAPIF_Auditing_API/logs/__main__.py b/services/TS29222_CAPIF_Auditing_API/logs/__main__.py index 385f0b5..ac6df6d 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/__main__.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/__main__.py @@ -109,7 +109,8 @@ app.add_api('openapi.yaml', configure_logging(app.app) config = Config() -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": configure_monitoring(app.app, config.get_config()) if __name__ == '__main__': diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/__main__.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/__main__.py index 57326e9..84523da 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/__main__.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/__main__.py @@ -121,7 +121,8 @@ configure_logging(app.app) config = Config() -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": configure_monitoring(app.app, config.get_config()) jwt = JWTManager(app.app) diff --git a/services/TS29222_CAPIF_Events_API/capif_events/__main__.py b/services/TS29222_CAPIF_Events_API/capif_events/__main__.py index 1e602ef..b566f66 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/__main__.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/__main__.py @@ -134,7 +134,8 @@ notifications = Notifications() jwt = JWTManager(app.app) configure_logging(app.app) -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": configure_monitoring(app.app, config.get_config()) config = Config() diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py b/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py index 7ff1d4e..a4e4d07 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py @@ -11,10 +11,6 @@ from capif_events.models.ipv4_address_range import Ipv4AddressRange from capif_events.models.ipv6_address_range import Ipv6AddressRange from capif_events import util -from capif_events.models.aef_profile import AefProfile # noqa: E501 -from capif_events.models.ipv4_address_range import Ipv4AddressRange # noqa: E501 -from capif_events.models.ipv6_address_range import Ipv6AddressRange # noqa: E501 - class RoutingRule(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/__main__.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/__main__.py index f5323c9..b992231 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/__main__.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/__main__.py @@ -113,7 +113,8 @@ configure_logging(app.app) config = Config() -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": configure_monitoring(app.app, config.get_config()) if __name__ == '__main__': diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/__main__.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/__main__.py index dfba9ef..aa5f60c 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/__main__.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/__main__.py @@ -127,7 +127,8 @@ config = Config() jwt = JWTManager(app.app) configure_logging(app.app) -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": configure_monitoring(app.app, config.get_config()) executor = Executor(app.app) diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py index 8bf4532..5f8e7c0 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py @@ -70,7 +70,7 @@ class Ipv4AddressRange(Model): :type start: str """ if start is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', start): # noqa: E501 - raise ValueError("Invalid value for `start`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`") # noqa: E501 + raise ValueError("Invalid value for `start`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`") # noqa: E501 self._start = start @@ -95,6 +95,6 @@ class Ipv4AddressRange(Model): :type end: str """ if end is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', end): # noqa: E501 - raise ValueError("Invalid value for `end`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`") # noqa: E501 + raise ValueError("Invalid value for `end`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`") # noqa: E501 self._end = end diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py index f177670..29c0930 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py @@ -11,10 +11,6 @@ from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange from capif_routing_info import util -from capif_routing_info.models.aef_profile import AefProfile # noqa: E501 -from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange # noqa: E501 -from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange # noqa: E501 - class RoutingRule(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Security_API/capif_security/__main__.py b/services/TS29222_CAPIF_Security_API/capif_security/__main__.py index 98d3964..26eec19 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/__main__.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/__main__.py @@ -131,7 +131,8 @@ def main(): config = Config() configure_logging(app.app) - if eval(os.environ.get("MONITORING").lower().capitalize()): + monitoring_value = os.environ.get("MONITORING", "").lower() + if monitoring_value == "true": configure_monitoring(app.app, config.get_config()) executor = Executor(app.app) diff --git a/services/clean_capif_docker_services.sh b/services/clean_capif_docker_services.sh index cfc5b71..617ffed 100755 --- a/services/clean_capif_docker_services.sh +++ b/services/clean_capif_docker_services.sh @@ -68,7 +68,7 @@ echo "${FILES[@]}" for FILE in "${FILES[@]}"; do echo "Executing 'docker compose down' for file $FILE" - docker compose -f "$FILE" down --rmi all + CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 DUID=$DUID DGID=$DGID MONITORING=$MONITORING_STATE docker compose -f "$FILE" down --rmi all status=$? if [ $status -eq 0 ]; then echo "*** Removed Service from $FILE ***" diff --git a/services/run.sh b/services/run.sh index 4465aaa..3053019 100755 --- a/services/run.sh +++ b/services/run.sh @@ -62,7 +62,7 @@ echo Nginx hostname will be $HOSTNAME, deploy $DEPLOY, monitoring $MONITORING_ST if [ "$MONITORING_STATE" == "true" ] ; then echo '***Monitoring set as true***' - echo '***Creating Monitoging stack***' + echo '***Creating Monitoring stack***' DUID=$DUID DGID=$DGID docker compose -f "../monitoring/docker-compose.yml" up --detach status=$? -- GitLab From 695e3535ca6c078a4b6973d821e0de88013936ce Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Wed, 12 Jun 2024 10:23:08 +0200 Subject: [PATCH 3/6] Fix some medium issues --- .../core/apiinvokerenrolmentdetails.py | 2 +- .../api_invoker_management/db/db.py | 3 ++- .../TS29222_CAPIF_API_Invoker_Management_API/config.yaml | 3 ++- .../api_provider_management/core/sign_certificate.py | 2 +- .../api_provider_management/db/db.py | 3 ++- .../TS29222_CAPIF_API_Provider_Management_API/config.yaml | 3 ++- .../openapi_server/db/db.py | 3 ++- services/TS29222_CAPIF_Auditing_API/logs/db/db.py | 3 ++- .../service_apis/db/db.py | 3 ++- services/TS29222_CAPIF_Events_API/capif_events/db/db.py | 3 ++- .../api_invocation_logs/db/db.py | 3 ++- .../published_apis/db/db.py | 3 ++- services/TS29222_CAPIF_Security_API/capif_security/db/db.py | 3 ++- services/helper/config.yaml | 3 ++- services/helper/helper_service/__main__.py | 4 ++-- services/register/config.yaml | 3 ++- services/register/register_service/__main__.py | 6 +++--- 17 files changed, 33 insertions(+), 20 deletions(-) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py index 3a8ec3f..9bad92e 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py @@ -41,7 +41,7 @@ class InvokerManagementOperations(Resource): 'common_name': invoker_id } - response = requests.request("POST", url, headers=headers, data=data, verify = False) + response = requests.request("POST", url, headers=headers, data=data, verify = self.config["ca_factory"].get("verify", False)) print(response) response_payload = json.loads(response.text) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py index 638cc80..b92280a 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py @@ -7,7 +7,8 @@ from bson.codec_options import CodecOptions import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": PymongoInstrumentor().instrument() class MongoDatabse(): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/config.yaml b/services/TS29222_CAPIF_API_Invoker_Management_API/config.yaml index 2a14561..3107e41 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/config.yaml +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/config.yaml @@ -12,7 +12,8 @@ mongo: { ca_factory: { "url": "vault", "port": "8200", - "token": "dev-only-token" + "token": "dev-only-token", + "verify": False } monitoring: { diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py index 6ec96cf..dff8006 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py @@ -16,7 +16,7 @@ def sign_certificate(publick_key, provider_id): 'common_name': provider_id } - response = requests.request("POST", url, headers=headers, data=json.dumps(data), verify = False) + response = requests.request("POST", url, headers=headers, data=json.dumps(data), verify = config["ca_factory"].get("verify", False)) response_payload = json.loads(response.text) return response_payload["data"]["certificate"] \ No newline at end of file diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py index a67e2ea..2eea8cc 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py @@ -7,7 +7,8 @@ from bson.codec_options import CodecOptions import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": PymongoInstrumentor().instrument() diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/config.yaml b/services/TS29222_CAPIF_API_Provider_Management_API/config.yaml index 7d1899a..ce684f3 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/config.yaml +++ b/services/TS29222_CAPIF_API_Provider_Management_API/config.yaml @@ -12,7 +12,8 @@ mongo: { ca_factory: { "url": "vault", "port": "8200", - "token": "dev-only-token" + "token": "dev-only-token", + "verify": False } diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/db/db.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/db/db.py index b25c794..843a421 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/db/db.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/db/db.py @@ -7,7 +7,8 @@ from bson.codec_options import CodecOptions import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": PymongoInstrumentor().instrument() class MongoDatabse(): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/db/db.py b/services/TS29222_CAPIF_Auditing_API/logs/db/db.py index f3286d2..b2fc38c 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/db/db.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/db/db.py @@ -7,7 +7,8 @@ from bson.codec_options import CodecOptions import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": PymongoInstrumentor().instrument() diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py index 5445455..bd3b28c 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py @@ -7,7 +7,8 @@ from bson.codec_options import CodecOptions import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": PymongoInstrumentor().instrument() class MongoDatabse(): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/db/db.py b/services/TS29222_CAPIF_Events_API/capif_events/db/db.py index 2f4d119..be7bf39 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/db/db.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/db/db.py @@ -7,7 +7,8 @@ from bson.codec_options import CodecOptions import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": PymongoInstrumentor().instrument() diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py index 96a39f3..17daff1 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py @@ -7,7 +7,8 @@ from bson.codec_options import CodecOptions import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": PymongoInstrumentor().instrument() diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py index 91f7b6b..23ee4a2 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py @@ -7,7 +7,8 @@ from bson.codec_options import CodecOptions import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": PymongoInstrumentor().instrument() diff --git a/services/TS29222_CAPIF_Security_API/capif_security/db/db.py b/services/TS29222_CAPIF_Security_API/capif_security/db/db.py index dbbb99e..d537657 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/db/db.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/db/db.py @@ -7,7 +7,8 @@ from bson.codec_options import CodecOptions import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": PymongoInstrumentor().instrument() diff --git a/services/helper/config.yaml b/services/helper/config.yaml index 46e5801..bb090f0 100644 --- a/services/helper/config.yaml +++ b/services/helper/config.yaml @@ -14,5 +14,6 @@ mongo: { ca_factory: { "url": "vault", "port": "8200", - "token": "dev-only-token" + "token": "dev-only-token", + "verify": False } diff --git a/services/helper/helper_service/__main__.py b/services/helper/helper_service/__main__.py index 69411aa..c2f6e39 100644 --- a/services/helper/helper_service/__main__.py +++ b/services/helper/helper_service/__main__.py @@ -40,7 +40,7 @@ data = { 'common_name': "superadmin" } -response = requests.request("POST", url, headers=headers, data=data, verify = False) +response = requests.request("POST", url, headers=headers, data=data, verify = config["ca_factory"].get("verify", False)) superadmin_cert = json.loads(response.text)['data']['certificate'] # Save the superadmin certificate @@ -53,7 +53,7 @@ headers = { 'X-Vault-Token': config['ca_factory']['token'] } -response = requests.request("GET", url, headers=headers, verify = False) +response = requests.request("GET", url, headers=headers, verify = config["ca_factory"].get("verify", False)) ca_root = json.loads(response.text)['data']['data']['ca'] cert_file = open("helper_service/certs/ca_root.crt", 'wb') diff --git a/services/register/config.yaml b/services/register/config.yaml index f63df9f..d44e09f 100644 --- a/services/register/config.yaml +++ b/services/register/config.yaml @@ -10,7 +10,8 @@ mongo: { ca_factory: { "url": "vault", "port": "8200", - "token": "dev-only-token" + "token": "dev-only-token", + "verify": False } register: { diff --git a/services/register/register_service/__main__.py b/services/register/register_service/__main__.py index 7554fa2..612b031 100644 --- a/services/register/register_service/__main__.py +++ b/services/register/register_service/__main__.py @@ -44,7 +44,7 @@ data = { 'common_name': "superadmin" } -response = requests.request("POST", url, headers=headers, data=data, verify = False) +response = requests.request("POST", url, headers=headers, data=data, verify = config["ca_factory"].get("verify", False)) superadmin_cert = json.loads(response.text)['data']['certificate'] # Save the superadmin certificate @@ -57,7 +57,7 @@ headers = { 'X-Vault-Token': config['ca_factory']['token'] } -response = requests.request("GET", url, headers=headers, verify = False) +response = requests.request("GET", url, headers=headers, verify = config["ca_factory"].get("verify", False)) ca_root = json.loads(response.text)['data']['data']['ca'] cert_file = open("register_service/certs/ca_root.crt", 'wb') @@ -67,7 +67,7 @@ cert_file.close() # Request CAPIF private key to encode the CAPIF token url = 'http://{}:{}/v1/secret/data/server_cert/private'.format(config["ca_factory"]["url"], config["ca_factory"]["port"]) headers = {'X-Vault-Token': f"{config["ca_factory"]["token"]}"} -response = requests.request("GET", url, headers=headers, verify = False) +response = requests.request("GET", url, headers=headers, verify = config["ca_factory"].get("verify", False)) key_data = json.loads(response.text)["data"]["data"]["key"] -- GitLab From 7af7c1802dbd8f0dde849539c4c53351f794d066 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Wed, 12 Jun 2024 10:46:26 +0200 Subject: [PATCH 4/6] Upgrade pymongo library to solve some security risks --- .../TS29222_CAPIF_API_Invoker_Management_API/requirements.txt | 2 +- .../TS29222_CAPIF_API_Provider_Management_API/requirements.txt | 2 +- .../TS29222_CAPIF_Access_Control_Policy_API/requirements.txt | 2 +- services/TS29222_CAPIF_Auditing_API/requirements.txt | 2 +- services/TS29222_CAPIF_Discover_Service_API/requirements.txt | 2 +- services/TS29222_CAPIF_Events_API/requirements.txt | 2 +- .../TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt | 2 +- services/TS29222_CAPIF_Publish_Service_API/requirements.txt | 2 +- services/TS29222_CAPIF_Security_API/requirements.txt | 2 +- services/helper/requirements.txt | 2 +- services/register/requirements.txt | 2 +- tools/robot/basicRequirements.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt b/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt index 49bdd94..d6cb4ae 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt @@ -3,7 +3,7 @@ swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 flask_jwt_extended == 4.4.4 cryptography == 42.0.8 rfc3987 == 1.3.8 diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt b/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt index b44401b..03fc57f 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt +++ b/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt @@ -3,7 +3,7 @@ swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 redis == 4.5.4 flask_jwt_extended == 4.4.4 cryptography == 42.0.8 diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt b/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt index 1c80c12..e336fd8 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt @@ -4,7 +4,7 @@ swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 flask_jwt_extended == 4.4.4 opentelemetry-instrumentation == 0.38b0 opentelemetry-instrumentation-flask == 0.38b0 diff --git a/services/TS29222_CAPIF_Auditing_API/requirements.txt b/services/TS29222_CAPIF_Auditing_API/requirements.txt index 18fd92f..d6dacc0 100644 --- a/services/TS29222_CAPIF_Auditing_API/requirements.txt +++ b/services/TS29222_CAPIF_Auditing_API/requirements.txt @@ -3,7 +3,7 @@ swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 elasticsearch == 8.4.3 flask_jwt_extended == 4.4.4 opentelemetry-instrumentation == 0.38b0 diff --git a/services/TS29222_CAPIF_Discover_Service_API/requirements.txt b/services/TS29222_CAPIF_Discover_Service_API/requirements.txt index 8e4d2e2..61747f2 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/requirements.txt +++ b/services/TS29222_CAPIF_Discover_Service_API/requirements.txt @@ -3,7 +3,7 @@ swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 flask_jwt_extended == 4.4.4 cryptography == 42.0.8 rfc3987 == 1.3.8 diff --git a/services/TS29222_CAPIF_Events_API/requirements.txt b/services/TS29222_CAPIF_Events_API/requirements.txt index e75e20a..efc0c6f 100644 --- a/services/TS29222_CAPIF_Events_API/requirements.txt +++ b/services/TS29222_CAPIF_Events_API/requirements.txt @@ -3,7 +3,7 @@ swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 opentelemetry-instrumentation == 0.38b0 opentelemetry-instrumentation-flask == 0.38b0 opentelemetry-instrumentation-redis == 0.38b0 diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt b/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt index af0caa0..2de683c 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt @@ -3,7 +3,7 @@ swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 elasticsearch == 8.4.3 flask_jwt_extended == 4.4.4 redis == 4.5.4 diff --git a/services/TS29222_CAPIF_Publish_Service_API/requirements.txt b/services/TS29222_CAPIF_Publish_Service_API/requirements.txt index 076261e..1690fde 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/requirements.txt +++ b/services/TS29222_CAPIF_Publish_Service_API/requirements.txt @@ -3,7 +3,7 @@ swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 flask_jwt_extended == 4.4.4 opentelemetry-instrumentation == 0.38b0 opentelemetry-instrumentation-flask == 0.38b0 diff --git a/services/TS29222_CAPIF_Security_API/requirements.txt b/services/TS29222_CAPIF_Security_API/requirements.txt index 2fde469..45a43d6 100644 --- a/services/TS29222_CAPIF_Security_API/requirements.txt +++ b/services/TS29222_CAPIF_Security_API/requirements.txt @@ -3,7 +3,7 @@ swagger-ui-bundle >= 0.0.2 python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 2.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 flask_jwt_extended == 4.4.4 cryptography == 42.0.8 rfc3987 == 1.3.8 diff --git a/services/helper/requirements.txt b/services/helper/requirements.txt index 563f6a3..dbe8a48 100644 --- a/services/helper/requirements.txt +++ b/services/helper/requirements.txt @@ -1,7 +1,7 @@ python_dateutil == 2.9.0.post0 setuptools == 68.2.2 Flask == 3.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 flask_jwt_extended == 4.6.0 pyopenssl == 24.1.0 pyyaml == 6.0.1 diff --git a/services/register/requirements.txt b/services/register/requirements.txt index acd7136..e9b85df 100644 --- a/services/register/requirements.txt +++ b/services/register/requirements.txt @@ -1,7 +1,7 @@ python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 3.0.3 -pymongo == 4.3.3 +pymongo == 4.7.3 flask_jwt_extended == 4.6.0 pyopenssl == 24.1.0 pyyaml == 6.0.1 diff --git a/tools/robot/basicRequirements.txt b/tools/robot/basicRequirements.txt index 8b56d92..06e5cc2 100644 --- a/tools/robot/basicRequirements.txt +++ b/tools/robot/basicRequirements.txt @@ -53,7 +53,7 @@ pycparser == 2.21 pyflakes == 2.3.1 PyGithub == 1.56 PyJWT == 2.6.0 -pymongo == 4.3.3 +pymongo == 4.7.3 PyNaCl == 1.5.0 pyOpenSSL == 24.1.0 pyparsing == 3.0.9 -- GitLab From 8be103004396ba2080a4d6e6e1939a97ecd70b22 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Fri, 21 Jun 2024 11:04:51 +0200 Subject: [PATCH 5/6] upgrade some versions and requirements refactor --- .../requirements.txt | 6 +++--- .../test-requirements.txt | 4 ++-- .../requirements.txt | 4 ++-- .../test-requirements.txt | 4 ++-- .../requirements.txt | 6 +++--- .../test-requirements.txt | 2 +- services/TS29222_CAPIF_Auditing_API/requirements.txt | 6 +++--- services/TS29222_CAPIF_Auditing_API/test-requirements.txt | 4 ++-- .../TS29222_CAPIF_Discover_Service_API/requirements.txt | 6 +++--- .../test-requirements.txt | 4 ++-- services/TS29222_CAPIF_Events_API/requirements.txt | 6 +++--- services/TS29222_CAPIF_Events_API/test-requirements.txt | 4 ++-- .../requirements.txt | 6 +++--- .../test-requirements.txt | 4 ++-- services/TS29222_CAPIF_Publish_Service_API/requirements.txt | 6 +++--- .../TS29222_CAPIF_Publish_Service_API/test-requirements.txt | 4 ++-- services/TS29222_CAPIF_Routing_Info_API/requirements.txt | 4 ++-- .../TS29222_CAPIF_Routing_Info_API/test-requirements.txt | 4 ++-- services/TS29222_CAPIF_Security_API/requirements.txt | 6 +++--- services/TS29222_CAPIF_Security_API/test-requirements.txt | 4 ++-- services/helper/requirements.txt | 4 ++-- services/mock_server/requirements.txt | 2 +- services/register/requirements.txt | 4 ++-- 23 files changed, 52 insertions(+), 52 deletions(-) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt b/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt index ae88000..dbf0f19 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt @@ -13,12 +13,12 @@ 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.17.0 +opentelemetry-exporter-jaeger == 1.17.0 fluent == 0.10.0 fluent-logger == 0.10.0 opentelemetry-api == 1.19.0 opentelemetry-sdk == 1.19.0 flask_executor == 1.0.0 Werkzeug == 2.2.3 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/test-requirements.txt b/services/TS29222_CAPIF_API_Invoker_Management_API/test-requirements.txt index 0970f28..202a684 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/test-requirements.txt +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/test-requirements.txt @@ -1,4 +1,4 @@ pytest~=4.6.7 # needed for python 2.7+3.4 pytest-cov>=2.8.1 -pytest-randomly==1.2.3 # needed for python 2.7+3.4 -Flask-Testing==0.8.0 +pytest-randomly == 1.2.3 # needed for python 2.7+3.4 +Flask-Testing == 0.8.0 diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt b/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt index aa6fdc5..a5c9cce 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt +++ b/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt @@ -19,5 +19,5 @@ opentelemetry-api == 1.17.0 opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 Werkzeug == 2.2.3 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/test-requirements.txt b/services/TS29222_CAPIF_API_Provider_Management_API/test-requirements.txt index 0970f28..202a684 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/test-requirements.txt +++ b/services/TS29222_CAPIF_API_Provider_Management_API/test-requirements.txt @@ -1,4 +1,4 @@ pytest~=4.6.7 # needed for python 2.7+3.4 pytest-cov>=2.8.1 -pytest-randomly==1.2.3 # needed for python 2.7+3.4 -Flask-Testing==0.8.0 +pytest-randomly == 1.2.3 # needed for python 2.7+3.4 +Flask-Testing == 0.8.0 diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt b/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt index 8457c82..2e82931 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt @@ -11,7 +11,7 @@ opentelemetry-instrumentation-flask == 0.38b0 opentelemetry-instrumentation-redis == 0.38b0 opentelemetry-instrumentation-pymongo == 0.38b0 opentelemetry-exporter-otlp == 1.17.0 -opentelemetry-exporter-jaeger==1.17.0 +opentelemetry-exporter-jaeger == 1.17.0 fluent == 0.10.0 fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 @@ -22,5 +22,5 @@ redis == 4.5.4 flask_executor == 1.0.0 Flask-APScheduler == 1.12.4 Flask-Script == 2.0.6 -gunicorn==22.0.0 -packaging==24.0 \ No newline at end of file +gunicorn == 22.0.0 +packaging == 24.0 \ No newline at end of file diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/test-requirements.txt b/services/TS29222_CAPIF_Access_Control_Policy_API/test-requirements.txt index 58f51d6..422ece8 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/test-requirements.txt +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/test-requirements.txt @@ -1,4 +1,4 @@ pytest~=7.1.0 pytest-cov>=2.8.1 pytest-randomly>=1.2.3 -Flask-Testing==0.8.1 +Flask-Testing == 0.8.1 diff --git a/services/TS29222_CAPIF_Auditing_API/requirements.txt b/services/TS29222_CAPIF_Auditing_API/requirements.txt index 4ed2ea2..c2ef0b4 100644 --- a/services/TS29222_CAPIF_Auditing_API/requirements.txt +++ b/services/TS29222_CAPIF_Auditing_API/requirements.txt @@ -11,7 +11,7 @@ opentelemetry-instrumentation-flask == 0.38b0 opentelemetry-instrumentation-redis == 0.38b0 opentelemetry-instrumentation-pymongo == 0.38b0 opentelemetry-exporter-otlp == 1.17.0 -opentelemetry-exporter-jaeger==1.17.0 +opentelemetry-exporter-jaeger == 1.17.0 fluent == 0.10.0 fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 @@ -20,5 +20,5 @@ flask_executor == 1.0.0 cryptography == 42.0.8 Werkzeug == 2.2.3 pyopenssl == 24.1.0 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 diff --git a/services/TS29222_CAPIF_Auditing_API/test-requirements.txt b/services/TS29222_CAPIF_Auditing_API/test-requirements.txt index 0970f28..202a684 100644 --- a/services/TS29222_CAPIF_Auditing_API/test-requirements.txt +++ b/services/TS29222_CAPIF_Auditing_API/test-requirements.txt @@ -1,4 +1,4 @@ pytest~=4.6.7 # needed for python 2.7+3.4 pytest-cov>=2.8.1 -pytest-randomly==1.2.3 # needed for python 2.7+3.4 -Flask-Testing==0.8.0 +pytest-randomly == 1.2.3 # needed for python 2.7+3.4 +Flask-Testing == 0.8.0 diff --git a/services/TS29222_CAPIF_Discover_Service_API/requirements.txt b/services/TS29222_CAPIF_Discover_Service_API/requirements.txt index ea568fc..1c57f79 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/requirements.txt +++ b/services/TS29222_CAPIF_Discover_Service_API/requirements.txt @@ -13,7 +13,7 @@ opentelemetry-instrumentation-flask == 0.38b0 opentelemetry-instrumentation-redis == 0.38b0 opentelemetry-instrumentation-pymongo == 0.38b0 opentelemetry-exporter-otlp == 1.17.0 -opentelemetry-exporter-jaeger==1.17.0 +opentelemetry-exporter-jaeger == 1.17.0 fluent == 0.10.0 fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 @@ -21,5 +21,5 @@ opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 flask_executor == 1.0.0 Werkzeug == 2.2.3 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 diff --git a/services/TS29222_CAPIF_Discover_Service_API/test-requirements.txt b/services/TS29222_CAPIF_Discover_Service_API/test-requirements.txt index 0970f28..202a684 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/test-requirements.txt +++ b/services/TS29222_CAPIF_Discover_Service_API/test-requirements.txt @@ -1,4 +1,4 @@ pytest~=4.6.7 # needed for python 2.7+3.4 pytest-cov>=2.8.1 -pytest-randomly==1.2.3 # needed for python 2.7+3.4 -Flask-Testing==0.8.0 +pytest-randomly == 1.2.3 # needed for python 2.7+3.4 +Flask-Testing == 0.8.0 diff --git a/services/TS29222_CAPIF_Events_API/requirements.txt b/services/TS29222_CAPIF_Events_API/requirements.txt index 63d456f..22b0d35 100644 --- a/services/TS29222_CAPIF_Events_API/requirements.txt +++ b/services/TS29222_CAPIF_Events_API/requirements.txt @@ -9,7 +9,7 @@ opentelemetry-instrumentation-flask == 0.38b0 opentelemetry-instrumentation-redis == 0.38b0 opentelemetry-instrumentation-pymongo == 0.38b0 opentelemetry-exporter-otlp == 1.17.0 -opentelemetry-exporter-jaeger==1.17.0 +opentelemetry-exporter-jaeger == 1.17.0 fluent == 0.10.0 fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 @@ -24,5 +24,5 @@ aiohttp == 3.9.5 async-timeout == 4.0.3 Werkzeug == 2.2.3 pyopenssl == 24.1.0 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 diff --git a/services/TS29222_CAPIF_Events_API/test-requirements.txt b/services/TS29222_CAPIF_Events_API/test-requirements.txt index 0970f28..202a684 100644 --- a/services/TS29222_CAPIF_Events_API/test-requirements.txt +++ b/services/TS29222_CAPIF_Events_API/test-requirements.txt @@ -1,4 +1,4 @@ pytest~=4.6.7 # needed for python 2.7+3.4 pytest-cov>=2.8.1 -pytest-randomly==1.2.3 # needed for python 2.7+3.4 -Flask-Testing==0.8.0 +pytest-randomly == 1.2.3 # needed for python 2.7+3.4 +Flask-Testing == 0.8.0 diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt b/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt index e01a501..e92ae36 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt @@ -12,7 +12,7 @@ opentelemetry-instrumentation-flask == 0.38b0 opentelemetry-instrumentation-redis == 0.38b0 opentelemetry-instrumentation-pymongo == 0.38b0 opentelemetry-exporter-otlp == 1.17.0 -opentelemetry-exporter-jaeger==1.17.0 +opentelemetry-exporter-jaeger == 1.17.0 fluent == 0.10.0 fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 @@ -21,5 +21,5 @@ flask_executor == 1.0.0 cryptography == 42.0.8 Werkzeug == 2.2.3 pyopenssl == 24.1.0 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/test-requirements.txt b/services/TS29222_CAPIF_Logging_API_Invocation_API/test-requirements.txt index 0970f28..202a684 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/test-requirements.txt +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/test-requirements.txt @@ -1,4 +1,4 @@ pytest~=4.6.7 # needed for python 2.7+3.4 pytest-cov>=2.8.1 -pytest-randomly==1.2.3 # needed for python 2.7+3.4 -Flask-Testing==0.8.0 +pytest-randomly == 1.2.3 # needed for python 2.7+3.4 +Flask-Testing == 0.8.0 diff --git a/services/TS29222_CAPIF_Publish_Service_API/requirements.txt b/services/TS29222_CAPIF_Publish_Service_API/requirements.txt index 1026f85..0b1b9e8 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/requirements.txt +++ b/services/TS29222_CAPIF_Publish_Service_API/requirements.txt @@ -10,7 +10,7 @@ opentelemetry-instrumentation-flask == 0.38b0 opentelemetry-instrumentation-redis == 0.38b0 opentelemetry-instrumentation-pymongo == 0.38b0 opentelemetry-exporter-otlp == 1.17.0 -opentelemetry-exporter-jaeger==1.17.0 +opentelemetry-exporter-jaeger == 1.17.0 fluent == 0.10.0 fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 @@ -20,5 +20,5 @@ cryptography == 42.0.8 redis == 4.5.4 flask_executor == 1.0.0 Werkzeug == 2.2.3 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 diff --git a/services/TS29222_CAPIF_Publish_Service_API/test-requirements.txt b/services/TS29222_CAPIF_Publish_Service_API/test-requirements.txt index 0970f28..202a684 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/test-requirements.txt +++ b/services/TS29222_CAPIF_Publish_Service_API/test-requirements.txt @@ -1,4 +1,4 @@ pytest~=4.6.7 # needed for python 2.7+3.4 pytest-cov>=2.8.1 -pytest-randomly==1.2.3 # needed for python 2.7+3.4 -Flask-Testing==0.8.0 +pytest-randomly == 1.2.3 # needed for python 2.7+3.4 +Flask-Testing == 0.8.0 diff --git a/services/TS29222_CAPIF_Routing_Info_API/requirements.txt b/services/TS29222_CAPIF_Routing_Info_API/requirements.txt index f046aef..afaac68 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/requirements.txt +++ b/services/TS29222_CAPIF_Routing_Info_API/requirements.txt @@ -4,5 +4,5 @@ python_dateutil >= 2.6.0 setuptools == 68.2.2 Flask == 2.0.3 Werkzeug == 2.2.3 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 diff --git a/services/TS29222_CAPIF_Routing_Info_API/test-requirements.txt b/services/TS29222_CAPIF_Routing_Info_API/test-requirements.txt index 0970f28..202a684 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/test-requirements.txt +++ b/services/TS29222_CAPIF_Routing_Info_API/test-requirements.txt @@ -1,4 +1,4 @@ pytest~=4.6.7 # needed for python 2.7+3.4 pytest-cov>=2.8.1 -pytest-randomly==1.2.3 # needed for python 2.7+3.4 -Flask-Testing==0.8.0 +pytest-randomly == 1.2.3 # needed for python 2.7+3.4 +Flask-Testing == 0.8.0 diff --git a/services/TS29222_CAPIF_Security_API/requirements.txt b/services/TS29222_CAPIF_Security_API/requirements.txt index 3763534..b92f321 100644 --- a/services/TS29222_CAPIF_Security_API/requirements.txt +++ b/services/TS29222_CAPIF_Security_API/requirements.txt @@ -14,12 +14,12 @@ opentelemetry-instrumentation-flask == 0.38b0 opentelemetry-instrumentation-redis == 0.38b0 opentelemetry-instrumentation-pymongo == 0.38b0 opentelemetry-exporter-otlp == 1.17.0 -opentelemetry-exporter-jaeger==1.17.0 +opentelemetry-exporter-jaeger == 1.17.0 fluent == 0.10.0 fluent-logger == 0.10.0 opentelemetry-api == 1.17.0 opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 Werkzeug == 2.2.3 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 diff --git a/services/TS29222_CAPIF_Security_API/test-requirements.txt b/services/TS29222_CAPIF_Security_API/test-requirements.txt index 0970f28..202a684 100644 --- a/services/TS29222_CAPIF_Security_API/test-requirements.txt +++ b/services/TS29222_CAPIF_Security_API/test-requirements.txt @@ -1,4 +1,4 @@ pytest~=4.6.7 # needed for python 2.7+3.4 pytest-cov>=2.8.1 -pytest-randomly==1.2.3 # needed for python 2.7+3.4 -Flask-Testing==0.8.0 +pytest-randomly == 1.2.3 # needed for python 2.7+3.4 +Flask-Testing == 0.8.0 diff --git a/services/helper/requirements.txt b/services/helper/requirements.txt index d51eb7e..23c2931 100644 --- a/services/helper/requirements.txt +++ b/services/helper/requirements.txt @@ -6,5 +6,5 @@ flask_jwt_extended == 4.6.0 pyopenssl == 24.1.0 pyyaml == 6.0.1 requests == 2.32.2 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 diff --git a/services/mock_server/requirements.txt b/services/mock_server/requirements.txt index abf2862..0764845 100644 --- a/services/mock_server/requirements.txt +++ b/services/mock_server/requirements.txt @@ -1 +1 @@ -flask==3.0.3 \ No newline at end of file +flask == 3.0.3 \ No newline at end of file diff --git a/services/register/requirements.txt b/services/register/requirements.txt index e95dfe3..bf3e52c 100644 --- a/services/register/requirements.txt +++ b/services/register/requirements.txt @@ -8,5 +8,5 @@ pyyaml == 6.0.1 requests == 2.32.2 bcrypt == 4.0.1 flask_httpauth == 4.8.0 -gunicorn==22.0.0 -packaging==24.0 +gunicorn == 22.0.0 +packaging == 24.0 -- GitLab From a9e4f049012f709c80b755641fa019d3026de97b Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Fri, 21 Jun 2024 11:33:30 +0200 Subject: [PATCH 6/6] Fix eval issue checking monitoring variable at Security Service --- services/TS29222_CAPIF_Security_API/capif_security/app.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/TS29222_CAPIF_Security_API/capif_security/app.py b/services/TS29222_CAPIF_Security_API/capif_security/app.py index 975488e..0f06b7a 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/app.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/app.py @@ -126,7 +126,8 @@ subscriber = Subscriber() config = Config() configure_logging(app.app) -if eval(os.environ.get("MONITORING").lower().capitalize()): +monitoring_value = os.environ.get("MONITORING", "").lower() +if monitoring_value == "true": configure_monitoring(app.app, config.get_config()) executor = Executor(app.app) -- GitLab