Merge pull request #2047 from hashicorp/cli-status-time-unknown

catsby · web-flow · commit ad774c79b76b · 2021-08-13T17:26:31.000-05:00
cli/status: fix broken output when no generated time is set
diff --git a/.changelog/2047.txt b/.changelog/2047.txt
@@ -0,0 +1,4 @@
+```release-note:improvement
+cli/status: Display '(unknown)' when the time a status report was generated is
+not known
+```
diff --git a/internal/cli/status.go b/internal/cli/status.go
@@ -947,12 +947,12 @@ func (c *StatusCommand) FormatStatusReportComplete(
 		statusReportComplete = "? UNKNOWN"
 	}
 
-	t, err := ptypes.Timestamp(statusReport.GeneratedTime)
-	if err != nil {
-		return statusReportComplete, "", err
+	reportTime := "(unknown)"
+	if statusReport.GeneratedTime.IsValid() {
+		reportTime = humanize.Time(statusReport.GeneratedTime.AsTime())
 	}
 
-	return statusReportComplete, humanize.Time(t), nil
+	return statusReportComplete, reportTime, nil
 }
 
 func (c *StatusCommand) getWorkspaceFromProject(pr *pb.GetProjectResponse) (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -947,12 +947,12 @@ func (c *StatusCommand) FormatStatusReportComplete(`
`947`	`947`	`statusReportComplete = "? UNKNOWN"`
`948`	`948`	`}`
`949`	`949`
`950`		`- t, err := ptypes.Timestamp(statusReport.GeneratedTime)`
`951`		`- if err != nil {`
`952`		`- return statusReportComplete, "", err`
	`950`	`+ reportTime := "(unknown)"`
	`951`	`+ if statusReport.GeneratedTime.IsValid() {`
	`952`	`+ reportTime = humanize.Time(statusReport.GeneratedTime.AsTime())`
`953`	`953`	`}`
`954`	`954`
`955`		`- return statusReportComplete, humanize.Time(t), nil`
	`955`	`+ return statusReportComplete, reportTime, nil`
`956`	`956`	`}`
`957`	`957`
`958`	`958`	`func (c StatusCommand) getWorkspaceFromProject(pr pb.GetProjectResponse) (string, error) {`