backport of commit 5c5a7cd

hashicorp · Feb 1, 2023 · ebd4c9e · ebd4c9e
1 parent c02cf8d
commit ebd4c9e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.changelog/16011.txt b/.changelog/16011.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Fixed a panic in `deployment status` when rollback deployments are slow to appear
+```
diff --git a/command/deployment_status.go b/command/deployment_status.go
@@ -327,7 +327,7 @@ UPDATE:
 				// TODO We may want to find a more robust way of waiting for rollbacks to launch instead of
 				// just sleeping for 1 sec. If scheduling is slow, this will break update here instead of
 				// waiting for the (eventual) rollback
-				if rollback.ID == deploy.ID {
+				if rollback == nil || rollback.ID == deploy.ID {
 					break UPDATE
 				}
 
@@ -436,7 +436,7 @@ func (c *DeploymentStatusCommand) defaultMonitor(client *api.Client, deployID st
 				// TODO We may want to find a more robust way of waiting for rollbacks to launch instead of
 				// just sleeping for 1 sec. If scheduling is slow, this will break update here instead of
 				// waiting for the (eventual) rollback
-				if rollback.ID == deploy.ID {
+				if rollback == nil || rollback.ID == deploy.ID {
 					return
 				}
 				c.defaultMonitor(client, rollback.ID, index, verbose)