fixed review comments from APIv4 team

Author: srbhaakamai

linode_api4/groups/monitor.py

@@ -8,14 +8,11 @@
 from linode_api4.groups import Group
 from linode_api4.objects import (
     AlertChannel,
-    AlertChannelEnvelope,
     AlertDefinition,
     MonitorDashboard,
     MonitorMetricsDefinition,
     MonitorService,
     MonitorServiceToken,
-    RuleCriteria,
-    TriggerConditions,
 )
 
 

linode_api4/objects/monitor.py

@@ -364,7 +364,6 @@ class AlertChannel(Base):
     """
 
     api_endpoint = "/monitor/alert-channels/"
-    id_attribute = "id"
 
     properties = {
         "id": Property(identifier=True),

test/fixtures/monitor/services/dbaas/alert-definitions/12345.json

@@ -1,9 +1,10 @@
-import time
+from time import time
 
 import pytest
 
 from linode_api4 import ApiError, LinodeClient
 from linode_api4.objects import (
+    AlertChannel,
     AlertDefinition,
     MonitorDashboard,
     MonitorMetricsDefinition,
@@ -200,10 +201,10 @@ def test_integration_create_get_update_delete_alert_definition(
     finally:
         if created:
             # Best-effort cleanup; allow transient errors.
-            alert_update_interval = 60 # max time alert should take to update
+            alert_update_interval = 120  # max time alert should take to update
             try:
-                time.sleep(alert_update_interval) 
-                delete_alert = client.load(AlertDefinition,created.id,service_type)
+                time.sleep(alert_update_interval)
+                delete_alert = client.load(AlertDefinition, created.id, service_type)
                 delete_alert.delete()
             except Exception:
 

test/integration/models/monitor/test_monitor.py

@@ -1,3 +1,4 @@
+from linode_api4 import PaginatedList
 from linode_api4.objects import (
     AggregateFunction,
     AlertDefinition,
@@ -55,38 +56,30 @@ def test_fetch_metrics(self):
             assert metrics.stats.seriesFetched == "2"
             assert not metrics.isPartial
 
+
 class MonitorAlertDefinitionsTest(ClientBaseCase):
     def test_get_alert_definition(self):
         service_type = "dbaas"
-        alert_id = 12345
-        url = f"/monitor/services/{service_type}/alert-definitions/{alert_id}"
+        url = f"/monitor/services/{service_type}/alert-definitions"
         with self.mock_get(url) as mock_get:
             alert = self.client.monitor.get_alert_definitions(
-                service_type=service_type, alert_id=alert_id
+                service_type=service_type
             )
 
-            # assert call
             assert mock_get.call_url == url
 
-            # assert object
-            assert isinstance(alert, AlertDefinition)
-            assert alert.id == 12345
+            # assert collection and element types
+            assert isinstance(alert, PaginatedList)
+            assert isinstance(alert[0], AlertDefinition)
 
             # fetch the raw JSON from the client and assert its fields
             raw = self.client.get(url)
-            assert raw["label"] == "Test Alert for DBAAS"
-            assert raw["service_type"] == "dbaas"
-            assert raw["status"] == "active"
-            assert raw["created"] == "2024-01-01T00:00:00"
-
-    def test_alert_definitions_requires_service_type_when_id_given(self):
-        # alert_id without service_type should raise ValueError
-        try:
-            self.client.monitor.get_alert_definitions(alert_id=12345)
-            raised = False
-        except ValueError:
-            raised = True
-        assert raised
+            # raw is a paginated response; check first item's fields
+            first = raw["data"][0]
+            assert first["label"] == "Test Alert for DBAAS"
+            assert first["service_type"] == "dbaas"
+            assert first["status"] == "active"
+            assert first["created"] == "2024-01-01T00:00:00"
 
     def test_create_alert_definition(self):
         service_type = "dbaas"
@@ -143,14 +136,3 @@ def test_update_alert_definition(self):
 
             resp = self.client.put(url, data={})
             assert resp["label"] == "Updated Label"
-
-    def test_delete_alert_definition(self):
-        service_type = "dbaas"
-        alert_id = 12345
-        url = f"/monitor/services/{service_type}/alert-definitions/{alert_id}"
-
-        with self.mock_delete() as mock_delete:
-            self.client.monitor.delete_alert_definition(service_type, alert_id)
-
-            assert mock_delete.call_url == url
-            assert mock_delete.called