BUG/MINOR: redispatch: allow interval of 0

Author: mjuraga

configuration/configuration.go

@@ -981,9 +981,8 @@ func (s *SectionParser) redispatch() interface{} {
 		return nil
 	}
 	d := data.(*types.OptionRedispatch)
-	br := &models.Redispatch{}
-	if d.Interval != nil {
-		br.Interval = *d.Interval
+	br := &models.Redispatch{
+		Interval: d.Interval,
 	}
 	if d.NoOption {
 		d := "disabled"
@@ -2370,7 +2369,7 @@ func (s *SectionObject) redispatch(field reflect.Value) error {
 			return misc.CreateTypeAssertError("option redispatch")
 		}
 		d := &types.OptionRedispatch{
-			Interval: &br.Interval,
+			Interval: br.Interval,
 			NoOption: false,
 		}
 		if *br.Enabled == "disabled" {

models/redispatch.go

@@ -10030,7 +10030,7 @@ definitions:
         type: string
       interval:
         type: integer
-        x-nullable: false
+        x-nullable: true
     required:
       - enabled
     type: object

models/redispatch_compare.go

@@ -151,7 +151,7 @@ redispatch:
       enum: [enabled, disabled]
     interval:
       type: integer
-      x-nullable: false
+      x-nullable: true
 errorfile:
   type: object
   x-display-name: Error File

models/redispatch_compare_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: misc.Int64P(0),
+			},
 		},
 	}
 
@@ -317,7 +321,8 @@ func TestCreateEditDeleteBackend(t *testing.T) {
 					Enabled: misc.StringP("enabled"),
 					Except:  "127.0.0.1",
 				},
-			}},
+			},
+		},
 		{
 			BackendBase: models.BackendBase{
 				Name: "created",
@@ -385,7 +390,8 @@ func TestCreateEditDeleteBackend(t *testing.T) {
 					{Cond: misc.StringP("if"), CondTest: misc.StringP("host_www")},
 					{Cond: misc.StringP("unless"), CondTest: misc.StringP("missing_cl")},
 				},
-			}},
+			},
+		},
 	}
 
 	for i, backend := range backends {
@@ -691,7 +697,8 @@ func TestCreateEditDeleteBackendHTTPConnectionMode(t *testing.T) {
 						},
 					},
 					HTTPConnectionMode: "httpclose",
-				}},
+				},
+			},
 			expectedHTTPConnectionMode: "httpclose",
 		},
 		{
@@ -707,7 +714,8 @@ func TestCreateEditDeleteBackendHTTPConnectionMode(t *testing.T) {
 						},
 					},
 					HTTPConnectionMode: "http-keep-alive",
-				}},
+				},
+			},
 			expectedHTTPConnectionMode: "http-keep-alive",
 		},
 		{
@@ -723,7 +731,8 @@ func TestCreateEditDeleteBackendHTTPConnectionMode(t *testing.T) {
 						},
 					},
 					HTTPConnectionMode: "",
-				}},
+				},
+			},
 			expectedHTTPConnectionMode: "",
 		},
 	}