worflow fix

Signed-off-by: PritamP20 <pripritam7@gmail.com>

Author: PritamP20

ardupilot_methodic_configurator/backend_flightcontroller.py

@@ -9,6 +9,8 @@
 """
 
 from argparse import ArgumentParser
+from logging import debug as logging_debug
+from logging import error as logging_error
 from logging import info as logging_info
 from logging import warning as logging_warning
 from os import path as os_path
@@ -528,7 +530,8 @@ def setup_signing(
         try:
             # Set up the signing state on the MAVLink connection
             # pymavlink's mavlink_connection supports signing setup
-            self.master.setup_signing(
+            # Type ignore needed because MavlinkConnection is a Union including object fallback
+            self.master.setup_signing(  # type: ignore[union-attr]
                 key,
                 sign_outgoing=sign_outgoing,
                 allow_unsigned_callback=self._unsigned_callback if allow_unsigned_in else None,
@@ -597,7 +600,8 @@ def disable_signing(self) -> tuple[bool, str]:
 
         try:
             # Disable signing by passing None as key
-            self.master.setup_signing(None, sign_outgoing=False, allow_unsigned_callback=None)
+            # Type ignore needed because MavlinkConnection is a Union including object fallback
+            self.master.setup_signing(None, sign_outgoing=False, allow_unsigned_callback=None)  # type: ignore[union-attr]
             logging_info(_("MAVLink signing disabled"))
             return True, ""
         except AttributeError:
@@ -635,7 +639,8 @@ def get_signing_status(self) -> dict[str, object]:
 
         try:
             # Check if signing is set up on the MAVLink connection
-            mav = self.master.mav
+            # Type ignore needed because MavlinkConnection is a Union including object fallback
+            mav = self.master.mav  # type: ignore[union-attr]
             if hasattr(mav, "signing") and mav.signing is not None:
                 signing = mav.signing
                 status["enabled"] = True

ardupilot_methodic_configurator/backend_signing_keystore.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """
 MAVLink 2.0 signing keystore for secure key management.
 
@@ -133,7 +131,7 @@ def fallback_path(self) -> Path:
     def _check_keyring_available(self) -> bool:
         """Check if OS keyring is available and functional."""
         try:
-            import keyring  # pylint: disable=import-outside-toplevel
+            import keyring  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
 
             # Try to get the default keyring
             backend = keyring.get_keyring()
@@ -191,7 +189,7 @@ def store_key(self, vehicle_id: str, key: bytes, description: str = "") -> bool:
         # Try keyring first
         if self._keyring_available:
             try:
-                import keyring  # pylint: disable=import-outside-toplevel
+                import keyring  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
 
                 # Store key as base64 encoded string
                 key_b64 = base64.b64encode(key).decode("ascii")
@@ -207,9 +205,11 @@ def store_key(self, vehicle_id: str, key: bytes, description: str = "") -> bool:
     def _store_key_in_file(self, vehicle_id: str, key: bytes, description: str = "") -> bool:
         """Store key in encrypted file."""
         try:
-            from cryptography.fernet import Fernet  # pylint: disable=import-outside-toplevel
-            from cryptography.hazmat.primitives import hashes  # pylint: disable=import-outside-toplevel
-            from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC  # pylint: disable=import-outside-toplevel
+            from cryptography.fernet import Fernet  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
+            from cryptography.hazmat.primitives import hashes  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
+            from cryptography.hazmat.primitives.kdf.pbkdf2 import (  # noqa: PLC0415
+                PBKDF2HMAC,  # pylint: disable=import-outside-toplevel
+            )
 
             # Load existing keystore or create new
             keystore = self._load_keystore_file()
@@ -270,7 +270,7 @@ def retrieve_key(self, vehicle_id: str) -> Optional[bytes]:
         # Try keyring first
         if self._keyring_available:
             try:
-                import keyring  # pylint: disable=import-outside-toplevel
+                import keyring  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
 
                 key_b64 = keyring.get_password(self._keyring_service, vehicle_id)
                 if key_b64:
@@ -284,9 +284,11 @@ def retrieve_key(self, vehicle_id: str) -> Optional[bytes]:
     def _retrieve_key_from_file(self, vehicle_id: str) -> Optional[bytes]:
         """Retrieve key from encrypted file."""
         try:
-            from cryptography.fernet import Fernet  # pylint: disable=import-outside-toplevel
-            from cryptography.hazmat.primitives import hashes  # pylint: disable=import-outside-toplevel
-            from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC  # pylint: disable=import-outside-toplevel
+            from cryptography.fernet import Fernet  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
+            from cryptography.hazmat.primitives import hashes  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
+            from cryptography.hazmat.primitives.kdf.pbkdf2 import (  # noqa: PLC0415
+                PBKDF2HMAC,  # pylint: disable=import-outside-toplevel
+            )
 
             keystore = self._load_keystore_file()
 
@@ -333,7 +335,7 @@ def delete_key(self, vehicle_id: str) -> bool:
         # Try keyring first
         if self._keyring_available:
             try:
