[DPE-1316] external secrets in opensearch (on integration tests stabi…

…lization) (#136) ## Issue ## Solution
canonical · Oct 20, 2023 · 888070c · 888070c
1 parent e0ec52d
commit 888070c
Show file tree

Hide file tree

Showing 9 changed files with 2,368 additions and 309 deletions.
diff --git a/lib/charms/data_platform_libs/v0/data_interfaces.py b/lib/charms/data_platform_libs/v0/data_interfaces.py
diff --git a/lib/charms/opensearch/v0/opensearch_relation_provider.py b/lib/charms/opensearch/v0/opensearch_relation_provider.py
@@ -246,7 +246,8 @@ def validate_index_name(self, index_name: str) -> bool:
         forbidden_chars = [" ", ",", ":", '"', "*", "+", "\\", "/", "|", "?", "#", ">", "<"]
         if any([char in index_name for char in forbidden_chars]):
             logger.error(
-                f"invalid index name {index_name} - index name includes one or more of the following forbidden characters: {forbidden_chars}"
+                f"invalid index name {index_name} - index name includes one or more of "
+                f"the following forbidden characters: {forbidden_chars}"
             )
             return False
 

diff --git a/lib/charms/opensearch/v0/opensearch_secrets.py b/lib/charms/opensearch/v0/opensearch_secrets.py
@@ -57,8 +57,14 @@ def _on_secret_changed(self, event: SecretChangedEvent):
         """Refresh secret and re-run corresponding actions if needed."""
         if not event.secret.label:
             logger.info("Secret %s has no label, ignoring it.", event.secret.id)
+            return
+
+        try:
+            label_parts = self.breakdown_label(event.secret.label)
+        except ValueError:
+            logging.info(f"Label {event.secret.label} was meaningless for us, returning")
+            return
 
-        label_parts = self.breakdown_label(event.secret.label)
         if (
             label_parts["application_name"] != self._charm.app.name
             or label_parts["scope"] != Scope.APP

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -15,7 +15,10 @@ def juju_has_secrets(mocker: MockerFixture):
     NOTE: This is needed, as normally JujuVersion is set to 0.0.0 in tests
     (i.e. not the real juju version)
     """
-    juju_version = os.environ["LIBJUJU_VERSION_SPECIFIER"][:2]  # Removing == symbol
+    juju_version = os.environ["LIBJUJU_VERSION_SPECIFIER"]
+    if juju_version.startswith("=="):
+        juju_version = juju_version[2:]  # Removing == symbol
+
     if juju_version < "3":
         mocker.patch.object(
             JujuVersion, "has_secrets", new_callable=PropertyMock