test: preserve email and complete webhook channel coverage

Author: mawasthy-lgtm

test/unit/groups/monitor_api_test.py

@@ -266,10 +266,10 @@ def test_clone_alert_definition_with_optional_fields(self):
             assert mock_post.call_data["channel_ids"] == [1, 2]
             assert mock_post.call_data["group_by"] == ["entity_id"]
 
-    def test_create_email_channel(self):
+    def test_create_update_delete_alert_channel(self):
         """
-        Test creating an email alert channel.
-        Verifies that channel_create() properly handles email channel details.
+        E2E test for alert channel CRUD: create, update, and delete.
+        Verifies the full lifecycle of an alert channel.
         """
         create_url = "/monitor/alert-channels"
         channel_id = 789
@@ -314,6 +314,63 @@ def test_create_email_channel(self):
             assert channel.label == "Email Test Channel"
             assert channel.channel_type == "email"
 
+        updated_response = create_response.copy()
+        updated_response["label"] = "Email Test Channel Updated"
+        updated_response["updated"] = "2024-01-02T00:00:00"
+
+        with self.mock_put(updated_response) as mock_put:
+            channel.label = "Email Test Channel Updated"
+            result = channel.save()
+
+            assert mock_put.call_url == channel_url
+            assert result is True
+            assert channel.label == "Email Test Channel Updated"
+
+        with self.mock_delete() as mock_delete:
+            result = channel.delete()
+
+            assert mock_delete.call_url == channel_url
+            assert result is True
+
+    def test_alert_channel_alerts(self):
+        """Test retrieval of alerts associated with an alert channel."""
+        channel_id = 123
+        alerts_url = f"/monitor/alert-channels/{channel_id}/alerts"
+        alerts_response = {
+            "data": [
+                {
+                    "id": 12345,
+                    "label": "DBAAS Alert 1",
+                    "service_type": "dbaas",
+                    "type": "alerts-definitions",
+                    "url": "/monitor/services/dbaas/alerts-definitions/12345",
+                },
+                {
+                    "id": 12346,
+                    "label": "DBAAS Alert 2",
+                    "service_type": "dbaas",
+                    "type": "alerts-definitions",
+                    "url": "/monitor/services/dbaas/alerts-definitions/12346",
+                },
+            ],
+            "page": 1,
+            "pages": 1,
+            "results": 2,
+        }
+
+        with self.mock_get(alerts_response) as mock_get:
+            alerts = self.client.monitor.alert_channel_alerts(channel_id)
+
+            assert mock_get.call_url == alerts_url
+            assert isinstance(alerts, PaginatedList)
+            assert len(alerts) == 2
+            assert isinstance(alerts[0], AlertDefinition)
+            assert alerts[0].id == 12345
+            assert alerts[0].service_type == "dbaas"
+            assert isinstance(alerts[1], AlertDefinition)
+            assert alerts[1].id == 12346
+            assert alerts[1].service_type == "dbaas"
+
     def test_create_webhook_channel(self):
         """
         Test creating a webhook alert channel.
@@ -422,17 +479,16 @@ def test_update_webhook_channel(self):
         channel_id = 123
         update_url = f"/monitor/alert-channels/{channel_id}"
 
-        channel = self.client.load(AlertChannel, channel_id)
-
         update_response = {
             "id": channel_id,
             "label": "python-sdk-webhook-change-updated",
             "type": "user",
-            "channel_type": "email",
+            "channel_type": "webhook",
             "details": {
-                "email": {
-                    "usernames": ["admin-user1", "admin-user2"],
-                    "recipient_type": "user",
+                "webhook": {
+                    "endpoint_url": "https://example.com/webhook",
+                    "authentication": {"type": "none"},
+                    "data_compression": "none",
                 }
             },
             "alerts": {
@@ -445,6 +501,9 @@ def test_update_webhook_channel(self):
             "created_by": "user1",
             "updated_by": "user1",
         }
+        channel_data = update_response.copy()
+        channel_data["label"] = "python-sdk-webhook-change"
+        channel = AlertChannel(self.client, channel_id, channel_data)
 
         with self.mock_put(update_response) as mock_put:
             channel.label = "python-sdk-webhook-change-updated"
@@ -455,6 +514,11 @@ def test_update_webhook_channel(self):
                 mock_put.call_data["label"]
                 == "python-sdk-webhook-change-updated"
             )
+            assert channel.channel_type == "webhook"
+            assert (
+                channel.details.webhook.endpoint_url
+                == "https://example.com/webhook"
+            )
 
     def test_delete_webhook_channel(self):
         """

