DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lint go code (#5132)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-02-19 21:43:14 -03:00 • committed by GitHub
parent f6c0faa6eb
commit 57fcbdfb73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 60 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

55
test/e2e/settings/hash-size.go
View file

@ -17,83 +17,94 @@ limitations under the License.
package settings
import (
"fmt"
"strings"
. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo"
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.DescribeSetting("Settings - hash size", func() {
var _ = framework.DescribeSetting("hash size", func() {
f := framework.NewDefaultFramework("hash-size")
host := "hash-size"
BeforeEach(func() {
ginkgo.BeforeEach(func() {
f.NewEchoDeployment()
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
f.EnsureIngress(ing)
})
Context("Check server names hash size", func() {
It("should set server_names_hash_bucket_size", func() {
ginkgo.Context("Check server names hash size", func() {
ginkgo.It("should set server_names_hash_bucket_size", func() {
f.UpdateNginxConfigMapData("server-name-hash-bucket-size", "512")
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, fmt.Sprintf(`server_names_hash_bucket_size 512;`))
return strings.Contains(server, "server_names_hash_bucket_size 512;")
})
})
It("should set server_names_hash_max_size", func() {
ginkgo.It("should set server_names_hash_max_size", func() {
f.UpdateNginxConfigMapData("server-name-hash-max-size", "4096")
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, fmt.Sprintf(`server_names_hash_max_size 4096;`))
return strings.Contains(server, "server_names_hash_max_size 4096;")
})
})
})
Context("Check proxy header hash size", func() {
It("should set proxy-headers-hash-bucket-size", func() {
ginkgo.Context("Check proxy header hash size", func() {
ginkgo.It("should set proxy-headers-hash-bucket-size", func() {
f.UpdateNginxConfigMapData("proxy-headers-hash-bucket-size", "512")
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, fmt.Sprintf(`proxy_headers_hash_bucket_size 512;`))
return strings.Contains(server, "proxy_headers_hash_bucket_size 512;")
})
})
It("should set proxy-headers-hash-max-size", func() {
ginkgo.It("should set proxy-headers-hash-max-size", func() {
f.UpdateNginxConfigMapData("proxy-headers-hash-max-size", "4096")
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, fmt.Sprintf(`proxy_headers_hash_max_size 4096;`))
return strings.Contains(server, "proxy_headers_hash_max_size 4096;")
})
})
})
Context("Check the variable hash size", func() {
It("should set variables-hash-bucket-size", func() {
ginkgo.Context("Check the variable hash size", func() {
ginkgo.It("should set variables-hash-bucket-size", func() {
f.UpdateNginxConfigMapData("variables-hash-bucket-size", "512")
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, fmt.Sprintf(`variables_hash_bucket_size 512;`))
return strings.Contains(server, "variables_hash_bucket_size 512;")
})
})
It("should set variables-hash-max-size", func() {
ginkgo.It("should set variables-hash-max-size", func() {
f.UpdateNginxConfigMapData("variables-hash-max-size", "512")
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, fmt.Sprintf(`variables_hash_max_size 512;`))
return strings.Contains(server, "variables_hash_max_size 512;")
})
})
})
Context("Check the map hash size", func() {
It("should set vmap-hash-bucket-size", func() {
ginkgo.Context("Check the map hash size", func() {
ginkgo.It("should set vmap-hash-bucket-size", func() {
f.UpdateNginxConfigMapData("map-hash-bucket-size", "512")
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, fmt.Sprintf(`map_hash_bucket_size 512;`))
return strings.Contains(server, "map_hash_bucket_size 512;")
})
})
})
})

12
test/e2e/settings/keep-alive.go
View file

@ -20,23 +20,22 @@ import (
"fmt"
"strings"
. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo"
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.DescribeSetting("Settings - keep alive", func() {
var _ = framework.DescribeSetting("keep-alive keep-alive-requests", func() {
f := framework.NewDefaultFramework("keep-alive")
host := "keep-alive"
BeforeEach(func() {
ginkgo.BeforeEach(func() {
f.NewEchoDeployment()
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
f.EnsureIngress(ing)
})
It("should set keepalive_timeout", func() {
ginkgo.It("should set keepalive_timeout", func() {
f.UpdateNginxConfigMapData("keep-alive", "140")
f.WaitForNginxConfiguration(func(server string) bool {
@ -44,12 +43,11 @@ var _ = framework.DescribeSetting("Settings - keep alive", func() {
})
})
It("should set keepalive_requests", func() {
ginkgo.It("should set keepalive_requests", func() {
f.UpdateNginxConfigMapData("keep-alive-requests", "200")
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, fmt.Sprintf(`keepalive_requests 200;`))
})
})
})

19
test/e2e/settings/reuse-port.go
View file

@ -17,44 +17,43 @@ limitations under the License.
package settings
import (
"fmt"
"strings"
. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo"
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.DescribeSetting("Settings - reuse port", func() {
var _ = framework.DescribeSetting("reuse-port", func() {
f := framework.NewDefaultFramework("reuse-port")
host := "reuse-port"
BeforeEach(func() {
ginkgo.BeforeEach(func() {
f.NewEchoDeployment()
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
f.EnsureIngress(ing)
})
It("reuse port should be enabled by default", func() {
ginkgo.It("reuse port should be enabled by default", func() {
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, fmt.Sprintf(`reuseport`))
return strings.Contains(server, "reuseport")
})
})
It("reuse port should be disabled", func() {
ginkgo.It("reuse port should be disabled", func() {
f.UpdateNginxConfigMapData("reuse-port", "false")
f.WaitForNginxConfiguration(func(server string) bool {
return !strings.Contains(server, fmt.Sprintf(`reuseport`))
return !strings.Contains(server, "reuseport")
})
})
It("reuse port should be enabled", func() {
ginkgo.It("reuse port should be enabled", func() {
f.UpdateNginxConfigMapData("reuse-port", "true")
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, fmt.Sprintf(`reuseport`))
return strings.Contains(server, "reuseport")
})
})
})