Merge pull request #103 from depot/feat/failed-fly-machines

feat: force delete failed fly machines
depot · Aug 27, 2024 · fd39bac · fd39bac
2 parents e63bb6b + 03930b4
commit fd39bac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/utils/fly/client.ts b/src/utils/fly/client.ts
@@ -309,6 +309,7 @@ export type MachineState =
   | 'replaced' // this specific version is no longer current
   | 'destroying' // user initiated the machine to be completely removed
   | 'destroyed' // machine no longer exists
+  | 'failed'
 
 // Volumes
 

diff --git a/src/utils/fly/reconcile.ts b/src/utils/fly/reconcile.ts
@@ -170,6 +170,7 @@ function currentMachineState(machine: V1Machine): GetDesiredStateResponse_Machin
   if (instanceState === 'stopped') return GetDesiredStateResponse_MachineState.STOPPED
   if (instanceState === 'destroying') return GetDesiredStateResponse_MachineState.DELETING
   if (instanceState === 'destroyed') return GetDesiredStateResponse_MachineState.DELETED
+  if (instanceState === 'failed') return GetDesiredStateResponse_MachineState.ERROR
   return GetDesiredStateResponse_MachineState.PENDING
 }
 
@@ -205,8 +206,9 @@ async function reconcileMachine(state: V1Machine[], machine: GetDesiredStateResp
         await stopAndWait(current)
       } catch {} // stop can sometime fail, ignore.
     }
-    console.log('Deleting machine', current.id)
-    await deleteMachine(current.id)
+    const force = currentState === GetDesiredStateResponse_MachineState.ERROR
+    force ? console.log('Forcing delete of machine', current.id) : console.log('Deleting machine', current.id)
+    await deleteMachine(current.id, force)
   }
 }