test/unit/objects/monitor_test.py

@@ -18,6 +18,7 @@
     CustomHeader,
     CustomHTTPSLogsDestinationDetails,
     DestinationAuthentication,
+    EmailDetails,
     LogsDestinationDetailsBase,
     LogsStreamDetails,
     LogsStreamType,
@@ -195,6 +196,61 @@ def test_alert_channels(self):
         )
         self.assertEqual(channels[0].alerts.alert_count, 0)
 
+    def test_create_update_delete_channel(self):
+        """Test the parent email channel create, update, and delete lifecycle."""
+        create_url = "/monitor/alert-channels"
+        channel_id = 999
+        channel_url = f"{create_url}/{channel_id}"
+        create_response = {
+            "id": channel_id,
+            "label": "CRUD Test Channel",
+            "type": "user",
+            "channel_type": "email",
+            "details": {
+                "email": {
+                    "usernames": ["crud_user1", "crud_user2"],
+                    "recipient_type": "user",
+                }
+            },
+            "alerts": {
+                "url": f"{channel_url}/alerts",
+                "type": "alerts-definitions",
+                "alert_count": 0,
+            },
+            "created": "2024-01-01T00:00:00",
+            "updated": "2024-01-01T00:00:00",
+            "created_by": "crud_user1",
+            "updated_by": "crud_user1",
+        }
+
+        with self.mock_post(create_response) as mock_post:
+            channel = self.client.monitor.channel_create(
+                label="CRUD Test Channel",
+                channel_type="email",
+                details=ChannelDetails(
+                    email=EmailDetails(
+                        recipient_type="user",
+                        usernames=["crud_user1", "crud_user2"],
+                    )
+                ),
+            )
+            self.assertEqual(mock_post.call_url, create_url)
+            self.assertIsInstance(channel, AlertChannel)
+            self.assertEqual(channel.channel_type, "email")
+
+        updated_response = create_response.copy()
+        updated_response["label"] = "CRUD Test Channel Updated"
+        with self.mock_put(updated_response) as mock_put:
+            channel.label = "CRUD Test Channel Updated"
+            self.assertTrue(channel.save())
+
+            self.assertEqual(mock_put.call_url, channel_url)
+            self.assertEqual(channel.label, "CRUD Test Channel Updated")
+
+        with self.mock_delete() as mock_delete:
+            self.assertTrue(channel.delete())
+            self.assertEqual(mock_delete.call_url, channel_url)
+
     def test_webhook_channel_validation(self):
         """
         Test webhook channel validation constraints for create and verify operations.
@@ -288,14 +344,15 @@ def test_webhook_channel_validation(self):
             self.client.monitor._validate_webhook_details(webhook_details)
         self.assertIn("Content-Type", str(cm.exception))
 
-    def test_create_update_verify_delete_webhook_channel(self):
+    def test_create_get_update_verify_delete_webhook_channel(self):
         """
-        Test webhook channel create, update, verify, and delete operations.
+        Test webhook channel create, get, update, verify, and delete operations.
         Verifies the full lifecycle of a webhook alert channel object:
         1. POST /monitor/alert-channels - Create webhook channel
-        2. PUT /monitor/alert-channels/{id} - Update channel label
-        3. POST /monitor/alert-channels/verify - Verify webhook configuration
-        4. DELETE /monitor/alert-channels/{id} - Delete the channel
+        2. GET /monitor/alert-channels/{id} - Retrieve webhook channel
+        3. PUT /monitor/alert-channels/{id} - Update channel label
+        4. POST /monitor/alert-channels/verify - Verify webhook configuration
+        5. DELETE /monitor/alert-channels/{id} - Delete the channel
         """
         create_url = "/monitor/alert-channels"
         channel_id = 888
@@ -367,6 +424,17 @@ def test_create_update_verify_delete_webhook_channel(self):
                 webhook_channel.details.webhook.authentication.type, "basic"
             )
 
+        # GET: Retrieve the webhook channel by ID
+        with self.mock_get(create_response) as m_get:
+            webhook_channel = self.client.load(AlertChannel, channel_id)
+
+            self.assertEqual(m_get.call_url, channel_url)
+            self.assertEqual(webhook_channel.channel_type, "webhook")
+            self.assertEqual(
+                webhook_channel.details.webhook.endpoint_url,
+                "https://example.com/webhook",
+            )
+
         # UPDATE: Update the webhook channel label
         update_response = create_response.copy()
         update_response["label"] = "python-sdk-webhook-change-updated"