Ignore Notes from alloc_status command

hashicorp · Jun 3, 2024 · 7d921be · 7d921be
1 parent 5b1b261
commit 7d921be
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/api/tasks.go b/api/tasks.go
@@ -87,7 +87,6 @@ type AllocCheckStatus struct {
 	Service    string
 	Task       string
 	Status     string
-	Notes      string
 	StatusCode int
 	Timestamp  int64
 }

diff --git a/command/alloc_status.go b/command/alloc_status.go
@@ -374,14 +374,14 @@ func formatAllocNomadServiceChecks(allocID string, client *api.Client) string {
 	} else if len(statuses) == 0 {
 		return ""
 	}
-	results := []string{"Service|Task|Name|Mode|Status|Notes"}
+	results := []string{"Service|Task|Name|Mode|Status"}
 	for _, status := range statuses {
 		task := "(group)"
 		if status.Task != "" {
 			task = status.Task
 		}
-		// check | group | mode | status | notes
-		s := fmt.Sprintf("%s|%s|%s|%s|%s|%s", status.Service, task, status.Check, status.Mode, status.Status, status.Notes)
+		// check | group | mode | status
+		s := fmt.Sprintf("%s|%s|%s|%s|%s", status.Service, task, status.Check, status.Mode, status.Status)
 		results = append(results, s)
 	}
 	sort.Strings(results[1:])

diff --git a/command/alloc_status_test.go b/command/alloc_status_test.go
@@ -481,6 +481,6 @@ func TestAllocStatusCommand_NSD_Checks(t *testing.T) {
 	// check output
 	out := ui.OutputWriter.String()
 	must.StrContains(t, out, `Nomad Service Checks:`)
-	must.RegexMatch(t, regexp.MustCompile(`Service\s+Task\s+Name\s+Mode\s+Status\s+Notes`), out)
-	must.RegexMatch(t, regexp.MustCompile(`service1\s+\(group\)\s+check1\s+healthiness\s+(pending|failure)\s+note1`), out)
+	must.RegexMatch(t, regexp.MustCompile(`Service\s+Task\s+Name\s+Mode\s+Status`), out)
+	must.RegexMatch(t, regexp.MustCompile(`service1\s+\(group\)\s+check1\s+healthiness\s+(pending|failure)`), out)
 }
diff --git a/command/testing_test.go b/command/testing_test.go
@@ -93,7 +93,6 @@ func testNomadServiceJob(jobID string) *api.Job {
 			Path:     "/",
 			Interval: 1 * time.Second,
 			Timeout:  1 * time.Second,
-			Notes:    "note1",
 		}},
 		Provider: "nomad",
 	}}