From 61c53b59f458cbab6161d2df8c18f60b9489f8d2 Mon Sep 17 00:00:00 2001 From: Luiz Aoqui Date: Mon, 29 May 2023 14:27:12 -0400 Subject: [PATCH 1/2] cli: output errors when monitoring deployment --- command/deployment_status.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/command/deployment_status.go b/command/deployment_status.go index 3c5b1bea68c0..8ddfa00f737f 100644 --- a/command/deployment_status.go +++ b/command/deployment_status.go @@ -255,7 +255,7 @@ UPDATE: deploy, meta, err = client.Deployments().Info(deployID, &q) if err != nil { d.Append(glint.Layout(glint.Style( - glint.Text(fmt.Sprintf("%s: Error fetching deployment", formatTime(time.Now()))), + glint.Text(fmt.Sprintf("%s: Error fetching deployment: %v", formatTime(time.Now()), err)), glint.Color("red"), )).MarginLeft(4), glint.Text("")) d.RenderFrame() @@ -281,7 +281,7 @@ UPDATE: allocComponent = glint.Layout( allocComponent, glint.Style( - glint.Text("Error fetching allocations"), + glint.Text(fmt.Sprintf("Error fetching allocations: %v", err)), glint.Color("red"), ), ) @@ -324,7 +324,7 @@ UPDATE: if err != nil { d.Append(glint.Layout(glint.Style( - glint.Text(fmt.Sprintf("%s: Error fetching rollback deployment", formatTime(time.Now()))), + glint.Text(fmt.Sprintf("%s: Error fetching rollback deployment: %v", formatTime(time.Now()), err)), glint.Color("red"), )).MarginLeft(4), glint.Text("")) d.RenderFrame() @@ -393,7 +393,7 @@ func (c *DeploymentStatusCommand) defaultMonitor(client *api.Client, deployID st var meta *api.QueryMeta deploy, meta, err = client.Deployments().Info(deployID, &q) if err != nil { - c.Ui.Error(c.Colorize().Color(fmt.Sprintf("%s: Error fetching deployment", formatTime(time.Now())))) + c.Ui.Error(c.Colorize().Color(fmt.Sprintf("%s: Error fetching deployment: %v", formatTime(time.Now()), err))) return } @@ -405,7 +405,7 @@ func (c *DeploymentStatusCommand) defaultMonitor(client *api.Client, deployID st info += "\n\n[bold]Allocations[reset]\n" allocs, _, err := client.Deployments().Allocations(deployID, nil) if err != nil { - info += "Error fetching allocations" + info += fmt.Sprintf("Error fetching allocations: %v", err) } else { info += formatAllocListStubs(allocs, verbose, length) } @@ -435,7 +435,7 @@ func (c *DeploymentStatusCommand) defaultMonitor(client *api.Client, deployID st c.Ui.Output("") if err != nil { c.Ui.Error(c.Colorize().Color( - fmt.Sprintf("%s: Error fetching deployment of previous job version", formatTime(time.Now())), + fmt.Sprintf("%s: Error fetching deployment of previous job version: %v", formatTime(time.Now()), err), )) return } From 7fa8fc291ee01d7cccc8e018d43943d62ea5b588 Mon Sep 17 00:00:00 2001 From: Luiz Aoqui Date: Mon, 29 May 2023 14:29:28 -0400 Subject: [PATCH 2/2] changelog: addn entry for #17348 --- .changelog/17348.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/17348.txt diff --git a/.changelog/17348.txt b/.changelog/17348.txt new file mode 100644 index 000000000000..69c3974942f4 --- /dev/null +++ b/.changelog/17348.txt @@ -0,0 +1,3 @@ +```release-note:bug +cli: Output error messages during deployment monitoring +```