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

Tests: Replace deprecated grpc.Dial by grpc.NewClient. (#11462)

Browse source
This commit is contained in:
Marco Ebert 2024-06-15 10:05:28 +02:00 committed by GitHub
parent 68b59db3e9
commit 0718c89203
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/e2e/annotations/grpc.go
View file

@ -107,7 +107,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
}) })
//nolint:goconst //string interpolation //nolint:goconst //string interpolation
conn, err := grpc.Dial(f.GetNginxIP()+":443", conn, err := grpc.NewClient(f.GetNginxIP()+":443",
grpc.WithTransportCredentials( grpc.WithTransportCredentials(
credentials.NewTLS(&tls.Config{ credentials.NewTLS(&tls.Config{
ServerName: echoHost, ServerName: echoHost,
@ -168,7 +168,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
return strings.Contains(server, "grpc_pass grpc://upstream_balancer;") return strings.Contains(server, "grpc_pass grpc://upstream_balancer;")
}) })
conn, err := grpc.Dial(f.GetNginxIP()+":443", conn, err := grpc.NewClient(f.GetNginxIP()+":443",
grpc.WithTransportCredentials( grpc.WithTransportCredentials(
credentials.NewTLS(&tls.Config{ credentials.NewTLS(&tls.Config{
ServerName: echoHost, ServerName: echoHost,
@ -242,7 +242,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
return strings.Contains(server, "grpc_pass grpcs://upstream_balancer;") return strings.Contains(server, "grpc_pass grpcs://upstream_balancer;")
}) })
conn, err := grpc.Dial(f.GetNginxIP()+":443", conn, err := grpc.NewClient(f.GetNginxIP()+":443",
grpc.WithTransportCredentials( grpc.WithTransportCredentials(
credentials.NewTLS(&tls.Config{ credentials.NewTLS(&tls.Config{
ServerName: echoHost, ServerName: echoHost,
@ -286,7 +286,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
strings.Contains(server, fmt.Sprintf("grpc_read_timeout %ss;", proxyTimeout)) strings.Contains(server, fmt.Sprintf("grpc_read_timeout %ss;", proxyTimeout))
}) })
conn, err := grpc.Dial( conn, err := grpc.NewClient(
f.GetNginxIP()+":80", f.GetNginxIP()+":80",
grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithAuthority(host), grpc.WithAuthority(host),
@ -329,7 +329,7 @@ var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
strings.Contains(server, fmt.Sprintf("grpc_read_timeout %ss;", proxyTimeout)) strings.Contains(server, fmt.Sprintf("grpc_read_timeout %ss;", proxyTimeout))
}) })
conn, err := grpc.Dial( conn, err := grpc.NewClient(
f.GetNginxIP()+":80", f.GetNginxIP()+":80",
grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithAuthority(host), grpc.WithAuthority(host),

2
test/e2e/settings/grpc.go
View file

@ -86,7 +86,7 @@ var _ = framework.DescribeSetting("GRPC", func() {
return strings.Contains(server, "grpc_pass grpc://upstream_balancer;") return strings.Contains(server, "grpc_pass grpc://upstream_balancer;")
}) })
conn, err := grpc.Dial(f.GetNginxIP()+":443", conn, err := grpc.NewClient(f.GetNginxIP()+":443",
grpc.WithTransportCredentials( grpc.WithTransportCredentials(
credentials.NewTLS(&tls.Config{ credentials.NewTLS(&tls.Config{
ServerName: echoHost, ServerName: echoHost,