Sync with canonical/data-platform-libs#113

canonical · Nov 20, 2023 · 515f8aa · 515f8aa
1 parent a484ef4
commit 515f8aa
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/charms/data_platform_libs/v0/data_interfaces.py b/lib/charms/data_platform_libs/v0/data_interfaces.py
@@ -528,7 +528,12 @@ def get_content(self) -> Dict[str, str]:
             if self.meta:
                 try:
                     self._secret_content = self.meta.get_content(refresh=True)
-                except (ValueError, ModelError):
+                except (ValueError, ModelError) as err:
+                    # https://bugs.launchpad.net/juju/+bug/2042596
+                    # Only triggered when 'refresh' is set
+                    msg = "ERROR either URI or label should be used for getting an owned secret but not both"
+                    if isinstance(err, ModelError) and msg not in str(err):
+                        raise
                     # Due to: ValueError: Secret owner cannot use refresh=True
                     self._secret_content = self.meta.get_content()
         return self._secret_content