Refactor dashboard utils (#370)

* Refactor dashboard utils * Use LZMABase64 class from coslib * Import main from ops
canonical · Jan 10, 2025 · 95c2e04 · 95c2e04
1 parent 807317c
commit 95c2e04
Show file tree

Hide file tree

Showing 7 changed files with 329 additions and 330 deletions.
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -117,7 +117,7 @@ parts:
   charm:
     # This is currently necessary because it cuts on packing times.
     # It can be removed when we have at least multithreading on charmcraft pack.
-    charm-binary-python-packages: [cryptography, jsonschema, pydantic, maturin]
+    charm-binary-python-packages: [cryptography, jsonschema, pydantic, pydantic-core, maturin]
     build-packages:
       - git
   static-sqlite3:

diff --git a/lib/charms/grafana_k8s/v0/grafana_dashboard.py b/lib/charms/grafana_k8s/v0/grafana_dashboard.py
diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,10 @@ urllib3
 jsonschema
 cryptography
 
+# lib/charms/grafana_k8s/v0/grafana_dashboard.py
+# lib/charms/tempo_k8s/v1/charm_tracing.py
+cosl
+
 # lib/charms/tempo_k8s/v1/charm_tracing.py
 opentelemetry-exporter-otlp-proto-http
 pydantic
-cosl
diff --git a/src/charm.py b/src/charm.py
@@ -75,7 +75,7 @@
 from charms.tempo_coordinator_k8s.v0.charm_tracing import trace_charm
 from charms.tempo_coordinator_k8s.v0.tracing import TracingEndpointRequirer, charm_tracing_config
 from ops.framework import StoredState
-from ops.main import main
+from ops import main
 from ops.model import ActiveStatus, BlockedStatus, MaintenanceStatus, Port
 
 from ops.pebble import (

diff --git a/tests/integration/grafana-tester/charmcraft.yaml b/tests/integration/grafana-tester/charmcraft.yaml
@@ -8,4 +8,4 @@ bases:
       channel: "20.04"
 parts:
   charm:
-    charm-binary-python-packages: [cryptography, jsonschema]
+    charm-binary-python-packages: [cryptography, jsonschema, pydantic, pydantic-core, maturin]
diff --git a/tests/integration/grafana-tester/requirements.txt b/tests/integration/grafana-tester/requirements.txt
@@ -1,2 +1,3 @@
 ops
 jsonschema
+cosl
diff --git a/tox.ini b/tox.ini
@@ -54,6 +54,7 @@ deps =
     charm: -r{toxinidir}/requirements.txt
     lib: ops
     lib: jinja2
+    lib: cosl
     unit: {[testenv:unit]deps}
     integration: {[testenv:integration]deps}
 commands =