api/jobs keep the nils in Copy and Merge for api UpdateStrategy

hashicorp · May 22, 2019 · 0ee7235 · 0ee7235
1 parent 6664e63
commit 0ee7235
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/api/jobs.go b/api/jobs.go
@@ -435,9 +435,8 @@ func (u *UpdateStrategy) Copy() *UpdateStrategy {
 		copy.Canary = intToPtr(*u.Canary)
 	}
 
-	if u.AutoPromote != nil {
-		copy.AutoPromote = boolToPtr(*u.AutoPromote)
-	}
+	// boolPtrs need to preserve nil unset value
+	copy.AutoPromote = u.AutoPromote
 
 	return copy
 }
@@ -479,9 +478,8 @@ func (u *UpdateStrategy) Merge(o *UpdateStrategy) {
 		u.Canary = intToPtr(*o.Canary)
 	}
 
-	if o.AutoPromote != nil {
-		u.AutoPromote = boolToPtr(*o.AutoPromote)
-	}
+	// boolPtrs need to preserve nil unset value
+	u.AutoPromote = o.AutoPromote
 }
 
 func (u *UpdateStrategy) Canonicalize() {