Skip to content

Commit a739a3d

Browse files
authored
Merge pull request #788 from juanmanuel-tirado/JUJU-2381_support_2_9_38
#788 #### Description This PR prepares the 2.9 branch to run against Juju 2.9.38. #### QA Steps All CI tests need to pass. #### Notes & Discussion A 2.9.38 version should be released after this PR lands.
2 parents 4403424 + 4f424be commit a739a3d

11 files changed

Lines changed: 56034 additions & 51034 deletions

.github/workflows/test.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -65,32 +65,6 @@ jobs:
6565
with:
6666
provider: lxd
6767
juju-channel: 2.9/stable
68-
- name: Set proxy in controller
69-
run: |
70-
set -euxo pipefail
71-
# build a squid config file
72-
CONTROLLER_IP=$(juju list-controllers --format yaml | yq '.controllers[.current-controller].recent-server' | awk -F '[:]' '{print $1}');
73-
echo "Controller IP is: $CONTROLLER_IP"
74-
PROXY=$CONTROLLER_IP:3128
75-
echo "Proxy address is: $PROXY"
76-
echo "acl all src all" > squid.conf
77-
echo "http_access allow all" >> squid.conf
78-
echo "http_port $PROXY" >> squid.conf
79-
cat squid.conf
80-
# copy to the controller and reconfigure it
81-
juju status -m controller
82-
juju switch controller
83-
juju ssh 0 "sudo apt-get install squid -y"
84-
juju scp squid.conf 0:/tmp/squid.conf
85-
juju ssh 0 "sudo mv /tmp/squid.conf /etc/squid/squid.conf"
86-
juju ssh 0 "sudo squid -k reconfigure"
87-
# Test curl after waiting
88-
sleep 10
89-
echo "Test proxy access"
90-
curl -s -o /dev/null -w "%{http_code}" --proxy http://$PROXY https://charmhub.io
91-
# set model defaults
92-
juju model-defaults apt-http-proxy=$PROXY apt-https-proxy=$PROXY juju-http-proxy=$PROXY juju-https-proxy=$PROXY snap-http-proxy=$PROXY snap-https-proxy=$PROXY
93-
juju model-defaults
9468
- name: Setup Python
9569
uses: actions/setup-python@v4
9670
with:

docs/readme.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This version may support old versions of Juju. However, it has been
1515
tested with the following requirements.
1616

1717
* Python 3.8/3.9/3.10
18-
* Juju 2.9.37
18+
* Juju 2.9.38
1919

2020

2121
Design Notes

juju/client/_client.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,10 @@ class CAASFirewallerFacade(TypeFactory):
171171
pass
172172

173173

174+
class CAASFirewallerSidecarFacade(TypeFactory):
175+
pass
176+
177+
174178
class CAASModelConfigManagerFacade(TypeFactory):
175179
pass
176180

@@ -491,6 +495,10 @@ class SSHClientFacade(TypeFactory):
491495
pass
492496

493497

498+
class SecretBackendsFacade(TypeFactory):
499+
pass
500+
501+
494502
class SecretsFacade(TypeFactory):
495503
pass
496504

@@ -503,6 +511,10 @@ class SecretsRotationWatcherFacade(TypeFactory):
503511
pass
504512

505513

514+
class SecretsTriggerWatcherFacade(TypeFactory):
515+
pass
516+
517+
506518
class SingularFacade(TypeFactory):
507519
pass
508520

juju/client/_client1.py

Lines changed: 967 additions & 29 deletions
Large diffs are not rendered by default.

juju/client/_client10.py

Lines changed: 659 additions & 0 deletions
Large diffs are not rendered by default.

juju/client/_client16.py

Lines changed: 1673 additions & 0 deletions
Large diffs are not rendered by default.

juju/client/_client6.py

Lines changed: 639 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)