From 1ea0e648daff6e6735010b253c1c13b16170585e Mon Sep 17 00:00:00 2001 From: Vladimir Zhukov Date: Mon, 30 Oct 2023 14:23:10 +0300 Subject: [PATCH] Fix linter err --- internal/ingress/annotations/parser/main.go | 14 +++++-- .../ingress/annotations/proxy/main_test.go | 37 ++++++++++--------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/internal/ingress/annotations/parser/main.go b/internal/ingress/annotations/parser/main.go index 562b72e68..7c80956ce 100644 --- a/internal/ingress/annotations/parser/main.go +++ b/internal/ingress/annotations/parser/main.go @@ -144,16 +144,24 @@ func (a ingAnnotations) parseTimeout(name string) (string, error) { val, ok := a[name] if ok { s := normalizeString(val) - if len(s) == 0 { + if s == "" { + return "0", errors.NewInvalidAnnotationContent(name, val) + } + + setUnits, err := regexp.Compile(`(\d+)(s|ms)?$`) + if err != nil { return "0", errors.NewInvalidAnnotationContent(name, val) } - setUnits, _ := regexp.Compile(`(\d+)(s|ms)?$`) if setUnits.MatchString(s) { return s, nil } - noUnits, _ := regexp.Compile(`\d+$`) + noUnits, err := regexp.Compile(`\d+$`) + if err != nil { + return "0", errors.NewInvalidAnnotationContent(name, val) + } + if noUnits.MatchString(s) { return fmt.Sprintf("%ss", s), nil } diff --git a/internal/ingress/annotations/proxy/main_test.go b/internal/ingress/annotations/proxy/main_test.go index 7a5b99e6b..5f0adad2d 100644 --- a/internal/ingress/annotations/proxy/main_test.go +++ b/internal/ingress/annotations/proxy/main_test.go @@ -32,6 +32,9 @@ const ( off = "off" proxyHTTPVersion = "1.0" proxyMaxTempFileSize = "128k" + ProxyConnectTimeout = "1" + ProxySendTimeout = "15s" + ProxyReadTimeout = "20s" ) func buildIngress() *networking.Ingress { @@ -83,9 +86,9 @@ type mockBackend struct { func (m mockBackend) GetDefaultBackend() defaults.Backend { return defaults.Backend{ - ProxyConnectTimeout: "10s", - ProxySendTimeout: "15s", - ProxyReadTimeout: "20s", + ProxyConnectTimeout: ProxyConnectTimeout, + ProxySendTimeout: ProxySendTimeout, + ProxyReadTimeout: ProxyReadTimeout, ProxyBuffersNumber: 4, ProxyBufferSize: "10k", ProxyBodySize: "3k", @@ -103,9 +106,9 @@ func TestProxy(t *testing.T) { ing := buildIngress() data := map[string]string{} - data[parser.GetAnnotationWithPrefix("proxy-connect-timeout")] = "1" - data[parser.GetAnnotationWithPrefix("proxy-send-timeout")] = "15s" - data[parser.GetAnnotationWithPrefix("proxy-read-timeout")] = "20s" + data[parser.GetAnnotationWithPrefix("proxy-connect-timeout")] = ProxyConnectTimeout + data[parser.GetAnnotationWithPrefix("proxy-send-timeout")] = ProxySendTimeout + data[parser.GetAnnotationWithPrefix("proxy-read-timeout")] = ProxyReadTimeout data[parser.GetAnnotationWithPrefix("proxy-buffers-number")] = "8" data[parser.GetAnnotationWithPrefix("proxy-buffer-size")] = "1k" data[parser.GetAnnotationWithPrefix("proxy-body-size")] = "2k" @@ -126,13 +129,13 @@ func TestProxy(t *testing.T) { if !ok { t.Fatalf("expected a Config type") } - if p.ConnectTimeout != "1" { + if p.ConnectTimeout != ProxyConnectTimeout { t.Errorf("expected 1 as connect-timeout but returned %v", p.ConnectTimeout) } - if p.SendTimeout != "15s" { + if p.SendTimeout != ProxySendTimeout { t.Errorf("expected 15s as send-timeout but returned %v", p.SendTimeout) } - if p.ReadTimeout != "20s" { + if p.ReadTimeout != ProxyReadTimeout { t.Errorf("expected 20s as read-timeout but returned %v", p.ReadTimeout) } if p.BuffersNumber != 8 { @@ -171,9 +174,9 @@ func TestProxyComplex(t *testing.T) { ing := buildIngress() data := map[string]string{} - data[parser.GetAnnotationWithPrefix("proxy-connect-timeout")] = "1" - data[parser.GetAnnotationWithPrefix("proxy-send-timeout")] = "15s" - data[parser.GetAnnotationWithPrefix("proxy-read-timeout")] = "20s" + data[parser.GetAnnotationWithPrefix("proxy-connect-timeout")] = ProxyConnectTimeout + data[parser.GetAnnotationWithPrefix("proxy-send-timeout")] = ProxySendTimeout + data[parser.GetAnnotationWithPrefix("proxy-read-timeout")] = ProxyReadTimeout data[parser.GetAnnotationWithPrefix("proxy-buffers-number")] = "8" data[parser.GetAnnotationWithPrefix("proxy-buffer-size")] = "1k" data[parser.GetAnnotationWithPrefix("proxy-body-size")] = "2k" @@ -194,13 +197,13 @@ func TestProxyComplex(t *testing.T) { if !ok { t.Fatalf("expected a Config type") } - if p.ConnectTimeout != "1" { + if p.ConnectTimeout != ProxyConnectTimeout { t.Errorf("expected 1 as connect-timeout but returned %v", p.ConnectTimeout) } - if p.SendTimeout != "15s" { + if p.SendTimeout != ProxySendTimeout { t.Errorf("expected 15s as send-timeout but returned %v", p.SendTimeout) } - if p.ReadTimeout != "20s" { + if p.ReadTimeout != ProxyReadTimeout { t.Errorf("expected 20s as read-timeout but returned %v", p.ReadTimeout) } if p.BuffersNumber != 8 { @@ -252,10 +255,10 @@ func TestProxyWithNoAnnotation(t *testing.T) { if p.ConnectTimeout != "10s" { t.Errorf("expected 10s as connect-timeout but returned %v", p.ConnectTimeout) } - if p.SendTimeout != "15s" { + if p.SendTimeout != ProxySendTimeout { t.Errorf("expected 15s as send-timeout but returned %v", p.SendTimeout) } - if p.ReadTimeout != "20s" { + if p.ReadTimeout != ProxyReadTimeout { t.Errorf("expected 20s as read-timeout but returned %v", p.ReadTimeout) } if p.BuffersNumber != 4 {