feat: make workload_id in host the kubernetes UID

This prevents issues where the workload is not fully started, but a stop workload is called. Then the stop workload is called without an ID, and once the workload is fully started it wont be stopped. Therefore, it will run forever, which causes problems when you want to call a workload with a certain host. It might resolve to an old workload, which it shouldnt. Now it will always get removed successfully

Also has some cleanups in log statements

Signed-off-by: Mees Molenaar <mees.molenaar@bettyblocks.com>

Author: Mees-Molenaar

.dockerignore

@@ -1 +1 @@
-target/
+**/target/

crates/wash-runtime/src/engine/workload.rs

@@ -10,7 +10,7 @@ use std::{
 
 use anyhow::{Context as _, bail, ensure};
 use tokio::{sync::RwLock, task::JoinHandle, time::timeout};
-use tracing::{debug, info, trace, warn};
+use tracing::{debug, error, info, trace, warn};
 use wasmtime::component::{
     Component, Instance, InstancePre, Linker, ResourceAny, ResourceType, Val, types::ComponentItem,
 };
@@ -713,7 +713,16 @@ impl ResolvedWorkload {
 
                                                 let func = instance
                                                     .get_func(&mut store, func_idx)
-                                                    .context("function not found")?;
+                                                    .context("function not found");
+
+                                                let func = match func {
+                                                    Ok(func) => func,
+                                                    Err(e) => {
+                                                        error!("Error in gettin func: {:?}", e);
+                                                        return Err(e);
+                                                    }
+                                                };
+
                                                 trace!(
                                                     name = %import_name,
                                                     fn_name = %export_name,
@@ -821,7 +830,6 @@ impl ResolvedWorkload {
                                     );
                                     continue;
                                 }
-
                                 trace!(name = import_name, resource = export_name, ty = ?resource_ty, "linking resource import");
 
                                 linker_instance

crates/wash-runtime/src/host/mod.rs

@@ -594,6 +594,10 @@ impl HostApi for Host {
                 "Workload stopped successfully".to_string(),
             )
         } else {
+            warn!(
+                "Tried to stop non existing workload: {}",
+                request.workload_id
+            );
             (WorkloadState::Unspecified, "Workload not found".to_string())
         };
 

crates/wash-runtime/src/washlet/mod.rs

@@ -287,6 +287,7 @@ async fn workload_start(
     config: &HostConfig,
 ) -> anyhow::Result<types::v2::WorkloadStartResponse> {
     let Some(types::v2::Workload {
+        workload_id,
         namespace,
         name,
         annotations,
@@ -370,7 +371,7 @@ async fn workload_start(
     let volumes = volumes.into_iter().map(Into::into).collect();
 
     let request = crate::types::WorkloadStartRequest {
-        workload_id: uuid::Uuid::new_v4().to_string(),
+        workload_id: workload_id,
         workload: crate::types::Workload {
             namespace,
             name,
@@ -388,7 +389,16 @@ async fn workload_start(
         name=?request.workload.name,
         "Starting workload");
 
-    Ok(host.workload_start(request).await?.into())
+    match host.workload_start(request).await {
+        Ok(resp) => Ok(resp.into()),
+        Err(e) => Ok(types::v2::WorkloadStartResponse {
+            workload_status: Some(types::v2::WorkloadStatus {
+                workload_id: "".into(),
+                workload_state: types::v2::WorkloadState::Error.into(),
+                message: format!("failed to start workload: {}", e),
+            }),
+        }),
+    }
 }
 
 async fn workload_stop(

proto/docs/index.html

@@ -1124,6 +1124,13 @@ <h3 id="wasmcloud.runtime.v2.Workload">Workload</h3>
                   <td><p> </p></td>
                 </tr>
 
+                <tr>
+                  <td>workload_id</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p> </p></td>
+                </tr>
+              
             </tbody>
           </table>
 

proto/wasmcloud/runtime/v2/workload.proto

@@ -15,6 +15,8 @@ message Workload {
   WitWorld wit_world = 5;
 
   repeated Volume volumes = 6;
+
+  string workload_id = 7;
 }
 
 enum WorkloadState {

runtime-operator/internal/controller/runtime/workload_controller.go

@@ -262,6 +262,7 @@ func (r *WorkloadReconciler) reconcilePlacement(ctx context.Context, workload *r
 
 	req := &runtimev2.WorkloadStartRequest{
 		Workload: &runtimev2.Workload{
+			WorkloadId:  string(workload.UID),
 			Namespace:   workload.Namespace,
 			Name:        workload.Name,
 			Annotations: workload.GetAnnotations(),
@@ -275,13 +276,13 @@ func (r *WorkloadReconciler) reconcilePlacement(ctx context.Context, workload *r
 	ctx, cancel := context.WithTimeout(ctx, workloadStartTimeout)
 	defer cancel()
 
-	resp, err := client.Start(ctx, req)
+	_, err := client.Start(ctx, req)
 	if err != nil {
 		return err
 	}
 
 	// Set the WorkloadID in the status
-	workload.Status.WorkloadID = resp.WorkloadStatus.WorkloadId
+	workload.Status.WorkloadID = string(workload.UID)
 	condition.ForceStatusUpdate(ctx)
 	return condition.ErrSkipReconciliation()
 }
@@ -320,14 +321,9 @@ func (r *WorkloadReconciler) reconcileReady(_ context.Context, workload *runtime
 }
 
 func (r *WorkloadReconciler) finalize(ctx context.Context, workload *runtimev1alpha1.Workload) error {
-	if !workload.Status.AllTrue(runtimev1alpha1.WorkloadConditionPlacement) {
-		// nothing to do, the workload was never placed
-		return nil
-	}
-
 	client := NewWashHostClient(r.Bus, workload.Status.HostID)
 	req := &runtimev2.WorkloadStopRequest{
-		WorkloadId: workload.Status.WorkloadID,
+		WorkloadId: string(workload.UID),
 	}
 
 	ctx, cancel := context.WithTimeout(ctx, workloadStopTimeout)