From 8a1045b4e7f5ff3eab32460086b8e19e57e2b2b7 Mon Sep 17 00:00:00 2001
From: Julian Sommer <115516918+juliansommer@users.noreply.github.com>
Date: Wed, 30 Sep 2026 15:37:40 +1000
Subject: [PATCH] fix: ack vpc.delete-nat in tests so teardown doesn't wait out
 the 15 s request timeout

---
 spinifex/daemon/daemon_system_instance_test.go      | 1 +
 spinifex/handlers/ec2/instance/service_impl_test.go | 2 ++
 spinifex/testutil/nats.go                           | 1 +
 3 files changed, 4 insertions(+)

diff --git a/spinifex/daemon/daemon_system_instance_test.go b/spinifex/daemon/daemon_system_instance_test.go
index d0b649e76..1a4b5d661 100644
--- a/spinifex/daemon/daemon_system_instance_test.go
+++ b/spinifex/daemon/daemon_system_instance_test.go
@@ -799,6 +799,7 @@ func TestLaunchSystemInstance_NATFailureRollsBackPublicIP(t *testing.T) {
 	// rule vpcd may have committed after the AddNAT timeout window.
 	deleteNATCh := make(chan map[string]string, 1)
 	delSub, err := d.natsConn.Subscribe("vpc.delete-nat", func(msg *nats.Msg) {
+		_ = msg.Respond([]byte(`{"success":true}`))
 		var p map[string]string
 		_ = json.Unmarshal(msg.Data, &p)
 		select {
diff --git a/spinifex/handlers/ec2/instance/service_impl_test.go b/spinifex/handlers/ec2/instance/service_impl_test.go
index 94afb698e..eb71cd4f8 100644
--- a/spinifex/handlers/ec2/instance/service_impl_test.go
+++ b/spinifex/handlers/ec2/instance/service_impl_test.go
@@ -3882,6 +3882,7 @@ func TestPrepareRunInstances_NATFailureRollsBackPublicIP(t *testing.T) {
 	// half-committed rule from a waitForFlowsHV timeout.
 	deleteNATCh := make(chan natWirePayload, 1)
 	delSub, err := svc.natsConn.Subscribe("vpc.delete-nat", func(msg *nats.Msg) {
+		_ = msg.Respond([]byte(`{"success":true}`))
 		var p natWirePayload
 		_ = json.Unmarshal(msg.Data, &p)
 		select {
@@ -3989,6 +3990,7 @@ func TestPrepareRunInstances_PartialLaunchReleasesSucceededInstances(t *testing.
 
 	deleteNATCh := make(chan natWirePayload, 2)
 	delSub, err := svc.natsConn.Subscribe("vpc.delete-nat", func(msg *nats.Msg) {
+		_ = msg.Respond([]byte(`{"success":true}`))
 		var p natWirePayload
 		_ = json.Unmarshal(msg.Data, &p)
 		select {
diff --git a/spinifex/testutil/nats.go b/spinifex/testutil/nats.go
index 8a2acd73e..5d900aeee 100644
--- a/spinifex/testutil/nats.go
+++ b/spinifex/testutil/nats.go
@@ -101,6 +101,7 @@ var vpcdStubTopics = []string{
 	"vpc.update-port-sgs",
 	"vpc.create-port",
 	"vpc.delete-port",
+	"vpc.delete-nat",
 }
 
 // vpcdStubRegistry holds the per-conn response map. Per-conn so concurrent tests with separate conns don't interfere.