Merge pull request #2145 from apache/fix_paramiko

Fix error in tests using paramiko > 4

Author: micafer

.github/workflows/main.yml

@@ -117,7 +117,7 @@ jobs:
         run: tox -e coverage-ci
 
       - name: Upload Coverage to codecov.io
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+        uses: codecov/codecov-action@e53489f4d376d79066609109e7a95a29eb3740b1 # v7.0.0
         with:
           # We utilize secret for more realiable builds. Without secret being set, upload step
           # fails fairly often.

integration/storage/test_azure_blobs.py

@@ -119,7 +119,7 @@ def setUpClass(cls):
             client_secret=config["AZURE_CLIENT_SECRET"],
         )
 
-        resource_client = resource.ResourceManagementClient(
+        resource_client = resource.resources.ResourceManagementClient(
             credentials,
             config["AZURE_SUBSCRIPTION_ID"],
         )
@@ -205,7 +205,7 @@ def setUpClass(cls):
         )
 
         cls.account = account.name
-        cls.secret = keys.keys[0].value
+        cls.secret = keys["keys"][0]["value"]
 
 
 class StorageV2Test(StorageTest):

libcloud/compute/ssh.py

@@ -668,7 +668,9 @@ def _get_pkey_object(self, key, password=None):
 
         if paramiko_version < (4, 0, 0):
             # DSSKey removed in paramiko 4.0.0
-            key_types.insert(1, (paramiko.DSSKey, "DSA"))
+            dss_key_cls = getattr(paramiko, "DSSKey", None)
+            if dss_key_cls:
+                key_types.insert(1, (dss_key_cls, "DSA"))
         if paramiko_version >= (2, 2, 0):
             # Ed25519 is only supported in paramiko >= 2.2.0
             key_types.append((paramiko.ed25519key.Ed25519Key, "Ed25519"))

pyproject.toml

@@ -89,8 +89,10 @@ test = [
     "cryptography==46.0.7",
     "pyopenssl==26.0.0",
     "fasteners",
-    "paramiko==3.5.1; platform_python_implementation != 'PyPy'",
+    "paramiko==5.0.0; platform_python_implementation != 'PyPy'",
     "libvirt-python==12.0.0",
+    "urllib3>=2.7.0",  # to avoid security issues with older versions of urllib3
+    "idna>=3.15",  # to avoid security issues with older versions of idna
 ]
 lint = [
     "pep8==1.7.1",
@@ -105,7 +107,7 @@ lint = [
     "codespell==2.4.1",
     "prek>=0.2.17",
     "requests>=2.27.1",
-    "paramiko==3.5.1; platform_python_implementation != 'PyPy'",
+    "paramiko==5.0.0; platform_python_implementation != 'PyPy'",
 ]
 docs = [
     "rstcheck==6.2.5; python_version >= '3.10'",