Merge branch 'release-v5.5.0'

Author: qrkourier

.github/workflows/main.yml

@@ -73,23 +73,40 @@ jobs:
           exit 1
         fi
 
-    - name: Run the demo script to smoke test installed version
+    - name: Test shell autocomplete
+      run: |
+        register-python-argcomplete nfctl
+
+    - name: Run the demo script and NF CLI to smoke test installed version
       env:
         NETWORK_NAME: github_smoketest_run${{ github.run_id }}
         NETFOUNDRY_CLIENT_ID: ${{ secrets.NETFOUNDRY_CLIENT_ID }}
         NETFOUNDRY_PASSWORD: ${{ secrets.NETFOUNDRY_PASSWORD }}
         NETFOUNDRY_OAUTH_URL: ${{ secrets.NETFOUNDRY_OAUTH_URL }}
       run: |
-        python3 -m netfoundry.demo \
+        set -x
+        nfdemo \
+          --verbose \
           --network ${NETWORK_NAME} \
           --create-client \
           --create-private \
           --regions Americas \
           -- create
-        python3 -m netfoundry.demo \
+        nfctl \
+          --verbose \
+          --profile default \
+          --network ${NETWORK_NAME}
+        nfctl \
+          --verbose \
+          --profile default \
+          --network ${NETWORK_NAME} \
+          list services
+        nfctl \
+          --verbose \
+          --profile default \
           --network ${NETWORK_NAME} \
           --yes \
-          -- delete
+          delete network
 
     - name: Append 'latest' tag if release published
       env:

.github/workflows/mattermost-ziti-webhook.yml

@@ -17,6 +17,7 @@ jobs:
     name: POST Webhook
     steps:
     - uses: openziti/ziti-webhook-action@main
+      if: github.repository_owner == 'netfoundry'
       with:
         ziti-id: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
         webhook-url: ${{ secrets.ZITI_MATTERMOST_WEBHOOK_URL }}

Dockerfile

@@ -3,4 +3,4 @@ COPY ./dist/netfoundry-*.tar.gz /tmp/
 RUN pip install --upgrade pip
 RUN pip install /tmp/netfoundry-*.tar.gz
 RUN rm -f /tmp/netfoundry-*.tar.gz
-CMD ["python3 -m netfoundry.version"]
+CMD ["nfctl --version"]

Dockerfile.demo

@@ -1,4 +1,4 @@
 FROM netfoundry/python
 ARG network_name=BibbidiBobbidiBoo
 ENV NETWORK_NAME=${network_name}
-CMD python3 -m netfoundry.demo --network ${NETWORK_NAME}
+CMD nfdemo --network ${NETWORK_NAME}

netfoundry/__init__.py

@@ -1,8 +1,13 @@
 """Interface to NetFoundry management API."""
 
+import sys
+
 from . import _version
-from .network import Network
-from .network_group import NetworkGroup
-from .organization import Organization
+
+try:
+    assert (sys.version_info[0] == 3), "Python version must be 3"
+except Exception as e:
+    print (e)
+    exit(1)
 
 __version__ = _version.get_versions()['version']