improve diagnostics, fix #1353

hydro-project · Jul 18, 2024 · b943cba · b943cba
1 parent b663e69
commit b943cba
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/hydro_deploy/core/Cargo.toml b/hydro_deploy/core/Cargo.toml
@@ -20,7 +20,7 @@ dyn-clone = "1"
 futures = "0.3.26"
 futures-core = "0.3.26"
 hydroflow_cli_integration = { path = "../hydroflow_cli_integration", version = "^0.5.2" }
-indicatif = "0.17.6"
+indicatif = "0.17.8"
 memo-map = "0.3.2"
 nanoid = "0.4.0"
 nix = "0.26.2"

diff --git a/hydro_deploy/core/src/terraform.rs b/hydro_deploy/core/src/terraform.rs
@@ -190,7 +190,9 @@ async fn display_apply_outputs(stdout: &mut ChildStdout) {
                             (
                                 channel_send,
                                 tokio::task::spawn(ProgressTracker::leaf(id, async move {
-                                    channel_recv.await.unwrap();
+                                    // `Err(RecvError)` means send side was dropped due to another error.
+                                    // Ignore here to prevent spurious panic stack traces.
+                                    let _result = channel_recv.await;
                                 })),
                             ),
                         );
@@ -255,7 +257,7 @@ impl TerraformApply {
         self.child = None;
 
         if !status.unwrap().success() {
-            bail!("Terraform deployment failed");
+            bail!("Terraform deployment failed, see `[terraform]` logs above.");
         }
 
         let mut output_command = Command::new("terraform");