fix(rust): return the last error for a retried command

and fix the node name for a simple config
build-trust · Jul 15, 2024 · 91ed3e0 · 91ed3e0
1 parent 85f0cc2
commit 91ed3e0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/implementations/rust/ockam/ockam_command/src/subcommand.rs b/implementations/rust/ockam/ockam_command/src/subcommand.rs
@@ -354,6 +354,11 @@ pub trait Command: Clone + Sized + Send + Sync + 'static {
                     Ok(_) => break,
                     Err(Error::Retry(inner)) => {
                         retry_count -= 1;
+                        // return the last error if there are no more retries
+                        if retry_count == 0 {
+                            return Err(inner);
+                        };
+
                         let delay = retry_delay.add(jitter(retry_delay_jitter));
                         warn!(
                             "Command failed, retrying in {} seconds: {inner:?}",

diff --git a/...ockam/ockam_command/tests/bats/orchestrator_enroll/fixtures/node-create.basic.config.yaml b/...ockam/ockam_command/tests/bats/orchestrator_enroll/fixtures/node-create.basic.config.yaml
@@ -1,3 +1,8 @@
+variables:
+  NODE_NAME: n1
+
+name: $NODE_NAME
+
 relay: $RELAY_NAME
 
 tcp-outlet: