Return dataclasses from get_info and encrypt (#85)

This patch replaces the tuples returned by get_info and encrypt with
dataclasses.

Fixes: #80
Fixes: #79

nethsm/__init__.py

@@ -198,6 +198,12 @@ def from_string(s: str) -> "TlsKeyType":
         raise ValueError(f"Unsupported TLS key type {s}")
 
 
+@dataclass
+class Info:
+    vendor: str
+    product: str
+
+
 @dataclass
 class SystemInfo:
     firmware_version: str
@@ -225,6 +231,12 @@ class Key:
     data: Optional[str]
 
 
+@dataclass
+class EncryptionResult:
+    encrypted: str
+    iv: str
+
+
 @dataclass
 class LoggingConfig:
     ip_address: str
@@ -716,12 +728,12 @@ def delete_key_tag(self, key_id: str, tag: str) -> None:
                 },
             )
 
-    def get_info(self) -> tuple[str, str]:
+    def get_info(self) -> Info:
         try:
             response = self.get_api().info_get()
         except Exception as e:
             _handle_exception(e)
-        return (response.body.vendor, response.body.product)
+        return Info(vendor=response.body.vendor, product=response.body.product)
 
     def get_state(self) -> State:
         try:
@@ -1436,7 +1448,7 @@ def factory_reset(self) -> None:
 
     def encrypt(
         self, key_id: str, data: str, mode: EncryptMode, iv: str
-    ) -> tuple[str, str]:
+    ) -> EncryptionResult:
         from .client.components.schema.encrypt_request_data import (
             EncryptRequestDataDict,
         )
@@ -1460,7 +1472,7 @@ def encrypt(
                     404: f"Key {key_id} not found",
                 },
             )
-        return (response.body.encrypted, response.body.iv)
+        return EncryptionResult(encrypted=response.body.encrypted, iv=response.body.iv)
 
     def decrypt(
         self,

tests/test_nethsm_keys.py

@@ -320,9 +320,10 @@ def test_encrypt_decrypt(nethsm: NetHSM) -> None:
             EncryptMode.AES_CBC,
             iv_b64,
         )
+        assert encrypted.iv == iv_b64
         decrypt = nethsm.decrypt(
             C.KEY_ID_AES,
-            encrypted[0],
+            encrypted.encrypted,
             DecryptMode.AES_CBC,
             iv_b64,
         )

tests/test_nethsm_other.py

@@ -55,10 +55,10 @@ def test_state_provision(nethsm_no_provision: NetHSM) -> None:
 
 def test_info(nethsm_no_provision: NetHSM) -> None:
     """Query the vendor and product information for a NetHSM."""
-    (vendor, product) = nethsm_no_provision.get_info()
+    info = nethsm_no_provision.get_info()
     assert nethsm_no_provision.host == C.HOST
-    assert vendor == "Nitrokey GmbH"
-    assert product == "NetHSM"
+    assert info.vendor == "Nitrokey GmbH"
+    assert info.product == "NetHSM"
 
 
 def test_state_provision_add_user_metrics_get_metrics(