!50 bug(targets): [#101] Probely CLI - target delete not working Closes #101

Author: João Silva

probely/sdk/client.py

@@ -119,7 +119,7 @@ def _call_probely_api(cls, request):
 
         status_code = resp.status_code
         try:
-            content = json.loads(resp.content)
+            content = {} if resp.content == b"" else json.loads(resp.content)
         except json.JSONDecodeError:  # todo: needs testing
             logger.debug(
                 "Something wrong with the API. Response content is not valid JSON."

probely/sdk/targets.py

@@ -70,6 +70,8 @@ def delete_targets(targets_ids: List[str]):
     :type targets_ids: List[str].
 
     """
+    validate_resource_ids(PROBELY_API_TARGETS_URL, targets_ids)
+
     url = PROBELY_API_TARGETS_BULK_DELETE_URL
 
     logger.debug("Delete targets : %s", targets_ids)

tests/sdk/test_client.py

@@ -222,6 +222,22 @@ def test_probely_api_client__content_when_content_invalid(
     assert str(raised_ex.value) == "API is unavailable. Contact support."
 
 
+@patch("probely.sdk.client.requests.Session.send")
+def test_probely_api_client__content_is_empty_string(
+    requests_session_send_mock: Mock,
+    set_default_api_key,
+):
+    requests_session_send_mock.return_value = Mock(
+        status_code=204,
+        content=b"",
+    )
+
+    status_code, content = ProbelyAPIClient.delete("https://irrelevant_url.com")
+
+    assert content == {}
+    assert status_code == 204
+
+
 @patch("probely.sdk.client.requests.Session.send")
 def test_probely_api_client__return_is_correct(
     requests_session_send_mock: Mock,

tests/sdk/test_targets.py

@@ -90,7 +90,7 @@ def test_retrieve_target__success_api_call(api_client_mock: Mock):
 def test_delete_target__success_api_call(api_client_mock: Mock):
     resp_code = 204
     testable_id = "2DZkoZH8WMEM"
-    resp_content = {"id": testable_id}
+    resp_content = b""
 
     api_client_mock.return_value = (resp_code, resp_content)
 
@@ -127,14 +127,20 @@ def test_delete_target__unsuccessful_api_call(api_client_mock: Mock):
 
 
 @patch("probely.sdk.client.ProbelyAPIClient.post")
-def test_delete_targets__unsuccessful_api_call(api_client_mock: Mock):
+@patch("probely.sdk.targets.validate_resource_ids")
+def test_delete_targets__unsuccessful_api_call(
+    validate_resource_ids_mock: MagicMock, api_client_mock: MagicMock
+):
+    validate_resource_ids_mock.return_value = None
     resp_code = 400
     testable_id = "2DZkoZH8WMEM"
 
-    api_client_mock.return_value = (resp_code, {})
+    api_client_mock.return_value = (resp_code, b"")
     with pytest.raises(BaseException) as exc_info:
         delete_targets([testable_id])
 
+    validate_resource_ids_mock.assert_called_once()
+
     expected_call_url = PROBELY_API_TARGETS_BULK_DELETE_URL
     api_client_mock.assert_called_with(
         url=expected_call_url, payload={"ids": [testable_id]}