Skip to content

Commit b662753

Browse files
committed
Merge branch 'develop' into feat-rspy493/extend-filter-attributes
2 parents 8de319c + b191b5c commit b662753

File tree

17 files changed

+763
-752
lines changed

17 files changed

+763
-752
lines changed

docs/poetry.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

poetry.lock

Lines changed: 81 additions & 81 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ safety = "^3.2.14"
7979
pylint = "^3.3.0"
8080
flake8-pyproject = "^1.2.3"
8181
httpx = "^0.27.2"
82-
moto = "==5.0.27"
82+
moto = "==5.0.28"
8383
flask = "^3.0.3"
8484
flask-cors = "^5.0.0"
8585
sphinx = "^8.1.3"

services/adgs/poetry.lock

Lines changed: 70 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/cadip/poetry.lock

Lines changed: 70 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/catalog/poetry.lock

Lines changed: 74 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/catalog/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pytest-error-for-skips = "^2.0.2"
5353
pytest-docker = "^3.1.0"
5454
pytest-dotenv = "^0.5.2"
5555
pytest-mock = "^3.14.0"
56-
moto = "==5.0.27"
56+
moto = "==5.0.28"
5757
flask = "^3.0.3"
5858
flask-cors = "^5.0.0"
5959
# httpx is used by fastapi for test purpose

services/common/poetry.lock

Lines changed: 69 additions & 69 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/common/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ sqlalchemy = "^2.0.35"
4444
# # TODO: replace by official eodag version tag that will contain this feature.
4545
# # Then, in adgs/cadip/catalog docker images, remove the "RUN apt install -y git"
4646
# eodag = { git = "https://github.com/jgaucher-cs/eodag", branch = "develop" }
47-
eodag = "==v3.1.0b1"
47+
eodag = "==v3.1.0b2"
4848
pydantic = ">=2.9.2,<2.11.0"
4949
markdown = "^3.6"
5050
python-dotenv = "^1.0.0"
@@ -65,7 +65,7 @@ opentelemetry-exporter-otlp = "^1.27.0"
6565
python-logging-loki = "^0.3.1"
6666
stac-pydantic = "^3.1.2"
6767
authlib = "^1.3.1"
68-
python-keycloak = ">=4.5,<6.0"
68+
python-keycloak = ">=5.3.1,<6.0"
6969
itsdangerous = "^2.2.0"
7070
pyjwt = {extras = ["crypto"], version = "^2.9.0"}
7171
stac-fastapi-pgstac = "3.0.1"

services/common/rs_server_common/s3_storage_handler/s3_storage_handler.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,12 @@ class CustomSessionRedirect(requests.Session):
112112
"""
113113

114114
def __init__(self, trusted_domains=list[str] | None):
115-
"""Initialize the CustomSession instance."""
115+
"""
116+
Initialize the CustomSession instance.
117+
118+
Args:
119+
trusted_domains (list): List of allowed hosts for redirection in case of change of protocol (HTTP <> HTTPS).
120+
"""
116121
super().__init__()
117122
self.trusted_domains: list[str] = trusted_domains or [] # List of allowed hosts for redirection
118123

@@ -871,6 +876,7 @@ def s3_streaming_upload( # pylint: disable=too-many-locals
871876
872877
Args:
873878
stream_url (str): The URL of the file to be streamed and uploaded.
879+
trusted_domains (list): List of allowed hosts for redirection in case of change of protocol (HTTP <> HTTPS).
874880
auth (Any): Authentication credentials for the HTTP request (if required).
875881
bucket (str): The name of the target S3 bucket.
876882
key (str): The S3 object key (file path) to store the streamed file.

0 commit comments

Comments
 (0)