Do not allow infinite for connect-timeout config file parameter.

Signed-off-by: Tero Saarni <tero.saarni@est.tech>
projectcontour · Feb 8, 2022 · 807d0e6 · 807d0e6
1 parent 22ddb70
commit 807d0e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/pkg/config/parameters.go b/pkg/config/parameters.go
@@ -429,7 +429,7 @@ type TimeoutParameters struct {
 	// See https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto#envoy-v3-api-field-config-cluster-v3-cluster-connect-timeout
 	// for more information.
 	// +optional
-	ConnectTimeout string `yaml:"connect-timeout"`
+	ConnectTimeout string `yaml:"connect-timeout,omitempty"`
 }
 
 // Validate the timeout parameters.
@@ -471,8 +471,13 @@ func (t TimeoutParameters) Validate() error {
 		return fmt.Errorf("connection shutdown grace period %q: %w", t.ConnectionShutdownGracePeriod, err)
 	}
 
-	if err := v(t.ConnectTimeout); err != nil {
-		return fmt.Errorf("connect timeout %q: %w", t.ConnectTimeout, err)
+	// ConnectTimeout is normally implicitly set to 2s in Defaults().
+	// If user sets "" then Envoy built-in default should be used.
+	// ConnectTimeout cannot be "infinite" so use time.ParseDuration() directly instead of v().
+	if t.ConnectTimeout != "" {
+		if _, err := time.ParseDuration(t.ConnectTimeout); err != nil {
+			return fmt.Errorf("connect timeout %q: %w", t.ConnectTimeout, err)
+		}
 	}
 
 	return nil

diff --git a/pkg/config/parameters_test.go b/pkg/config/parameters_test.go
@@ -260,6 +260,7 @@ func TestValidateTimeoutParams(t *testing.T) {
 		MaxConnectionDuration:         "infinite",
 		DelayedCloseTimeout:           "infinite",
 		ConnectionShutdownGracePeriod: "infinite",
+		ConnectTimeout:                "2s",
 	}.Validate())
 	assert.NoError(t, TimeoutParameters{
 		RequestTimeout:                "infinity",
@@ -268,6 +269,7 @@ func TestValidateTimeoutParams(t *testing.T) {
 		MaxConnectionDuration:         "infinity",
 		DelayedCloseTimeout:           "infinity",
 		ConnectionShutdownGracePeriod: "infinity",
+		ConnectTimeout:                "2s",
 	}.Validate())
 
 	assert.Error(t, TimeoutParameters{RequestTimeout: "foo"}.Validate())
@@ -276,6 +278,7 @@ func TestValidateTimeoutParams(t *testing.T) {
 	assert.Error(t, TimeoutParameters{MaxConnectionDuration: "boop"}.Validate())
 	assert.Error(t, TimeoutParameters{DelayedCloseTimeout: "bebop"}.Validate())
 	assert.Error(t, TimeoutParameters{ConnectionShutdownGracePeriod: "bong"}.Validate())
+	assert.Error(t, TimeoutParameters{ConnectTimeout: "infinite"}.Validate())
 
 }