Merge pull request #993 from neo4j/swallow-410-instance-deletion

Make instance deletion more idempotent

Author: Mats-SX

graphdatascience/session/aura_api.py

@@ -248,9 +248,11 @@ def create_instance(
         return InstanceCreateDetails.from_json(response.json()["data"])
 
     def delete_instance(self, instance_id: str) -> InstanceSpecificDetails | None:
+        # Delete an AuraDB instance.
+        # If the instance cannot be found or was already deleted, returns None.
         response = self._request_session.delete(f"{self._base_uri}/v1/instances/{instance_id}")
 
-        if response.status_code == HTTPStatus.NOT_FOUND.value:
+        if response.status_code in [HTTPStatus.NOT_FOUND.value, HTTPStatus.GONE.value]:
             return None
 
         self._check_resp(response)

graphdatascience/tests/unit/test_aura_api.py

@@ -1,6 +1,7 @@
 import logging
 import re
 from datetime import datetime, timedelta, timezone
+from http import HTTPStatus
 
 import pytest
 from _pytest.logging import LogCaptureFixture
@@ -715,7 +716,7 @@ def test_delete_instance(requests_mock: Mocker) -> None:
     )
 
 
-def test_delete_already_deleting_instance(requests_mock: Mocker) -> None:
+def test_delete_missing_instance(requests_mock: Mocker) -> None:
     api = AuraApi(client_id="", client_secret="", project_id="some-tenant")
 
     mock_auth_token(requests_mock)
@@ -730,6 +731,21 @@ def test_delete_already_deleting_instance(requests_mock: Mocker) -> None:
     assert result is None
 
 
+def test_delete_already_deleted_instance(requests_mock: Mocker) -> None:
+    api = AuraApi(client_id="", client_secret="", project_id="some-tenant")
+
+    mock_auth_token(requests_mock)
+    requests_mock.delete(
+        "https://api.neo4j.io/v1/instances/id0",
+        status_code=HTTPStatus.GONE,
+        reason="Already Deleted",
+        json={"errors": [{"message": "DB already deleted: id0", "reason": "db-already-deleted"}]},
+    )
+
+    result = api.delete_instance("id0")
+    assert result is None
+
+
 def test_delete_that_fails(requests_mock: Mocker) -> None:
     api = AuraApi(client_id="", client_secret="", project_id="some-tenant")