Avoid returning String when callers expect &str

Signed-off-by: Didier Wenzek <[email protected]>

Author: didier-wenzek

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

@@ -261,11 +261,7 @@ impl WorkflowRepository {
 
     /// Copy the workflow definition file to the persisted state directory,
     /// unless this has already been done.
-    async fn persist_workflow_definition(
-        &mut self,
-        operation: &OperationName,
-        version: &WorkflowVersion,
-    ) {
+    async fn persist_workflow_definition(&mut self, operation: &str, version: &str) {
         if version_is_builtin(version) {
             return;
         }
@@ -279,16 +275,12 @@ impl WorkflowRepository {
             if let Err(err) = tokio::fs::copy(source.clone(), target.clone()).await {
                 error!("Fail to persist a copy of {source} as {target}: {err}");
             } else {
-                self.in_use_copies.insert(version.clone(), 1);
+                self.in_use_copies.insert(version.to_owned(), 1);
             }
         }
     }
 
-    fn workflow_copy_path(
-        &self,
-        operation: &OperationName,
-        version: &WorkflowVersion,
-    ) -> Utf8PathBuf {
+    fn workflow_copy_path(&self, operation: &str, version: &str) -> Utf8PathBuf {
         let filename = format!("{operation}-{version}");
         self.state_dir.join(filename).with_extension("toml")
     }
@@ -305,7 +297,7 @@ impl WorkflowRepository {
         }
     }
 
-    async fn release_in_use_copy(&mut self, operation: &OperationName, version: &WorkflowVersion) {
+    async fn release_in_use_copy(&mut self, operation: &str, version: &str) {
         if version_is_builtin(version) {
             return;
         }
@@ -410,14 +402,14 @@ impl WorkflowRepository {
         operation: &OperationType,
         command_state: GenericCommandState,
     ) -> Result<Option<GenericCommandState>, WorkflowExecutionError> {
+        let operation_name = operation.to_string();
         if command_state.is_init() {
             // A new command instance must use the latest on-disk version of the operation workflow
-            self.load_latest_version(&operation.to_string()).await;
+            self.load_latest_version(&operation_name).await;
         } else if command_state.is_finished() {
             // Clear the cache if this happens to be the latest instance using that version of the workflow
             if let Some(version) = command_state.workflow_version() {
-                self.release_in_use_copy(&operation.to_string(), &version)
-                    .await;
+                self.release_in_use_copy(&operation_name, version).await;
             }
         }
 
@@ -429,7 +421,7 @@ impl WorkflowRepository {
 
             Some(new_state) if new_state.is_init() => {
                 if let Some(version) = new_state.workflow_version() {
-                    self.persist_workflow_definition(&operation.to_string(), &version)
+                    self.persist_workflow_definition(&operation_name, version)
                         .await;
                 }
                 Ok(Some(new_state))

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

@@ -32,7 +32,7 @@ pub type WorkflowVersion = String;
 
 const BUILT_IN: &str = "builtin";
 
-pub fn version_is_builtin(version: &WorkflowVersion) -> bool {
+pub fn version_is_builtin(version: &str) -> bool {
     version == BUILT_IN
 }
 

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

@@ -193,10 +193,10 @@ impl GenericCommandState {
 
     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());
+            o.insert(key.into(), val.into());
         }
         if key == STATUS {
-            self.status = val.to_string();
+            self.status = val.to_owned();
         }
     }
 
@@ -216,11 +216,10 @@ impl GenericCommandState {
         self.set_key_value(OP_LOG_PATH_KEY, path.as_ref().as_str())
     }
 
-    pub fn workflow_version(&self) -> Option<String> {
+    pub fn workflow_version(&self) -> Option<&str> {
         self.payload
             .get(OP_WORKFLOW_VERSION_KEY)
             .and_then(|val| val.as_str())
-            .map(|str| str.to_string())
     }
 
     pub fn with_workflow_version(mut self, version: &str) -> Self {

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

@@ -137,8 +137,8 @@ impl WorkflowSupervisor {
     /// Return the current version if any.
     pub fn use_current_version(&mut self, operation: &OperationName) -> Option<WorkflowVersion> {
         self.workflows
-            .get_mut(&operation.as_str().into())
-            .map(WorkflowVersions::use_current_version)?
+            .get_mut(&operation.as_str().into())?
+            .use_current_version()
             .cloned()
     }
 
@@ -192,7 +192,7 @@ impl WorkflowSupervisor {
             });
         };
 
-        let Some(version) = &command_state.workflow_version() else {
+        let Some(version) = command_state.workflow_version() else {
             return Err(WorkflowExecutionError::MissingVersion);
         };
 
@@ -421,7 +421,7 @@ impl WorkflowVersions {
         self.in_use.contains_key(BUILT_IN)
     }
 
-    fn get(&self, version: &WorkflowVersion) -> Result<&OperationWorkflow, WorkflowExecutionError> {
+    fn get(&self, version: &str) -> Result<&OperationWorkflow, WorkflowExecutionError> {
         self.in_use
             .get(version)
             .ok_or(WorkflowExecutionError::UnknownVersion {