fix: update canonicalize job test to include canonicalize update stra…

…tegy
hashicorp · Apr 3, 2023 · 418dcf3 · 418dcf3
1 parent e61fa47
commit 418dcf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/nomad/job_endpoint_hooks_test.go b/nomad/job_endpoint_hooks_test.go
@@ -740,6 +740,7 @@ func Test_jobCanonicalizer_Mutate(t *testing.T) {
 				Namespace:   "default",
 				Datacenters: []string{"*"},
 				Priority:    123,
+				Update:      *structs.DefaultUpdateStrategy,
 			},
 		},
 		{
@@ -753,6 +754,7 @@ func Test_jobCanonicalizer_Mutate(t *testing.T) {
 				Namespace:   "default",
 				Datacenters: []string{"*"},
 				Priority:    serverJobDefaultPriority,
+				Update:      *structs.DefaultUpdateStrategy,
 			},
 		},
 	}

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -5156,7 +5156,7 @@ func (u *UpdateStrategy) Rolling() bool {
 func (u *UpdateStrategy) Canonicalize() {
 	d := DefaultUpdateStrategy
 
-	if u.MaxParallel != 0 {
+	if u.MaxParallel == 0 {
 		u.MaxParallel = d.MaxParallel
 	}
 
@@ -5180,17 +5180,9 @@ func (u *UpdateStrategy) Canonicalize() {
 		u.MinHealthyTime = d.MinHealthyTime
 	}
 
-	if u.AutoRevert == false {
-		u.AutoRevert = d.AutoRevert
-	}
-
 	if u.Canary == 0 {
 		u.Canary = d.Canary
 	}
-
-	if u.AutoPromote == false {
-		u.AutoPromote = d.AutoPromote
-	}
 }
 
 type Multiregion struct {