Merge pull request juju#64 from juju/3.4-into-3.5

Merge 3.4 into 3.5

metadata.yaml

@@ -2,7 +2,7 @@
 # Licensed under the GPLv3, see LICENSE file for details.
 name: juju-controller
 assumes:
-- juju >= 3.3
+- juju >= 3.5
 description: |
   The Juju controller charm is used to expose various pieces
   of functionality of a Juju controller.

src/charm.py

@@ -12,7 +12,7 @@
 from ops.framework import StoredState
 from ops.charm import RelationJoinedEvent, RelationDepartedEvent
 from ops.main import main
-from ops.model import ActiveStatus, BlockedStatus, ErrorStatus, Relation
+from ops.model import ActiveStatus, BlockedStatus, Relation
 from typing import List
 
 logger = logging.getLogger(__name__)
@@ -84,7 +84,8 @@ def _on_metrics_endpoint_relation_created(self, event: RelationJoinedEvent):
         try:
             api_port = self.api_port()
         except AgentConfException as e:
-            self.unit.status = ErrorStatus(f"can't read controller API port from agent.conf: {e}")
+            self.unit.status = BlockedStatus(
+                f"can't read controller API port from agent.conf: {e}")
             return
 
         metrics_endpoint = MetricsEndpointProvider(

tests/test_charm.py

@@ -4,7 +4,7 @@
 import os
 import unittest
 from charm import JujuControllerCharm, AgentConfException
-from ops import ErrorStatus
+from ops import BlockedStatus
 from ops.testing import Harness
 from unittest.mock import mock_open, patch
 
@@ -140,7 +140,7 @@ def test_apiaddresses_missing_status(self, *_):
         harness.begin()
 
         harness.add_relation('metrics-endpoint', 'prometheus-k8s')
-        self.assertEqual(harness.charm.unit.status, ErrorStatus(
+        self.assertEqual(harness.charm.unit.status, BlockedStatus(
             "can't read controller API port from agent.conf: agent.conf key 'apiaddresses' missing"
         ))