Merge branch 'master' into fix/machine_ssh_cherry_picked

Author: yanksyoon

MANIFEST.in

@@ -1,4 +1,4 @@
-include *.py CONTRIBUTORS LICENSE README.rst VERSION
+include *.py CONTRIBUTORS LICENSE README.rst
 recursive-include juju *.py
 recursive-include examples *.py
 recursive-include docs *.rst

Makefile

@@ -1,7 +1,7 @@
 BIN := .tox/py3/bin
 PY := $(BIN)/python3
 PIP := $(BIN)/pip3
-VERSION=$(shell cat VERSION)
+VERSION := $(shell $(PY) -c "from juju.version import CLIENT_VERSION; print(CLIENT_VERSION)")
 
 .PHONY: clean
 clean:

VERSION

@@ -1,11 +1,35 @@
 Changelog
 ---------
 
-3.3.0.0
+3.3.1.1
 ^^^^^^^
 
+Thursday 15th Feb 2024
+
 ## What's Changed
 
+This is a patch release for fixing some build problems in the 3.3.1.0 release that rendered it unusable in some scenarios.
+
+* Resolve build problems in 3.3.1.0 by @cderici in https://github.com/juju/python-libjuju/pull/1026
+
+3.3.1.0
+^^^^^^^
+
+Thursday 8th Feb 2024
+
+* Remove paramiko upper-bound by @gboutry in https://github.com/juju/python-libjuju/pull/1005
+* Remove explicit passing of event_loop into tests by @cderici in https://github.com/juju/python-libjuju/pull/1006
+* chore: remove the upper restrictions on the websockets dependency by @tonyandrewmeyer in https://github.com/juju/python-libjuju/pull/1007
+* Target ceiling version by @cderici in https://github.com/juju/python-libjuju/pull/1008
+* Make it easier to run tests using `make` by @cderici in https://github.com/juju/python-libjuju/pull/1012
+* Avoid installing signal handlers to the event loop by @cderici in https://github.com/juju/python-libjuju/pull/1014
+* feat: remove app block until done by @yanksyoon in https://github.com/juju/python-libjuju/pull/1017
+* feat: remove app timeout by @yanksyoon in https://github.com/juju/python-libjuju/pull/1018
+* Forward port latest changes from 2.9 onto 3.x by @cderici in https://github.com/juju/python-libjuju/pull/1022
+
+3.3.0.0
+^^^^^^^
+
 The main contribution of this release is the user secrets that's released as a part of Juju 3.3.
 
 Thursday 30th Nov 2023

docs/changelog.rst

@@ -21,13 +21,16 @@
 from pathlib import Path
 
 here = Path(__file__).absolute().parent
-version = (here.parent / 'VERSION').read_text().strip()
+
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..'))
 
+from juju.version import CLIENT_VERSION
+version = CLIENT_VERSION
+
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.

docs/conf.py

@@ -12,4 +12,5 @@ paramiko
 macaroonbakery
 toposort
 python-dateutil
-kubernetes
+kubernetes
+packaging

docs/requirements.txt

@@ -470,7 +470,9 @@ async def close(self, to_reconnect=False):
 
     async def _recv(self, request_id):
         if not self.is_open:
-            raise websockets.exceptions.ConnectionClosed(0, 'websocket closed')
+            raise websockets.exceptions.ConnectionClosed(
+                websockets.frames.Close(websockets.frames.CloseCode.NORMAL_CLOSURE,
+                                        'websocket closed'))
         try:
             return await self.messages.get(request_id)
         except GeneratorExit:
@@ -641,7 +643,8 @@ async def rpc(self, msg, encoder=None):
             if self.monitor.status == Monitor.DISCONNECTED:
                 # closed cleanly; shouldn't try to reconnect
                 raise websockets.exceptions.ConnectionClosed(
-                    0, 'websocket closed')
+                    websockets.frames.Close(websockets.frames.CloseCode.NORMAL_CLOSURE,
+                                            'websocket closed'))
             try:
                 await self._ws.send(outgoing)
                 break

juju/client/connection.py

@@ -85,6 +85,18 @@ async def connect(self, **kwargs):
             # connected to.
             if self._connection:
                 await self._connection.close()
