Merge branch 'master' into feature/test_offer

Author: sed-i

.github/workflows/test.yaml

@@ -9,7 +9,6 @@ jobs:
     strategy:
       matrix:
         python:
-          - "3.8"
           - "3.9"
           - "3.10"
     steps:
@@ -31,7 +30,6 @@ jobs:
     strategy:
       matrix:
         python:
-          - "3.8"
           - "3.9"
           - "3.10"
     steps:
@@ -56,7 +54,6 @@ jobs:
         python:
           # We will reduce the workload to 3.10 to 
           # save some resources for now.
-          # - "3.8"
           # - "3.9"
           - "3.10"
     steps:

VERSION

@@ -1 +1 @@
-3.1.0.1
+3.1.2.0

docs/changelog.rst

@@ -1,6 +1,24 @@
 Changelog
 ---------
 
+3.1.2.0
+^^^^^^^
+
+Friday 5th May 2022
+
+This release has been tested with Juju 3.1.2 and contains the new 
+endpoints for secrets backend.
+
+This release works with any Juju 3.x controller.
+
+## What's Changed
+* [JUJU-3202] Add facades for 3.1.1. by @juanmanuel-tirado in https://github.com/juju/python-libjuju/pull/807
+* Add destroy units by @cderici in https://github.com/juju/python-libjuju/pull/812
+* [JUJU-3517] Revisit _build_facades in connection by @cderici in https://github.com/juju/python-libjuju/pull/826
+* [JUJU-3527] Added 3.1.2 and 3.2-beta2 schemas. by @juanmanuel-tirado in https://github.com/juju/python-libjuju/pull/828
+* [JUJU-1628] Deploy by revision by @cderici in https://github.com/juju/python-libjuju/pull/830
+* [JUJU-3552] Prepare 3.1.2.1 release by @juanmanuel-tirado in https://github.com/juju/python-libjuju/pull/836
+
 3.1.0.1
 ^^^^^^^
 

docs/readme.rst

@@ -11,8 +11,7 @@ Documentation: https://pythonlibjuju.readthedocs.io/en/latest/
 Requirements
 ------------
 
-* Python 3.8/3.9/3.10
-* Tested using Juju 3.1.1
+* Python 3.9/3.10
 
 
 Design Notes

examples/add_secrets_backend.py

