Cleanup with ruff check (#963)

* Implement improvements suggested by ruff check.

* Add ruff check to CI.

* Add changelog fragment.

plugins/module_utils/_openssh/backends/common.py

@@ -21,10 +21,6 @@ from ansible_collections.community.crypto.plugins.module_utils._openssh.utils im
 
 if t.TYPE_CHECKING:
     from ansible.module_utils.basic import AnsibleModule  # pragma: no cover
-    from cryptography.hazmat.primitives.asymmetric.types import (  # pragma: no cover
-        CertificateIssuerPrivateKeyTypes,
-        PrivateKeyTypes,
-    )
 
     from ansible_collections.community.crypto.plugins.module_utils._openssh.certificate import (  # pragma: no cover
         OpensshCertificateTimeParameters,
@@ -96,7 +92,7 @@ def _restore_all_on_failure(
                     os.path.abspath(backup), os.path.abspath(destination)
                 )
             raise
-        for destination, backup in backups:
+        for dummy_destination, backup in backups:
             self.module.add_cleanup_file(backup)
 
     return backup_and_restore
@@ -373,7 +369,9 @@ class PrivateKey:
         return self._format
 
     @classmethod
-    def from_string(cls: t.Type[_PrivateKey], string: str) -> _PrivateKey:
+    def from_string(
+        cls: t.Type[_PrivateKey], string: str  # noqa: UP006
+    ) -> _PrivateKey:
         properties = string.split()
 
         return cls(
@@ -439,7 +437,7 @@ class PublicKey:
         return self._type_string
 
     @classmethod
-    def from_string(cls: t.Type[_PublicKey], string: str) -> _PublicKey:
+    def from_string(cls: type[_PublicKey], string: str) -> _PublicKey:
         properties = string.strip("\n").split(" ", 2)
 
         return cls(
@@ -449,7 +447,7 @@ class PublicKey:
         )
 
     @classmethod
-    def load(cls: t.Type[_PublicKey], path: str | os.PathLike) -> _PublicKey | None:
+    def load(cls: type[_PublicKey], path: str | os.PathLike) -> _PublicKey | None:
         with open(path, "r", encoding="utf-8") as f:
             properties = f.read().strip(" \n").split(" ", 2)
 

plugins/module_utils/_openssh/backends/keypair_backend.py

@@ -46,10 +46,6 @@ from ansible_collections.community.crypto.plugins.module_utils._version import (
 
 if t.TYPE_CHECKING:
     from ansible.module_utils.basic import AnsibleModule  # pragma: no cover
-    from cryptography.hazmat.primitives.asymmetric.types import (  # pragma: no cover
-        CertificateIssuerPrivateKeyTypes,
-        PrivateKeyTypes,
-    )
 
 
 class KeypairBackend(OpensshModule, metaclass=abc.ABCMeta):

plugins/module_utils/_openssh/certificate.py

@@ -312,7 +312,7 @@ class OpensshCertificateOption:
 
     @classmethod
     def from_string(
-        cls: t.Type[_OpensshCertificateOption], option_string: str
+        cls: t.Type[_OpensshCertificateOption], option_string: str  # noqa: UP006
     ) -> _OpensshCertificateOption:
         if not isinstance(option_string, str):
             raise ValueError(
@@ -573,7 +573,7 @@ class OpensshCertificate:
 
     @classmethod
     def load(
-        cls: t.Type[_OpensshCertificate], path: str | os.PathLike
+        cls: t.Type[_OpensshCertificate], path: str | os.PathLike  # noqa: UP006
     ) -> _OpensshCertificate:
         if not os.path.exists(path):
             raise ValueError(f"{path} is not a valid path.")

plugins/module_utils/_openssh/cryptography.py

@@ -79,13 +79,13 @@ if t.TYPE_CHECKING:
     KeySerializationFormat = t.Literal["PEM", "DER", "SSH"]  # pragma: no cover
     KeyType = t.Literal["rsa", "dsa", "ed25519", "ecdsa"]  # pragma: no cover
 
-    PrivateKeyTypes = t.Union[
+    PrivateKeyTypes = t.Union[  # noqa: UP007
         rsa.RSAPrivateKey,
         dsa.DSAPrivateKey,
         ec.EllipticCurvePrivateKey,
         Ed25519PrivateKey,
     ]  # pragma: no cover
-    PublicKeyTypes = t.Union[
+    PublicKeyTypes = t.Union[  # noqa: UP007
         rsa.RSAPublicKey, dsa.DSAPublicKey, ec.EllipticCurvePublicKey, Ed25519PublicKey
     ]  # pragma: no cover
 
@@ -149,7 +149,7 @@ class AsymmetricKeypair:
 
     @classmethod
     def generate(
-        cls: t.Type[_AsymmetricKeypair],
+        cls: type[_AsymmetricKeypair],
         *,
         keytype: KeyType = "rsa",
         size: int | None = None,
@@ -213,7 +213,7 @@ class AsymmetricKeypair:
 
     @classmethod
     def load(
-        cls: t.Type[_AsymmetricKeypair],
+        cls: type[_AsymmetricKeypair],
         *,
         path: str | os.PathLike,
         passphrase: bytes | None = None,
@@ -412,7 +412,7 @@ class OpensshKeypair:
 
     @classmethod
     def generate(
-        cls: t.Type[_OpensshKeypair],
+        cls: type[_OpensshKeypair],
         *,
         keytype: KeyType = "rsa",
         size: int | None = None,
@@ -451,7 +451,7 @@ class OpensshKeypair:
 
     @classmethod
     def load(
-        cls: t.Type[_OpensshKeypair],
+        cls: type[_OpensshKeypair],
         *,
         path: str | os.PathLike,
         passphrase: bytes | None = None,

plugins/module_utils/_openssh/utils.py

@@ -331,7 +331,7 @@ class _OpensshWriter:
         for name, data in value:
             writer.string(name)
             # SSH option data is encoded twice though this behavior is not documented
-            writer.string(_OpensshWriter().string(data).bytes() if data else bytes())
+            writer.string(_OpensshWriter().string(data).bytes() if data else b"")
 
         self.string(writer.bytes())