[cbetta]

Reviewer check	This PR
Auth / permissions	No
Data access widened	No
New secret, env var or key	No
CI, deploy or infra	No
Dependencies added or bumped	No
Copilot	Pending
Security review	Pending

Every e2e run left its merchant accounts behind on api.sandbox.e2e.gr4vy.app now that it is no longer reset. This deletes them with core-api's new DELETE /merchant-accounts/{id} (gr4vy/core-api#9999, TA-19741). It isn't in the public spec, so the call is a raw request signed with the existing PRIVATE_KEY. A failed delete is logged and never fails the run (204 and 404 both count as done).

// Harness.java
public static synchronized void trackMerchantAccount(String id, String privateKey) {
    if (createdMerchantAccounts.isEmpty()) {
        Runtime.getRuntime().addShutdownHook(new Thread(Harness::deleteCreatedMerchantAccounts));
    }
    createdMerchantAccounts.put(id, privateKey);
}

Each CI shard is its own JVM, so the hook runs once per shard. The shared merchant is tracked when it is created, and MerchantAccountsTest.create tracks its extra account.

Cleanup is armed before the create call, so an account whose create response is lost still gets deleted (a never-created id just returns 404).

Verified: ./gradlew compileTestJava (JDK 21) passes. Not yet run live against e2e.

🤖 Generated with Claude Code

[Copilot]

🟡 Changes recommended

Active moderate and critical findings remain in Harness.java: the sandbox URL is duplicated rather than derived from the SDK template, and cleanup can delete an account this run did not create after a definitive create rejection.

2 open issues

• Avoid cleanup for accounts rejected during creation · New
• Derive the sandbox URL from the SDK server template · New

What changed in this PR

Adds shutdown-time cleanup for merchant accounts created by E2E tests, preventing sandbox account accumulation through a signed raw DELETE request.

Changes:

• Tracks shared and test-specific merchant accounts before creation.
• Registers a JVM shutdown hook to delete tracked accounts.
• Treats successful and already-missing accounts as completed while logging other failures.

Review findings:

• Moderate (4 votes): Derive the cleanup host from Gr4vy.SERVERS and SERVER_ID instead of duplicating the sandbox URL.
• Critical (1 vote): Avoid deleting an account when creation was definitively rejected; retain pre-create tracking only for ambiguous failures or verify ownership before deletion.

This pull request requires changes.

File	Summary
src/​test/​java/​com/​gr4vy/​sdk/​util/​Harness.java	Tracks merchant accounts and deletes them during JVM shutdown.
src/​test/​java/​com/​gr4vy/​sdk/​backoffice/​MerchantAccountsTest.java	Registers the additional merchant account created by the test for cleanup.

_{Review effort: Lite}

[Copilot]

🔵 Needs a closer look

Live E2E verification is still needed to confirm the undocumented DELETE endpoint’s authorization, status behavior, and shutdown-hook cleanup reliability.

No open issues 🎉

2 resolved since last review

• Avoid cleanup for accounts rejected during creation
• Derive the sandbox URL from the SDK server template

_{Review effort: Lite}