BUG/MINOR: Fix option redispatch serialization

When the redispatch interval is set to zero, remove the option from the configuration.
haproxytech · Feb 17, 2025 · 39a6922 · 39a6922
1 parent ccf6d0e
commit 39a6922
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/configuration/configuration.go b/configuration/configuration.go
@@ -2376,6 +2376,9 @@ func (s *SectionObject) redispatch(field reflect.Value) error {
 		if *br.Enabled == "disabled" {
 			d.NoOption = true
 		}
+		if br.Interval == 0 {
+			d = nil
+		}
 		if err := s.set("option redispatch", d); err != nil {
 			return err
 		}

diff --git a/test/backend_test.go b/test/backend_test.go
@@ -218,6 +218,10 @@ func TestCreateEditDeleteBackend(t *testing.T) {
 				{Name: "test_errors_all"},
 			},
 			Disabled: true,
+			Redispatch: &models.Redispatch{
+				Enabled:  misc.StringP("enabled"),
+				Interval: 0,
+			},
 		},
 	}
 
@@ -233,6 +237,9 @@ func TestCreateEditDeleteBackend(t *testing.T) {
 		t.Error(err.Error())
 	}
 
+	// A redispatch with a zero interval is automatically removed from configuration.
+	b.Redispatch = nil
+
 	var givenJSONB []byte
 	givenJSONB, err = b.MarshalBinary()
 	if err != nil {