From 1a20e84803f5e358c22a985b7e207361d6769612 Mon Sep 17 00:00:00 2001 From: Caner Derici Date: Tue, 18 Oct 2022 10:59:45 -0600 Subject: [PATCH 1/2] CharmOrigin no longer contains series, so avoid getting it from juju 3.0 Though we should keep it there to continue support 2.9 controllers --- juju/model.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/juju/model.py b/juju/model.py index fdb1973ee..9ef701bd0 100644 --- a/juju/model.py +++ b/juju/model.py @@ -1739,7 +1739,8 @@ async def deploy( raise JujuError('unknown charm or bundle {}'.format(entity_url)) identifier = res.identifier - series = res.origin.series or series + series = res.origin.series if self.connection().is_using_old_client \ + else series if res.is_bundle: handler = BundleHandler(self, trusted=trust, forced=force) await handler.fetch_plan(url, res.origin, overlays=overlays) From 293af9385721490f9aefc2ef73f07fe01e2b0ea3 Mon Sep 17 00:00:00 2001 From: Caner Derici Date: Tue, 18 Oct 2022 11:03:31 -0600 Subject: [PATCH 2/2] Avoid hardcoding interface versions --- juju/client/overrides.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/juju/client/overrides.py b/juju/client/overrides.py index 39e90eda9..4ef8c2766 100644 --- a/juju/client/overrides.py +++ b/juju/client/overrides.py @@ -80,11 +80,12 @@ async def AddPendingResources(self, Returns -> typing.Union[_ForwardRef('ErrorResult'), typing.Sequence<+T_co>[str]] """ + version = _client.ResourcesFacade.best_facade_version(self.connection) # map input types to rpc msg _params = dict() msg = dict(type='Resources', request='AddPendingResources', - version=2, + version=version, params=_params) _params['tag'] = application_tag _params['url'] = charm_url