@@ -10,16 +10,16 @@ async def main():
     """
 
     m = Model()
-    await m.connect_current()
+    await m.connect()
 
     # # deploy postgresql
-    # await m.deploy('postgresql', series="focal")
+    await m.deploy('postgresql', series="focal")
     # # deploy vault
     await m.deploy("vault", series="focal")
     # # relate/integrate
     await m.integrate("vault:db", "postgresql:db")
     # # wait for the
-    await m.wait_for_idle(["vault"])
+    await m.wait_for_idle(["postgresql", "vault"])
     # # expose vault
     vault_app = m.applications["vault"]
     await vault_app.expose()
@@ -38,16 +38,16 @@ async def main():
     keys = vault_client.sys.initialize(3, 2)
     print(keys)
 
-    target_unit = m.applications['vault'].units[0]
-    action = await target_unit.run_action("authorize-charm", token=keys['token'])
-    await action.wait()
-
     # Unseal vault
     vault_client.sys.submit_unseal_keys(keys["keys"])
 
+    target_unit = m.applications['vault'].units[0]
+    action = await target_unit.run_action("authorize-charm", token=keys["root_token"])
+    await action.wait()
+
     # Add the secret backend
     c = await m.get_controller()
-    response = await c.add_secret_backends("1000", "myvault", "vault", {"endpoint": vault_url})
+    response = await c.add_secret_backends("1111", "examplevault", "vault", {"endpoint": vault_url, "token": keys["root_token"]})
     print("Output from add secret backends")
     print(response["results"])
 
@@ -57,9 +57,9 @@ async def main():
     print(list["results"])
 
     # Remove it
-    await c.remove_secret_backends("myvault")
+    await c.remove_secret_backends("examplevault")
 
-    # Finally after removing
+    # # Finally after removing
     list = await c.list_secret_backends()
     print("Output from list secret backends after removal")
     print(list["results"])

examples/deploy.py

@@ -26,9 +26,7 @@ async def main():
         )
 
         print('Waiting for active')
-        await model.block_until(
-            lambda: all(unit.workload_status == 'active'
-                        for unit in application.units))
+        await model.wait_for_idle(status='active')
 
         print('Removing ubuntu')
         await application.remove()

examples/deploy_with_revision.py

@@ -0,0 +1,33 @@
+from juju import jasyncio
+from juju.model import Model
+
+
+async def main():
+    charm = 'juju-qa-test'
+
+    model = Model()
+    print('Connecting to model')
+    # connect to current model with current user, per Juju CLI
+    await model.connect()
+
+    try:
+        print(f'Deploying {charm} --channel 2.0/stable --revision 22')
+        application = await model.deploy(
+            'juju-qa-test',
+            application_name='test',
+            channel='2.0/stable',
+            revision=22,
+        )
+
+        print('Waiting for active')
+        await model.wait_for_idle(status='active')
+
+        print(f'Removing {charm}')
+        await application.remove()
+    finally:
+        print('Disconnecting from model')
+        await model.disconnect()
+
+
+if __name__ == '__main__':
+    jasyncio.run(main())

juju/bundle.py

@@ -17,6 +17,7 @@
 from . import utils, jasyncio
 from .origin import Channel, Source
 from .url import Schema, URL
+from .utils import get_base_from_origin_or_channel
 
 log = logging.getLogger(__name__)
 
@@ -349,12 +350,11 @@ async def _resolve_charms(self):
                 continue
 
             charm_url = URL.parse(spec['charm'])
-            channel = None
-            series = spec.get('series', None)
-            track, risk = '', ''
-            if 'channel' in spec:
-                channel = Channel.parse(spec['channel'])
-                track, risk = channel.track, channel.risk
+
+            channel = Channel.parse(spec['channel']) if 'channel' in spec else Channel('latest', 'stable')
+            track, risk = channel.track, channel.risk
+            series = spec.get('series', self.bundle.get('series', None))
+            base = get_base_from_origin_or_channel(channel, series)
 
             if self.charms_facade is not None:
                 if cons is not None and cons['arch'] != '':
@@ -365,16 +365,18 @@ async def _resolve_charms(self):
                 origin = client.CharmOrigin(source=Source.CHARM_HUB.value,
                                             architecture=architecture,
                                             risk=risk,
-                                            track=track)
-                if not self.model.connection().is_using_old_client and series:
-                    origin.base = client.Base(
-                        channel=utils.get_series_version(series), name='ubuntu')
-                charm_url, charm_origin, _ = await self.model._resolve_charm(charm_url, origin)
+                                            track=track,
+                                            base=base,
+                                            )
+
+                charm_url, charm_origin = await self.model._resolve_charm(charm_url, origin)
                 spec['charm'] = str(charm_url)
             else:
                 charm_origin = client.CharmOrigin(source=Source.CHARM_HUB.value,
                                                   risk=risk,
-                                                  track=track)
+                                                  track=track,
+                                                  base=base,
+                                                  )
 
             if str(channel) not in self.origins:
                 self.origins[str(charm_url)] = {}
@@ -715,15 +717,13 @@ async def run(self, context):
             arch = self.architecture
             if not arch:
                 arch = await context.model._resolve_architecture(url)
+            base = get_base_from_origin_or_channel(ch, self.series)
             origin = client.CharmOrigin(source=Source.CHARM_HUB.value,
                                         architecture=arch,
                                         risk=ch.risk,
-                                        track=ch.track)
-            if not context.model.connection().is_using_old_client and self.series:
-                origin.base = client.Base(
-                    channel=utils.get_series_version(self.series),
-                    name='ubuntu')
-            identifier, origin, _ = await context.model._resolve_charm(url, origin)
+                                        track=ch.track,
+                                        base=base)
+            identifier, origin = await context.model._resolve_charm(url, origin)
 
         if identifier is None:
             raise JujuError('unknown charm {}'.format(self.charm))