Merge branch 'master' into series-or-base-for-local-charms

Author: juanmanuel-tirado

.github/workflows/test.yaml

@@ -0,0 +1,102 @@
+name: Testing
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    name: Linter
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v3
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install dependencies
+      run: pip install tox
+    - name: Run linter
+      run: tox -e lint
+
+  unit-tests:
+    needs: lint
+    name: Unit tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v3
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install dependencies
+      run: pip install tox
+    - name: Run unit tests
+      run: tox -e py3
+    
+  integration:
+    name: Integration
+    needs: [lint, unit-tests]
+    timeout-minutes: 120
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v3
+    - name: Setup operator environment
+      uses: charmed-kubernetes/actions-operator@main
+      with:
+        provider: lxd
+        juju-channel: 3.0/stable
+    - name: Set proxy in controller
+      run: |
+        set -euxo pipefail
+        # build a squid config file
+        CONTROLLER_IP=$(juju list-controllers --format yaml | yq '.controllers[.current-controller].recent-server' | awk -F '[:]' '{print $1}');
+        echo "Controller IP is: $CONTROLLER_IP"
+        PROXY=$CONTROLLER_IP:3128
+        echo "Proxy address is: $PROXY"
+        echo "acl all src all" > squid.conf
+        echo "http_access allow all" >> squid.conf
+        echo "http_port $PROXY" >> squid.conf
+        cat squid.conf
+        # copy to the controller and reconfigure it
+        juju status -m controller
+        juju switch controller
+        juju ssh 0 "sudo apt-get install squid -y"
+        juju scp squid.conf 0:/tmp/squid.conf
+        juju ssh 0 "sudo mv /tmp/squid.conf /etc/squid/squid.conf"
+        juju ssh 0 "sudo squid -k reconfigure"
+        # Test curl after waiting
+        sleep 10
+        echo "Test proxy access"
+        curl -s -o /dev/null -w "%{http_code}" --proxy http://$PROXY https://charmhub.io
+        # set model defaults
+        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
+        juju model-defaults
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install dependencies
+      run: pip install tox
+    - name: Run integration
+      # Force one single concurrent test
+      run: tox -e integration -- -n 1

.github/workflows/tox.yaml

@@ -1 +1 @@
-3.0.4
+3.1.0-b1

VERSION

@@ -24,9 +24,9 @@ async def main():
         'aws-tim',
     )
     await model.deploy(
-        'cs:ubuntu-0',
+        'ubuntu',
         application_name='ubuntu',
-        series='trusty',
+        series='focal',
         channel='stable',
     )
     await model.disconnect()

examples/controller.py

@@ -15,6 +15,5 @@ async def status():
 
     return status
 
-
 if __name__ == '__main__':
     jasyncio.run(status())

examples/fullstatus.py

@@ -4,23 +4,21 @@
 from juju.client._definitions import *
 
 
-from juju.client import _client7, _client1, _client3, _client2, _client14, _client4, _client6, _client5, _client11, _client9, _client18, _client8, _client15
+from juju.client import _client7, _client1, _client3, _client4, _client2, _client15, _client6, _client5, _client11, _client9, _client18
 
 
 CLIENTS = {
     "7": _client7,
     "1": _client1,
     "3": _client3,
-    "2": _client2,
-    "14": _client14,
     "4": _client4,
+    "2": _client2,
+    "15": _client15,
     "6": _client6,
     "5": _client5,
     "11": _client11,
     "9": _client9,
-    "18": _client18,
-    "8": _client8,
-    "15": _client15
+    "18": _client18
 }
 
 
@@ -154,10 +152,6 @@ class CAASApplicationProvisionerFacade(TypeFactory):
     pass
 
 
-class CAASFirewallerEmbeddedFacade(TypeFactory):
-    pass
-
-
 class CAASFirewallerFacade(TypeFactory):
     pass
 
@@ -194,10 +188,6 @@ class CharmDownloaderFacade(TypeFactory):
     pass
 
 
-class CharmHubFacade(TypeFactory):
-    pass
-
-
 class CharmRevisionUpdaterFacade(TypeFactory):
     pass
 
@@ -286,10 +276,6 @@ class HostKeyReporterFacade(TypeFactory):
     pass
 
 
-class ImageManagerFacade(TypeFactory):
-    pass
-
-
 class ImageMetadataFacade(TypeFactory):
     pass
 
@@ -462,10 +448,6 @@ class ResourcesHookContextFacade(TypeFactory):
     pass
 
 
-class ResumerFacade(TypeFactory):
-    pass
-
-
 class RetryStrategyFacade(TypeFactory):
     pass
 
@@ -482,10 +464,6 @@ class SecretsManagerFacade(TypeFactory):
     pass
 
 
-class SecretsRotationWatcherFacade(TypeFactory):
-    pass
-
-
 class SecretsTriggerWatcherFacade(TypeFactory):
     pass