update cloud_config_requirer lib (#205)

* update cloud_config_requirer lib * Pin websockets Signed-off-by: Leon <[email protected]> --------- Signed-off-by: Leon <[email protected]> Co-authored-by: Leon <[email protected]>
canonical · Nov 14, 2024 · 179588d · 179588d
1 parent 4d94da5
commit 179588d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/lib/charms/grafana_cloud_integrator/v0/cloud_config_requirer.py b/lib/charms/grafana_cloud_integrator/v0/cloud_config_requirer.py
@@ -6,7 +6,7 @@
 
 LIBID = "e6f580481c1b4388aa4d2cdf412a47fa"
 LIBAPI = 0
-LIBPATCH = 6
+LIBPATCH = 7
 
 DEFAULT_RELATION_NAME = "grafana-cloud-config"
 
@@ -83,16 +83,8 @@ def _events(self):
     @property
     def credentials(self):
         """Return the credentials, if any; otherwise, return None."""
-        if not all(
-            self._is_not_empty(x)
-            for x in [
-                self._data.get("username", ""),
-                self._data.get("password", ""),
-            ]):
-                return Credentials(
-                    self._data.get("username", ""),
-                    self._data.get("password", "")
-                )
+        if (username := self._data.get("username", "").strip()) and (password := self._data.get("password", "").strip()):
+            return Credentials(username, password)
         return None
 
     @property
@@ -148,4 +140,4 @@ def _data(self):
         for relation in self._charm.model.relations[self._relation_name]:
             logger.info("%s %s %s", relation, self._relation_name, relation.data[relation.app])
             return relation.data[relation.app]
-        return {}
+        return {}
diff --git a/tox.ini b/tox.ini
@@ -81,6 +81,8 @@ deps =
     asyncstdlib
     # Libjuju needs to track the juju version
     juju ~= 3.3.0
+    # https://github.com/juju/python-libjuju/issues/1184
+    websockets<14.0
     # Temporarily pinning pytest due to https://github.com/charmed-kubernetes/pytest-operator/issues/131
     pytest ~= 8.1.1
     prometheus-api-client