cli: ignore VaultToken when generating job diff (#14424)

hashicorp · Sep 1, 2022 · 774101d · 774101d
1 parent 25e7c2f
commit 774101d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/.changelog/14424.txt b/.changelog/14424.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Ignore Vault token when generating job diff.
+```
diff --git a/nomad/structs/diff.go b/nomad/structs/diff.go
@@ -69,7 +69,7 @@ func (j *Job) Diff(other *Job, contextual bool) (*JobDiff, error) {
 	diff := &JobDiff{Type: DiffTypeNone}
 	var oldPrimitiveFlat, newPrimitiveFlat map[string]string
 	filter := []string{"ID", "Status", "StatusDescription", "Version", "Stable", "CreateIndex",
-		"ModifyIndex", "JobModifyIndex", "Update", "SubmitTime", "NomadTokenID"}
+		"ModifyIndex", "JobModifyIndex", "Update", "SubmitTime", "NomadTokenID", "VaultToken"}
 
 	if j == nil && other == nil {
 		return diff, nil

diff --git a/nomad/structs/diff_test.go b/nomad/structs/diff_test.go
@@ -1176,7 +1176,6 @@ func TestJobDiff(t *testing.T) {
 				},
 			},
 		},
-
 		{
 			// Multiregion: region added
 			Old: &Job{
@@ -1321,6 +1320,21 @@ func TestJobDiff(t *testing.T) {
 				},
 			},
 		},
+		{
+			// VaultToken is filtered
+			Old: &Job{
+				ID:         "vault-job",
+				VaultToken: "secret",
+			},
+			New: &Job{
+				ID:         "vault-job",
+				VaultToken: "new-secret",
+			},
+			Expected: &JobDiff{
+				Type: DiffTypeNone,
+				ID:   "vault-job",
+			},
+		},
 	}
 
 	for i, c := range cases {