Add synctatic sugar to workflow/function instance

Add method good() to the spawn request structure.
edgeless-project · Sep 25, 2023 · 6ffaecf · 6ffaecf
1 parent cd9f565
commit 6ffaecf
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/edgeless_api/src/function_instance/mod.rs b/edgeless_api/src/function_instance/mod.rs
@@ -65,6 +65,15 @@ pub struct SpawnFunctionResponse {
     pub instance_id: Option<InstanceId>,
 }
 
+impl SpawnFunctionResponse {
+    pub fn good(instance_id: crate::function_instance::InstanceId) -> Self {
+        Self {
+            response_error: None,
+            instance_id: Some(instance_id),
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct UpdateFunctionLinksRequest {
     pub instance_id: Option<InstanceId>,

diff --git a/edgeless_api/src/workflow_instance/mod.rs b/edgeless_api/src/workflow_instance/mod.rs
@@ -74,6 +74,15 @@ pub struct SpawnWorkflowResponse {
     pub workflow_status: Option<WorkflowInstance>,
 }
 
+impl SpawnWorkflowResponse {
+    pub fn good(workflow_status: WorkflowInstance) -> Self {
+        Self {
+            response_error: None,
+            workflow_status: Some(workflow_status),
+        }
+    }
+}
+
 #[async_trait::async_trait]
 pub trait WorkflowInstanceAPI: WorkflowInstanceAPIClone + Send + Sync {
     async fn start(&mut self, request: SpawnWorkflowRequest) -> anyhow::Result<SpawnWorkflowResponse>;

diff --git a/edgeless_con/src/controller.rs b/edgeless_con/src/controller.rs
@@ -266,9 +266,8 @@ impl Controller {
                     }
 
                     active_workflows.insert(spawn_workflow_request.workflow_id.clone(), wf.clone());
-                    match reply_sender.send(Ok(edgeless_api::workflow_instance::SpawnWorkflowResponse {
-                        response_error: None,
-                        workflow_status: Some(edgeless_api::workflow_instance::WorkflowInstance {
+                    match reply_sender.send(Ok(edgeless_api::workflow_instance::SpawnWorkflowResponse::good(
+                        edgeless_api::workflow_instance::WorkflowInstance {
                             workflow_id: spawn_workflow_request.workflow_id,
                             functions: wf
                                 .function_instances
@@ -278,8 +277,8 @@ impl Controller {
                                     instances: instances.clone(),
                                 })
                                 .collect(),
-                        }),
-                    })) {
+                        },
+                    ))) {
                         Ok(_) => {}
                         Err(err) => {
                             log::error!("Unhandled: {:?}", err);

diff --git a/edgeless_node/src/agent/mod.rs b/edgeless_node/src/agent/mod.rs
@@ -101,10 +101,7 @@ impl edgeless_api::function_instance::FunctionInstanceAPI for FunctionInstanceCl
             }
         };
         match self.sender.send(AgentRequest::SPAWN(request)).await {
-            Ok(_) => Ok(edgeless_api::function_instance::SpawnFunctionResponse {
-                response_error: None,
-                instance_id: Some(f_id),
-            }),
+            Ok(_) => Ok(edgeless_api::function_instance::SpawnFunctionResponse::good(f_id)),
             Err(err) => Err(anyhow::anyhow!(
                 "Agent channel error when creating a function instance: {}",
                 err.to_string()