Simplify command state update methods

Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>

Author: didier-wenzek

crates/core/tedge_agent/src/operation_workflows/actor.rs

@@ -159,7 +159,7 @@ impl WorkflowActor {
             Ok(Some(new_state)) => {
                 self.persist_command_board().await?;
                 if new_state.is_init() {
-                    self.process_command_update(new_state.set_log_path(&log_file.path))
+                    self.process_command_update(new_state.with_log_path(&log_file.path))
                         .await?;
                 }
             }

crates/core/tedge_agent/src/operation_workflows/persist.rs

@@ -359,7 +359,7 @@ impl WorkflowRepository {
                     if let Some(current_version) = self.workflows.use_current_version(&operation) {
                         self.persist_workflow_definition(&operation, &current_version)
                             .await;
-                        *command = command.clone().set_workflow_version(&current_version);
+                        command.set_workflow_version(&current_version);
                     }
                 }
             }

crates/core/tedge_api/src/workflow/state.rs

@@ -186,8 +186,18 @@ impl GenericCommandState {
         }
     }
 
-    pub fn update_with_key_value(self, key: &str, val: &str) -> Self {
-        self.update_with_json(json!({ key: val }))
+    pub fn with_key_value(mut self, key: &str, val: &str) -> Self {
+        self.set_key_value(key, val);
+        self
+    }
+
+    fn set_key_value(&mut self, key: &str, val: &str) {
+        if let Some(o) = self.payload.as_object_mut() {
+            o.insert(key.to_string(), val.into());
+        }
+        if key == STATUS {
+            self.status = val.to_string();
+        }
     }
 
     pub fn get_log_path(&self) -> Option<Utf8PathBuf> {
@@ -197,8 +207,13 @@ impl GenericCommandState {
             .map(Utf8PathBuf::from)
     }
 
-    pub fn set_log_path<P: AsRef<Utf8Path>>(self, path: P) -> Self {
-        self.update_with_key_value(OP_LOG_PATH_KEY, path.as_ref().as_str())
+    pub fn with_log_path<P: AsRef<Utf8Path>>(mut self, path: P) -> Self {
+        self.set_log_path(path);
+        self
+    }
+
+    pub fn set_log_path<P: AsRef<Utf8Path>>(&mut self, path: P) {
+        self.set_key_value(OP_LOG_PATH_KEY, path.as_ref().as_str())
     }
 
     pub fn workflow_version(&self) -> Option<String> {
@@ -208,8 +223,13 @@ impl GenericCommandState {
             .map(|str| str.to_string())
     }
 
-    pub fn set_workflow_version(self, version: &str) -> Self {
-        self.update_with_key_value(OP_WORKFLOW_VERSION_KEY, version)
+    pub fn with_workflow_version(mut self, version: &str) -> Self {
+        self.set_workflow_version(version);
+        self
+    }
+
+    pub fn set_workflow_version(&mut self, version: &str) {
+        self.set_key_value(OP_WORKFLOW_VERSION_KEY, version)
     }
 
     /// Update the command state with the outcome of a script

crates/core/tedge_api/src/workflow/supervisor.rs

@@ -80,7 +80,7 @@ impl WorkflowSupervisor {
         self.commands = commands;
         self.commands
             .iter()
-            .filter_map(|(t, s)| self.resume_command(t, s))
+            .filter_map(|(t, s)| self.resume_command(t, s.clone()))
             .collect()
     }
 
@@ -136,10 +136,10 @@ impl WorkflowSupervisor {
     ///
     /// Return the current version if any.
     pub fn use_current_version(&mut self, operation: &OperationName) -> Option<WorkflowVersion> {
-        match self.workflows.get_mut(&operation.as_str().into()) {
-            Some(versions) => versions.use_current_version().cloned(),
-            None => None,
-        }
+        self.workflows
+            .get_mut(&operation.as_str().into())
+            .map(WorkflowVersions::use_current_version)?
+            .cloned()
     }
 
     /// Update the state of the command board on reception of a message sent by a peer over MQTT
@@ -162,9 +162,9 @@ impl WorkflowSupervisor {
         } else if command_state.is_init() {
             // This is a new command request
             if let Some(current_version) = workflow_versions.use_current_version() {
-                let command_state = command_state.set_workflow_version(current_version);
-                self.commands.insert(command_state.clone())?;
-                Ok(Some(command_state))
+                let updated_state = command_state.with_workflow_version(current_version);
+                self.commands.insert(updated_state.clone())?;
+                Ok(Some(updated_state))
             } else {
                 return Err(WorkflowExecutionError::DeprecatedOperation {
                     operation: operation.to_string(),
@@ -287,21 +287,17 @@ impl WorkflowSupervisor {
     fn resume_command(
         &self,
         timestamp: &Timestamp,
-        command: &GenericCommandState,
+        command: GenericCommandState,
     ) -> Option<GenericCommandState> {
-        let action = match self.get_action(command) {
+        let action = match self.get_action(&command) {
             Ok(action) => action,
             Err(err) => {
-                return Some(
-                    command
-                        .clone()
-                        .fail_with(format!("Fail to resume on start: {err:?}")),
-                );
+                return Some(command.fail_with(format!("Fail to resume on start: {err:?}")));
             }
         };
 
         let epoch = format!("{}.{}", timestamp.unix_timestamp(), timestamp.millisecond());
-        let command = command.clone().update_with_key_value("resumed_at", &epoch);
+        let command = command.with_key_value("resumed_at", &epoch);
         match action {
             OperationAction::AwaitingAgentRestart(handlers) => {
                 Some(command.update(handlers.on_success))