Skip to content

S3 verify ssl certificate #3648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lferran merged 1 commit into from
May 14, 2026
Merged

S3 verify ssl certificate #3648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions charts/nucliadb_shared/templates/nucliadb.cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ data:
S3_SSL: "True"
{{- end }}
S3_VERIFY_SSL: {{ .Values.storage.s3_verify_ssl | quote }}
S3_VERIFY_SSL_CERTIFICATE: {{ .Values.storage.s3_verify_ssl_certificate | quote }}
S3_MAX_POOL_CONNECTIONS: {{ .Values.storage.s3_max_pool_connections | quote }}
S3_REGION_NAME: {{ .Values.storage.s3_region_name }}
S3_BUCKET: {{ .Values.storage.s3_bucket }}
Expand Down
2 changes: 1 addition & 1 deletion nucliadb/src/nucliadb/writer/tus/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ async def initialize():
client_id=storage_settings.s3_client_id,
client_secret=storage_settings.s3_client_secret,
ssl=storage_settings.s3_ssl,
verify_ssl=storage_settings.s3_verify_ssl,
verify_ssl=storage_settings.s3_verify_ssl_certificate or storage_settings.s3_verify_ssl,
max_pool_connections=storage_settings.s3_max_pool_connections,
endpoint_url=storage_settings.s3_endpoint,
region_name=storage_settings.s3_region_name,
Expand Down
2 changes: 1 addition & 1 deletion nucliadb/src/nucliadb/writer/tus/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ async def initialize(
client_id: str | None,
client_secret: str | None,
ssl: bool,
verify_ssl: bool,
verify_ssl: bool | str,
max_pool_connections: int,
endpoint_url: str | None,
region_name: str | None,
Expand Down
1 change: 1 addition & 0 deletions nucliadb_utils/src/nucliadb_utils/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class StorageSettings(BaseSettings):
s3_client_secret: str | None = None
s3_ssl: bool = True
s3_verify_ssl: bool = True
s3_verify_ssl_certificate: str | None = None
s3_max_pool_connections: int = 30
s3_endpoint: str | None = None
s3_region_name: str | None = None
Expand Down
2 changes: 1 addition & 1 deletion nucliadb_utils/src/nucliadb_utils/storages/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ def __init__(
deadletter_bucket: str | None = None,
indexing_bucket: str | None = None,
endpoint_url: str | None = None,
verify_ssl: bool = True,
verify_ssl: bool | str = True,
use_ssl: bool = True,
region_name: str | None = None,
kms_key_id: str | None = None,
Expand Down
3 changes: 2 additions & 1 deletion nucliadb_utils/src/nucliadb_utils/tests/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def session_s3_storage_settings(s3: str) -> Iterator[tuple[dict[str, Any], dict[
"s3_client_secret": "fake",
"s3_ssl": False,
"s3_verify_ssl": False,
"s3_verify_ssl_certificate": None,
"s3_region_name": None,
"s3_bucket": "test-{kbid}",
"s3_kms_key_id": "fake-kms-key-id",
Expand Down Expand Up @@ -111,7 +112,7 @@ async def s3_storage(s3: str, s3_storage_settings: dict[str, Any]) -> AsyncItera
indexing_bucket=extended_storage_settings.s3_indexing_bucket,
endpoint_url=storage_settings.s3_endpoint,
use_ssl=storage_settings.s3_ssl,
verify_ssl=storage_settings.s3_verify_ssl,
verify_ssl=storage_settings.s3_verify_ssl_certificate or storage_settings.s3_verify_ssl,
region_name=storage_settings.s3_region_name,
bucket=storage_settings.s3_bucket,
bucket_tags=storage_settings.s3_bucket_tags,
Expand Down
2 changes: 1 addition & 1 deletion nucliadb_utils/src/nucliadb_utils/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ async def _create_storage(gcs_scopes: list[str] | None = None) -> Storage:
aws_client_id=storage_settings.s3_client_id,
aws_client_secret=storage_settings.s3_client_secret,
endpoint_url=storage_settings.s3_endpoint,
verify_ssl=storage_settings.s3_verify_ssl,
verify_ssl=storage_settings.s3_verify_ssl_certificate or storage_settings.s3_verify_ssl,
deadletter_bucket=extended_storage_settings.s3_deadletter_bucket,
indexing_bucket=extended_storage_settings.s3_indexing_bucket,
use_ssl=storage_settings.s3_ssl,
Expand Down
Loading