workspace: delete workers through runtime

crates/workspace-server/src/hosts.rs

@@ -31,10 +31,10 @@ use worker_runtime::execution::{
 use worker_runtime::fs_store::FsRuntimeStoreOptions;
 use worker_runtime::http_server::{
     RuntimeHttpConfigBundleAvailabilityResponse, RuntimeHttpConfigBundleSyncRequest,
-    RuntimeHttpErrorResponse, RuntimeHttpSummaryResponse, RuntimeHttpWorkerInputResponse,
-    RuntimeHttpWorkerLifecycleRequest, RuntimeHttpWorkerLifecycleResponse,
-    RuntimeHttpWorkerResponse, RuntimeHttpWorkersResponse, RuntimeHttpWorkingDirectoriesResponse,
-    RuntimeHttpWorkingDirectoryResponse,
+    RuntimeHttpErrorResponse, RuntimeHttpSummaryResponse, RuntimeHttpWorkerDeleteResponse,
+    RuntimeHttpWorkerInputResponse, RuntimeHttpWorkerLifecycleRequest,
+    RuntimeHttpWorkerLifecycleResponse, RuntimeHttpWorkerResponse, RuntimeHttpWorkersResponse,
+    RuntimeHttpWorkingDirectoriesResponse, RuntimeHttpWorkingDirectoryResponse,
 };
 use worker_runtime::identity::{
     RuntimeId as EmbeddedRuntimeId, WorkerId as EmbeddedWorkerId, WorkerRef as EmbeddedWorkerRef,
@@ -442,6 +442,15 @@ pub enum WorkerInputKind {
     System,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct WorkerDeleteResult {
+    pub state: WorkerOperationState,
+    pub runtime_id: String,
+    pub worker_id: String,
+    pub deleted: bool,
+    pub diagnostics: Vec<RuntimeDiagnostic>,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct WorkerInputRequest {
     #[serde(default = "default_worker_input_kind")]
@@ -670,6 +679,20 @@ pub trait WorkspaceWorkerRuntime: Send + Sync {
         }
     }
 
+    fn delete_worker(&self, worker_id: &str) -> WorkerDeleteResult {
+        WorkerDeleteResult {
+            state: WorkerOperationState::Unsupported,
+            runtime_id: self.runtime_id().to_string(),
+            worker_id: worker_id.to_string(),
+            deleted: false,
+            diagnostics: vec![diagnostic(
+                "worker_delete_unsupported",
+                DiagnosticSeverity::Info,
+                format!("runtime does not implement worker deletion for '{worker_id}'"),
+            )],
+        }
+    }
+
     fn observation_source(
         &self,
         _worker_id: &str,
@@ -1041,6 +1064,25 @@ impl RuntimeRegistry {
         Ok(runtime.cancel_worker(worker_id, request))
     }
 
+    pub fn delete_worker(
+        &self,
+        runtime_id: &str,
+        worker_id: &str,
+    ) -> Result<WorkerDeleteResult, RuntimeRegistryError> {
+        validate_backend_identifier("runtime_id", runtime_id)?;
+        validate_backend_identifier("worker_id", worker_id)?;
+        let runtime = self.runtime(runtime_id)?;
+        let lookup = runtime.worker(worker_id);
+        if lookup.worker.is_none() {
+            return Err(operation_failed_or_unknown_worker(
+                runtime_id,
+                worker_id,
+                lookup.diagnostics,
+            ));
+        }
+        Ok(runtime.delete_worker(worker_id))
+    }
+
     pub fn observation_source(
         &self,
         runtime_id: &str,
@@ -1658,6 +1700,38 @@ impl WorkspaceWorkerRuntime for EmbeddedWorkerRuntime {
         }
     }
 
+    fn delete_worker(&self, worker_id: &str) -> WorkerDeleteResult {
+        let Some(worker_ref) = self.worker_ref(worker_id) else {
+            return WorkerDeleteResult {
+                state: WorkerOperationState::Rejected,
+                runtime_id: self.runtime_id.clone(),
+                worker_id: worker_id.to_string(),
+                deleted: false,
+                diagnostics: vec![diagnostic(
+                    "embedded_worker_id_invalid",
+                    DiagnosticSeverity::Warning,
+                    "Worker id was empty and cannot be resolved".to_string(),
+                )],
+            };
+        };
+        match self.runtime.delete_worker(&worker_ref) {
+            Ok(result) => WorkerDeleteResult {
+                state: WorkerOperationState::Accepted,
+                runtime_id: result.runtime_id.to_string(),
+                worker_id: result.worker_id.to_string(),
+                deleted: result.deleted,
+                diagnostics: Vec::new(),
+            },
+            Err(error) => WorkerDeleteResult {
+                state: WorkerOperationState::Rejected,
+                runtime_id: self.runtime_id.clone(),
+                worker_id: worker_id.to_string(),
+                deleted: false,
+                diagnostics: vec![embedded_runtime_diagnostic(&error)],
+            },
+        }
+    }
+
     fn observation_source(
         &self,
         worker_id: &str,
@@ -2315,6 +2389,27 @@ impl WorkspaceWorkerRuntime for RemoteWorkerRuntime {
         }
     }
 
+    fn delete_worker(&self, worker_id: &str) -> WorkerDeleteResult {
+        match self
+            .delete_json::<RuntimeHttpWorkerDeleteResponse>(&format!("/v1/workers/{worker_id}"))
+        {
+            Ok(response) => WorkerDeleteResult {
+                state: WorkerOperationState::Accepted,
+                runtime_id: response.worker.runtime_id.to_string(),
+                worker_id: response.worker.worker_id.to_string(),
+                deleted: response.worker.deleted,
+                diagnostics: Vec::new(),
+            },
+            Err(diagnostic) => WorkerDeleteResult {
+                state: WorkerOperationState::Rejected,
+                runtime_id: self.runtime_id.clone(),
+                worker_id: worker_id.to_string(),
+                deleted: false,
+                diagnostics: vec![diagnostic],
+            },
+        }
+    }
+
     fn observation_source(
         &self,
         worker_id: &str,