-                import keyring  # pylint: disable=import-outside-toplevel
+                import keyring  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
 
                 keyring.delete_password(self._keyring_service, vehicle_id)
                 deleted = True
@@ -393,9 +395,11 @@ def export_key(self, vehicle_id: str, password: str) -> Optional[str]:
             return None
 
         try:
-            from cryptography.fernet import Fernet  # pylint: disable=import-outside-toplevel
-            from cryptography.hazmat.primitives import hashes  # pylint: disable=import-outside-toplevel
-            from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC  # pylint: disable=import-outside-toplevel
+            from cryptography.fernet import Fernet  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
+            from cryptography.hazmat.primitives import hashes  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
+            from cryptography.hazmat.primitives.kdf.pbkdf2 import (  # noqa: PLC0415
+                PBKDF2HMAC,  # pylint: disable=import-outside-toplevel
+            )
 
             # Generate salt
             salt = secrets.token_bytes(16)
@@ -442,9 +446,11 @@ def import_key(self, export_data: str, password: str) -> Optional[str]:
 
         """
         try:
-            from cryptography.fernet import Fernet, InvalidToken  # pylint: disable=import-outside-toplevel
-            from cryptography.hazmat.primitives import hashes  # pylint: disable=import-outside-toplevel
-            from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC  # pylint: disable=import-outside-toplevel
+            from cryptography.fernet import Fernet, InvalidToken  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
+            from cryptography.hazmat.primitives import hashes  # noqa: PLC0415 # pylint: disable=import-outside-toplevel
+            from cryptography.hazmat.primitives.kdf.pbkdf2 import (  # noqa: PLC0415
+                PBKDF2HMAC,  # pylint: disable=import-outside-toplevel
+            )
 
             # Decode export package
             data = json.loads(base64.b64decode(export_data).decode())

tests/test_signing_config.py

@@ -53,8 +53,7 @@ def temp_keystore(self, tmp_path) -> SigningKeystore:
         """Create a keystore using temporary storage."""
         with patch("ardupilot_methodic_configurator.backend_signing_keystore.user_data_dir") as mock_dir:
             mock_dir.return_value = str(tmp_path)
-            keystore = SigningKeystore(use_keyring=False)
-            return keystore
+            return SigningKeystore(use_keyring=False)
 
     def test_user_can_store_key_for_vehicle(self, temp_keystore) -> None:
         """
@@ -157,8 +156,7 @@ def temp_keystore(self, tmp_path) -> SigningKeystore:
         """Create a keystore using temporary storage."""
         with patch("ardupilot_methodic_configurator.backend_signing_keystore.user_data_dir") as mock_dir:
             mock_dir.return_value = str(tmp_path)
-            keystore = SigningKeystore(use_keyring=False)
-            return keystore
+            return SigningKeystore(use_keyring=False)
 
     def test_user_can_export_key_with_password(self, temp_keystore) -> None:
         """
@@ -172,7 +170,7 @@ def test_user_can_export_key_with_password(self, temp_keystore) -> None:
         key = temp_keystore.generate_key()
         vehicle_id = "EXPORT-VEHICLE"
         temp_keystore.store_key(vehicle_id, key)
-        password = "secure-password-123"
+        password = "secure-password-123"  # noqa: S105
         export_data = temp_keystore.export_key(vehicle_id, password)
 
         assert export_data is not None
@@ -190,7 +188,7 @@ def test_user_can_import_key_with_password(self, temp_keystore) -> None:
         original_key = temp_keystore.generate_key()
         vehicle_id = "IMPORT-VEHICLE"
         temp_keystore.store_key(vehicle_id, original_key)
-        password = "import-password-456"
+        password = "import-password-456"  # noqa: S105
         export_data = temp_keystore.export_key(vehicle_id, password)
 
         temp_keystore.delete_key(vehicle_id)
@@ -213,8 +211,8 @@ def test_invalid_password_fails_import(self, temp_keystore) -> None:
         key = temp_keystore.generate_key()
         vehicle_id = "WRONG-PASSWORD-VEHICLE"
         temp_keystore.store_key(vehicle_id, key)
-        correct_password = "correct-password"
-        wrong_password = "wrong-password"
+        correct_password = "correct-password"  # noqa: S105
+        wrong_password = "wrong-password"  # noqa: S105
         export_data = temp_keystore.export_key(vehicle_id, correct_password)
 
         temp_keystore.delete_key(vehicle_id)
@@ -262,8 +260,7 @@ def temp_keystore(self, tmp_path) -> SigningKeystore:
         """Create a keystore using temporary storage."""
         with patch("ardupilot_methodic_configurator.backend_signing_keystore.user_data_dir") as mock_dir:
             mock_dir.return_value = str(tmp_path)
-            keystore = SigningKeystore(use_keyring=False)
-            return keystore
+            return SigningKeystore(use_keyring=False)
 
     def test_invalid_key_length_raises_error(self, temp_keystore) -> None:
         """