From e65f00c86a515c4c35a6a42acaffe668cda90505 Mon Sep 17 00:00:00 2001
From: Ben Duncan <5178243+benduncan@users.noreply.github.com>
Date: Wed, 25 Mar 2026 16:01:18 +1000
Subject: [PATCH] fix: set TenantID on root volume created by RunInstances
 (mulga-758)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GenerateVolumes did not set TenantID on the VolumeMetadata for root
volumes cloned from AMIs. After the pre-Phase4 tenant fallback was
removed (ae316db), describe-volumes filters volumes by exact tenantID
match — root volumes with empty TenantID became invisible to the
owning account, breaking E2E Phase 5b volume lifecycle tests.
---
 spinifex/handlers/ec2/instance/service_impl.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spinifex/handlers/ec2/instance/service_impl.go b/spinifex/handlers/ec2/instance/service_impl.go
index 199a2acc1..69dbd78f9 100644
--- a/spinifex/handlers/ec2/instance/service_impl.go
+++ b/spinifex/handlers/ec2/instance/service_impl.go
@@ -258,6 +258,7 @@ func (s *InstanceServiceImpl) GenerateVolumes(input *ec2.RunInstancesInput, inst
 			IOPS:                p.iops,
 			SnapshotID:          p.snapshotId,
 			DeleteOnTermination: p.deleteOnTermination,
+			TenantID:            instance.AccountID,
 		},
 	}