From 23fe4d64efc0ef28df911424ebbb61c8869b46f7 Mon Sep 17 00:00:00 2001
From: Luca Bello <36242061+lucabello@users.noreply.github.com>
Date: Mon, 15 Jan 2024 15:48:33 +0100
Subject: [PATCH] use cosl for JujuTopology (#331)

* use cosl for JujuTopology

* add cosl to itests dependencies

* add cosl to the tester charm requirements
---
 lib/charms/loki_k8s/v0/loki_push_api.py             | 4 ++--
 lib/charms/loki_k8s/v1/loki_push_api.py             | 4 ++--
 requirements.txt                                    | 1 +
 tests/integration/log-proxy-tester/requirements.txt | 1 +
 tests/integration/loki-tester/requirements.txt      | 1 +
 tests/integration/loki-tester/src/charm.py          | 2 +-
 tests/unit/test_consumer.py                         | 2 +-
 tox.ini                                             | 2 ++
 8 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/charms/loki_k8s/v0/loki_push_api.py b/lib/charms/loki_k8s/v0/loki_push_api.py
index 0df057c7d..01d7dc161 100644
--- a/lib/charms/loki_k8s/v0/loki_push_api.py
+++ b/lib/charms/loki_k8s/v0/loki_push_api.py
@@ -456,7 +456,7 @@ def _alert_rules_error(self, event):
 from urllib.error import HTTPError
 
 import yaml
-from charms.observability_libs.v0.juju_topology import JujuTopology
+from cosl import JujuTopology
 from ops.charm import (
     CharmBase,
     HookEvent,
@@ -480,7 +480,7 @@ def _alert_rules_error(self, event):
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 24
+LIBPATCH = 25
 
 logger = logging.getLogger(__name__)
 
diff --git a/lib/charms/loki_k8s/v1/loki_push_api.py b/lib/charms/loki_k8s/v1/loki_push_api.py
index 5fd404bfe..bcc3e6a64 100644
--- a/lib/charms/loki_k8s/v1/loki_push_api.py
+++ b/lib/charms/loki_k8s/v1/loki_push_api.py
@@ -450,7 +450,7 @@ def _alert_rules_error(self, event):
 from urllib.error import HTTPError
 
 import yaml
-from charms.observability_libs.v0.juju_topology import JujuTopology
+from cosl import JujuTopology
 from ops.charm import (
     CharmBase,
     HookEvent,
@@ -474,7 +474,7 @@ def _alert_rules_error(self, event):
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 0
+LIBPATCH = 1
 
 logger = logging.getLogger(__name__)
 
diff --git a/requirements.txt b/requirements.txt
index ac4ea373e..cdbc96519 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+cosl
 ops
 kubernetes
 requests
diff --git a/tests/integration/log-proxy-tester/requirements.txt b/tests/integration/log-proxy-tester/requirements.txt
index 46171c830..5201e34f2 100644
--- a/tests/integration/log-proxy-tester/requirements.txt
+++ b/tests/integration/log-proxy-tester/requirements.txt
@@ -1 +1,2 @@
+cosl
 ops @ git+https://github.com/canonical/operator
diff --git a/tests/integration/loki-tester/requirements.txt b/tests/integration/loki-tester/requirements.txt
index 346bcdfb3..44c7d09fb 100644
--- a/tests/integration/loki-tester/requirements.txt
+++ b/tests/integration/loki-tester/requirements.txt
@@ -1,2 +1,3 @@
+cosl
 ops >= 1.2.0
 python-logging-loki
diff --git a/tests/integration/loki-tester/src/charm.py b/tests/integration/loki-tester/src/charm.py
index 7ceb7c705..99e3929cd 100755
--- a/tests/integration/loki-tester/src/charm.py
+++ b/tests/integration/loki-tester/src/charm.py
@@ -9,7 +9,7 @@
 
 import logging_loki  # type: ignore
 from charms.loki_k8s.v1.loki_push_api import LokiPushApiConsumer
-from charms.observability_libs.v0.juju_topology import JujuTopology
+from cosl import JujuTopology
 from ops.charm import CharmBase
 from ops.main import main
 from ops.model import ActiveStatus
diff --git a/tests/unit/test_consumer.py b/tests/unit/test_consumer.py
index eac516bbe..753a32d90 100644
--- a/tests/unit/test_consumer.py
+++ b/tests/unit/test_consumer.py
@@ -8,7 +8,7 @@
 
 import yaml
 from charms.loki_k8s.v0.loki_push_api import AlertRules, LokiPushApiConsumer
-from charms.observability_libs.v0.juju_topology import JujuTopology
+from cosl import JujuTopology
 from fs.tempfs import TempFS
 from ops.charm import CharmBase
 from ops.framework import StoredState
diff --git a/tox.ini b/tox.ini
index 59194644f..396ceb381 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,6 +51,7 @@ commands =
 [testenv:static-{charm,lib}]
 description = Run static analysis checks
 deps =
+    cosl
     pyright
     charm: -r{toxinidir}/requirements.txt
     lib: git+https://github.com/canonical/operator#egg=ops
@@ -96,6 +97,7 @@ commands =
 [testenv:integration]
 description = Run integration tests
 deps =
+    cosl
     aiohttp
     juju
     pytest