Skip to content

Automate browser based workflows with AI

Treat deleting an already-absent Azure vault secret as success (SKY-17087) (#8678)

Shuchang Zheng39177fa17198
diff --git a/skyvern/forge/sdk/api/azure.py b/skyvern/forge/sdk/api/azure.py
index 996e482ce..497631424 100644
--- a/skyvern/forge/sdk/api/azure.py
+++ b/skyvern/forge/sdk/api/azure.py
@@ -82,7 +82,7 @@ class AsyncAzureVaultClient(Protocol):
vault_name: The name of the Azure Key Vault
Returns:
- The name of the deleted secret
+ The name of the deleted secret; deleting a secret that does not exist succeeds
Raises:
Exception: If the operation fails
diff --git a/skyvern/forge/sdk/api/real_azure.py b/skyvern/forge/sdk/api/real_azure.py
index 14e77b289..31822db59 100644
--- a/skyvern/forge/sdk/api/real_azure.py
+++ b/skyvern/forge/sdk/api/real_azure.py
@@ -103,6 +103,10 @@ class RealAsyncAzureVaultClient(AsyncAzureVaultClient):
try:
secret = await secret_client.delete_secret(secret_name)
return secret.name
+ except ResourceNotFoundError:
+ # An absent secret is already in the state a delete asks for, and a retry could never succeed.
+ LOG.info("Azure Key Vault secret already absent; nothing to delete", secret_name=secret_name)
+ return secret_name
except Exception as e:
LOG.exception("Failed to delete secret from Azure Key Vault.", secret_name=secret_name, error=e)
raise e
diff --git a/tests/unit/test_real_azure.py b/tests/unit/test_real_azure.py
index 9163a9fa4..5ccee3abf 100644
--- a/tests/unit/test_real_azure.py
+++ b/tests/unit/test_real_azure.py
@@ -122,6 +122,32 @@ async def test_get_secret_reraises_transient_read_failure(monkeypatch: pytest.Mo
secret_client.close.assert_awaited_once()
+async def test_delete_secret_succeeds_when_secret_is_already_absent(monkeypatch: pytest.MonkeyPatch) -> None:
+ secret_client = MagicMock()
+ secret_client.delete_secret = AsyncMock(side_effect=ResourceNotFoundError("secret not found"))
+ secret_client.close = AsyncMock()
+ client = _vault_client(monkeypatch, secret_client)
+
+ result = await client.delete_secret("my-secret", "vault")
+
+ assert result == "my-secret"
+ secret_client.close.assert_awaited_once()
+
+
+async def test_delete_secret_reraises_failure_other_than_not_found(monkeypatch: pytest.MonkeyPatch) -> None:
+ secret_client = MagicMock()
+ secret_client.delete_secret = AsyncMock(side_effect=ResourceExistsError("secret is being deleted"))
+ secret_client.close = AsyncMock()
+ client = _vault_client(monkeypatch, secret_client)
+
+ with pytest.raises(ResourceExistsError):
+ await client.delete_secret("my-secret", "vault")
+
+ secret_client.close.assert_awaited_once()
+
+
@pytest.mark.asyncio
async def test_create_or_update_secret_disables_only_preexisting_enabled_versions(
monkeypatch: pytest.MonkeyPatch,