Merge branch 'main' into fix-make-test-target

Author: cderici

juju/constraints.py

@@ -54,7 +54,7 @@
     "zones",
     "allocate_public_ip"]
 
-LIST_KEYS = {'tags', 'spaces'}
+LIST_KEYS = {'tags', 'spaces', 'zones'}
 
 SNAKE1 = re.compile(r'(.)([A-Z][a-z]+)')
 SNAKE2 = re.compile('([a-z0-9])([A-Z])')

juju/model.py

@@ -2704,15 +2704,15 @@ async def update_secret(self, name, data_args=[], new_name="", file="", info="")
         if result_error.error is not None:
             raise JujuAPIError(result_error.error)
 
-    async def list_secrets(self, filter="", show_secrets=False):
+    async def list_secrets(self, filter=None, show_secrets=False):
         """
         Returns the list of available secrets.
         """
         facade = client.SecretsFacade.from_connection(self.connection())
-        results = await facade.ListSecrets({
-            'filter': filter,
-            'show-secrets': show_secrets,
-        })
+        results = await facade.ListSecrets(
+            filter_=filter,
+            show_secrets=show_secrets,
+        )
         return results.results
 
     async def remove_secret(self, secret_name, revision=-1):

juju/utils.py

@@ -301,6 +301,7 @@ def get_local_charm_charmcraft_yaml(path):
 KINETIC = "kinetic"
 LUNAR = "lunar"
 MANTIC = "mantic"
+NOBLE = "noble"
 
 UBUNTU_SERIES = {
     PRECISE: "12.04",
@@ -327,6 +328,7 @@ def get_local_charm_charmcraft_yaml(path):
     KINETIC: "22.10",
     LUNAR: "23.04",
     MANTIC: "23.10",
+    NOBLE: "24.04",
 }
 
 KUBERNETES = "kubernetes"

tests/integration/charm-manifest/manifest.yaml

@@ -9,5 +9,9 @@ bases:
   - amd64
   channel: '20.04'
   name: ubuntu
+- architectures:
+  - amd64
+  channel: '24.04'
+  name: ubuntu
 charmcraft-started-at: '2021-08-20T08:09:00.639806Z'
 charmcraft-version: 1.2.1

tests/integration/test_model.py

@@ -437,6 +437,15 @@ async def test_deploy_with_base():
         await model.wait_for_idle(status='active')
 
 
+@base.bootstrapped
+async def test_deploy_noble():
+    charm_path = INTEGRATION_TEST_DIR / 'charm-manifest'
+
+    async with base.CleanModel() as model:
+        await model.deploy(str(charm_path), base="ubuntu@24.04")
+        await model.wait_for_idle(status='active')
+
+
 @base.bootstrapped
 async def test_add_machine():
     from juju.machine import Machine

tests/unit/test_constraints.py

@@ -60,7 +60,7 @@ def test_parse_constraints(self):
         self.assertEqual(
             _("mem=10G zones=bar,baz tags=tag1 spaces=space1,space2"),
             {"mem": 10 * 1024,
-             "zones": "bar,baz",
+             "zones": ["bar", "baz"],
              "tags": ["tag1"],
              "spaces": ["space1", "space2"]}
         )