Merge branch 'dev' into feature/TPT-4701-replace-hardcoded-capabilities-with-capability-class

Author: mawilk90

linode_api4/objects/monitor.py

@@ -276,8 +276,8 @@ class MonitorDashboard(Base):
         "id": Property(identifier=True),
         "created": Property(is_datetime=True),
         "label": Property(),
-        "service_type": Property(ServiceType),
-        "type": Property(DashboardType),
+        "service_type": Property(),
+        "type": Property(),
         "group_by": Property(),
         "widgets": Property(json_object=DashboardWidget),
         "updated": Property(is_datetime=True),
@@ -294,7 +294,7 @@ class MonitorService(Base):
     api_endpoint = "/monitor/services/{service_type}"
     id_attribute = "service_type"
     properties = {
-        "service_type": Property(ServiceType),
+        "service_type": Property(),
         "label": Property(),
         "alert": Property(json_object=ServiceAlert),
     }
@@ -495,7 +495,7 @@ class AlertDefinition(DerivedBase):
         "entity_ids": Property(mutable=True),
         "description": Property(mutable=True),
         "service_class": Property(alias_of="class"),
-        "scope": Property(AlertScope),
+        "scope": Property(),
         "regions": Property(mutable=True),
         "entities": Property(json_object=AlertEntities),
         "channel_ids": Property(mutable=True),

pyproject.toml

@@ -46,6 +46,7 @@ unit-test = [
 ]
 int-test = [
     "linode_api4[test-shared]",
+    "cryptography",
 ]
 lint = [
     "black>=23.1.0",

test/integration/conftest.py

@@ -2,7 +2,6 @@
 import logging
 import os
 import random
-import subprocess
 import time
 from test.integration.helpers import (
     get_test_label,
@@ -14,6 +13,8 @@
 
 import pytest
 import requests
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import ed25519
 from requests.exceptions import ConnectionError, RequestException
 
 from linode_api4 import (
@@ -273,17 +274,28 @@ def create_linode_for_pass_reset(test_linode_client, e2e_test_firewall):
 
 
 @pytest.fixture(scope="session")
-def ssh_key_gen(tmp_path_factory):
-    key_path = tmp_path_factory.mktemp("ssh-key-gen") / "sdk-sshkey"
-
-    subprocess.run(
-        ["ssh-keygen", "-q", "-t", "rsa", "-f", str(key_path), "-N", ""],
-        check=True,
+def ssh_key_gen():
+    key = ed25519.Ed25519PrivateKey.generate()
+
+    pub_key = (
+        key.public_key()
+        .public_bytes(
+            encoding=serialization.Encoding.OpenSSH,
+            format=serialization.PublicFormat.OpenSSH,
+        )
+        .decode()
+        .rstrip()
+    )
+    priv_key = (
+        key.private_bytes(
+            encoding=serialization.Encoding.PEM,
+            format=serialization.PrivateFormat.OpenSSH,
+            encryption_algorithm=serialization.NoEncryption(),
+        )
+        .decode()
+        .rstrip()
     )
 
-    pub_key = key_path.with_suffix(".pub").read_text().rstrip()
-    priv_key = key_path.read_text().rstrip()
-
     yield pub_key, priv_key