+
+            account = kwargs.pop('account', {})
+            # Prioritize the username and password that user provided
+            # If not enough, try to patch it with info from accounts.yaml
+            if 'username' not in kwargs and account.get('user'):
+                kwargs.update(username=account.get('user'))
+            if 'password' not in kwargs and account.get('password'):
+                kwargs.update(password=account.get('password'))
+
+            if not ({'username', 'password'}.issubset(kwargs)):
+                required = {'username', 'password'}.difference(kwargs)
+                raise ValueError(f'Some authentication parameters are required : {",".join(required)}')
             self._connection = await Connection.connect(**kwargs)
 
         # Check if we support the target controller
@@ -117,7 +129,7 @@ async def disconnect(self, entity):
             await self._log_connection.close()
             self._log_connection = None
 
-    async def connect_controller(self, controller_name=None, specified_facades=None):
+    async def connect_controller(self, controller_name=None, specified_facades=None, **kwargs):
         """Connect to a controller by name. If the name is empty, it
         connect to the current controller.
         """
@@ -130,16 +142,16 @@ async def connect_controller(self, controller_name=None, specified_facades=None)
 
         proxy = proxy_from_config(controller.get("proxy-config", None))
 
-        await self.connect(
-            endpoint=endpoints,
-            uuid=None,
-            username=accounts.get("user"),
-            password=accounts.get("password"),
-            cacert=controller.get("ca-cert"),
-            bakery_client=self.bakery_client_for_controller(controller_name),
-            specified_facades=specified_facades,
-            proxy=proxy,
-        )
+        kwargs.update(endpoint=endpoints,
+                      uuid=None,
+                      account=accounts,
+                      cacert=controller.get('ca-cert'),
+                      bakery_client=self.bakery_client_for_controller(controller_name),
+                      specified_facades=specified_facades,
+                      proxy=proxy,
+                      )
+        await self.connect(**kwargs)
+        self.controller_name = controller_name
         self.controller_uuid = controller["uuid"]
 
     async def connect_model(self, _model_name=None, **kwargs):
@@ -184,15 +196,12 @@ async def connect_model(self, _model_name=None, **kwargs):
 
         # TODO remove the need for base.CleanModel to subclass
         # JujuData.
-        kwargs.update(
-            endpoint=endpoints,
-            uuid=model_uuid,
-            username=account.get("user"),
-            password=account.get("password"),
-            cacert=controller.get("ca-cert"),
-            bakery_client=self.bakery_client_for_controller(controller_name),
-            proxy=proxy,
-        )
+        kwargs.update(endpoint=endpoints,
+                      uuid=model_uuid,
+                      account=account,
+                      cacert=controller.get('ca-cert'),
+                      bakery_client=self.bakery_client_for_controller(controller_name),
+                      proxy=proxy)
         await self.connect(**kwargs)
         # TODO this might be a good spot to trigger refreshing the
         # local cache (the connection to the model might help)

juju/client/connector.py

@@ -140,11 +140,15 @@ async def connect(self, *args, **kwargs):
         await self.update_endpoints()
 
     async def update_endpoints(self):
-        info = await self.info()
-        self._connector._connection.endpoints = [
-            (e, info.results[0].cacert)
-            for e in info.results[0].addresses
-        ]
+        try:
+            info = await self.info()
+            self._connector._connection.endpoints = [
+                (e, info.results[0].cacert)
+                for e in info.results[0].addresses
+            ]
+        except errors.JujuPermissionError:
+            log.warning("This user doesn't have at least read access to the controller model, so endpoints are not updated after connection.")
+            pass
 
     async def connect_current(self):
         """
@@ -288,6 +292,8 @@ async def info(self):
         """
         log.debug('Getting information')
         uuids = await self.model_uuids()
+        if 'controller' not in uuids:
+            raise errors.JujuPermissionError('Requires access to controller model.')
         controller_facade = client.ControllerFacade.from_connection(self.connection())
         params = [client.Entity(tag.model(uuids["controller"]))]
         return await controller_facade.ControllerAPIInfoForModels(entities=params)

juju/controller.py

@@ -86,6 +86,10 @@ class JujuUnitError(JujuError):
     pass
 
 
+class JujuPermissionError(JujuError):
+    pass
+
+
 class JujuBackupError(JujuError):
     pass