Skip to content

[test] [draft] Test mongo (object_storage lib v1) with S3 Integrator (s3 lib v0) -- DO NOT MERGE #242

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

Draft
theoctober19th wants to merge 1 commit into
base: 8/edge
Choose a base branch
from
Draft

[test] [draft] Test mongo (object_storage lib v1) with S3 Integrator (s3 lib v0) -- DO NOT MERGE #242

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
12 changes: 8 additions & 4 deletions single_kernel_mongo/events/backups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@
GcsStorageRequires,
StorageConnectionInfoChangedEvent,
)
from single_kernel_mongo.lib.charms.data_platform_libs.v0.s3 import (
CredentialsChangedEvent,
from single_kernel_mongo.lib.charms.data_platform_libs.v0.object_storage import (
S3Requirer,
)
from single_kernel_mongo.lib.charms.data_platform_libs.v0.object_storage import (
StorageConnectionInfoChangedEvent as CredentialsChangedEvent,
)
from single_kernel_mongo.utils.event_helpers import (
defer_event_with_info_log,
fail_action_with_error_log,
Expand Down Expand Up @@ -90,7 +92,9 @@ def __init__(self, dependent: MongoDBOperator):
)

# S3 Handler
self.framework.observe(self.s3_client.on.credentials_changed, self._on_credentials_changed)
self.framework.observe(
self.s3_client.on.storage_connection_info_changed, self._on_credentials_changed
)

# GCS Handler
self.framework.observe(
Expand Down Expand Up @@ -121,7 +125,7 @@ def manager_for(self, relation_name: str) -> CommonBackupManager | None:
def credentials_for(self, relation: Relation) -> dict[str, str]:
"""This is the credentials."""
if relation == self.state.s3_relation:
return self.s3_client.get_s3_connection_info()
return self.s3_client.get_storage_connection_info(relation)
if relation == self.state.gcs_relation:
initial_creds = self.gcs_client.get_storage_connection_info(relation)
secret_dict = json_or_b64_to_dict(initial_creds.get("secret-key", "{}"))
Expand Down
Loading
Loading