Merge branch 'release-v5.9.1'

Author: qrkourier

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

@@ -10,13 +10,14 @@ on:
   push:
   fork:
   release:
+  workflow_dispatch:
 
 jobs:
   mattermost-ziti-webhook:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     name: POST Webhook
     steps:
-    - uses: openziti/ziti-webhook-action@v0.1.7
+    - uses: openziti/ziti-webhook-action@v2
       if: ${{ env.ZITI_MATTERMOST_WEBHOOK_URL != null }}
       env:
           ZITI_MATTERMOST_WEBHOOK_URL: ${{ secrets.ZITI_MATTERMOST_WEBHOOK_URL }}

.gitignore

@@ -363,3 +363,4 @@ typescript*.*
 
 /*.json
 /*.jwt
+.eggs/

netfoundry/utility.py

@@ -319,13 +319,13 @@ def find_generic_resources(url: str, headers: dict, embedded: str = None, proxie
     elif resource_type.name in ["process-executions"]:
         params['beta'] = str()
 
-    for param in kwargs.keys():
-        if param == 'name' and resource_type.name == 'networks':  # workaround sort param bug in MOP-17863
-            params['findByName'] = param
-        elif param == 'networkGroupId' and resource_type.name == 'network-groups':
-            params['findByNetworkGroupId'] = param
+    for k, v in kwargs.items():
+        if k == 'name' and resource_type.name == 'networks':  # workaround sort param bug in MOP-17863
+            params['findByName'] = v
+        elif k == 'networkGroupId' and resource_type.name in ['networks', 'network-groups']:
+            params['findByNetworkGroupId'] = v
         else:
-            params[param] = kwargs[param]
+            params[k] = v
 
     # normalize output with a default sort param
     if not params.get('sort'):

setup.cfg

@@ -37,6 +37,7 @@ setup_requires =
 
 [bdist_wheel]
 universal = 1
+python_tag = py3
 
 [options.package_data]
     netfoundry = friendly-words/generated/words.json