fix: Add instance delete fallback (#283)

jedevc · web-flow · commit fa5686c8dc23 · 2026-04-21T10:17:03.000+01:00
Reviewed-by: Cezar Craciunoiu &lt;cezar.craciunoiu@unikraft.com&gt;
Approved-by: Cezar Craciunoiu &lt;cezar.craciunoiu@unikraft.com&gt;
diff --git a/internal/cmd/instances.go b/internal/cmd/instances.go
@@ -607,6 +607,13 @@ func (Instance) Delete(ctx context.Context, targets []resource.Resource) error {
 			}
 		}
 		instances, err := c.DeleteInstances(ctx, reqs)
+		if err != nil && strings.Contains(err.Error(), "timeout_s") && strings.Contains(err.Error(), "is not a valid member") {
+			// HACK: retry without timeout_s for metros that don't support it.
+			for i := range reqs {
+				reqs[i].TimeoutS = nil
+			}
+			instances, err = c.DeleteInstances(ctx, reqs)
+		}
 		if err != nil && !platform.ErrorContainsOnly(err, platform.APIHTTPErrorNotFound) {
 			return nil, err
 		}

Original file line number	Diff line number	Diff line change
`@@ -607,6 +607,13 @@ func (Instance) Delete(ctx context.Context, targets []resource.Resource) error {`
`607`	`607`	`}`
`608`	`608`	`}`
`609`	`609`	`instances, err := c.DeleteInstances(ctx, reqs)`
	`610`	`+ if err != nil && strings.Contains(err.Error(), "timeout_s") && strings.Contains(err.Error(), "is not a valid member") {`
	`611`	`+ // HACK: retry without timeout_s for metros that don't support it.`
	`612`	`+ for i := range reqs {`
	`613`	`+ reqs[i].TimeoutS = nil`
	`614`	`+ }`
	`615`	`+ instances, err = c.DeleteInstances(ctx, reqs)`
	`616`	`+ }`
`610`	`617`	`if err != nil && !platform.ErrorContainsOnly(err, platform.APIHTTPErrorNotFound) {`
`611`	`618`	`return nil, err`
`612`	`619`	`}`