add cmd to RunCommandError

paritytech · Feb 21, 2024 · b03fc84 · b03fc84
1 parent 4012d58
commit b03fc84
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/crates/provider/src/kubernetes/client.rs b/crates/provider/src/kubernetes/client.rs
@@ -369,7 +369,9 @@ impl KubernetesClient {
         remote_port: u16,
     ) -> Result<(u16, JoinHandle<()>)> {
         let pods = Api::<Pod>::namespaced(self.inner.clone(), namespace);
-        let bind = TcpListener::bind((LOCALHOST, local_port)).await.unwrap();
+        let bind = TcpListener::bind((LOCALHOST, local_port))
+            .await
+            .map_err(|err| Error::from(anyhow!("error binding port {local_port} for  pod {name}: {err}")))?;
         let local_port = bind.local_addr().map_err(|err| Error(err.into()))?.port();
         let name = name.to_string();
 

diff --git a/crates/provider/src/kubernetes/node.rs b/crates/provider/src/kubernetes/node.rs
@@ -414,7 +414,7 @@ where
                 vec!["sh", "-c", &command.join(" ")],
             )
             .await
-            .map_err(|err| ProviderError::RunCommandError(self.name.to_string(), err.into()))
+            .map_err(|err| ProviderError::RunCommandError(format!("sh -c {}", &command.join(" ")),self.name.to_string(), err.into()))
     }
 
     async fn run_script(

diff --git a/crates/provider/src/lib.rs b/crates/provider/src/lib.rs
@@ -32,8 +32,8 @@ pub enum ProviderError {
     #[error("Failed to spawn node '{0}': {1}")]
     NodeSpawningFailed(String, anyhow::Error),
 
-    #[error("Error running command '{0}': {1}")]
-    RunCommandError(String, anyhow::Error),
+    #[error("Error running command '{0}' in pod {1}: {2}")]
+    RunCommandError(String, String, anyhow::Error),
 
     #[error("Error running script'{0}': {1}")]
     RunScriptError(String, anyhow::Error),

diff --git a/crates/provider/src/native/node.rs b/crates/provider/src/native/node.rs
@@ -310,12 +310,12 @@ where
         options: RunCommandOptions,
     ) -> Result<ExecutionResult, ProviderError> {
         let result = Command::new(options.program.clone())
-            .args(options.args)
+            .args(options.args.clone())
             .envs(options.env)
             .current_dir(&self.base_dir)
             .output()
             .await
-            .map_err(|err| ProviderError::RunCommandError(options.program, err.into()))?;
+            .map_err(|err| ProviderError::RunCommandError(format!("{} {}", &options.program, &options.args.join(" ")), options.program, err.into()))?;
 
         if result.status.success() {
             Ok(Ok(String::from_utf8_lossy(&result.stdout).to_string()))