Skip to content

Cleanup errcheck code in test/e2e pkg #10166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 6, 2023
Merged

Cleanup errcheck code in test/e2e pkg #10166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions test/e2e/endpointslices/topology.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ var _ = framework.IngressNginxDescribeSerial("[TopologyHints] topology aware rou
status, err := f.ExecIngressPod(curlCmd)
assert.Nil(ginkgo.GinkgoT(), err)
var backends []map[string]interface{}
if err := json.Unmarshal([]byte(status), &backends); err != nil {
assert.Nil(ginkgo.GinkgoT(), err)
}
err = json.Unmarshal([]byte(status), &backends)
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error unmarshalling backends")
gotBackends := 0
for _, bck := range backends {
if strings.Contains(bck["name"].(string), "topology") {
Expand Down
34 changes: 16 additions & 18 deletions test/e2e/settings/proxy_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,11 @@ var _ = framework.DescribeSetting("use-proxy-protocol", func() {
defer conn.Close()

header := "PROXY TCP4 192.168.0.1 192.168.0.11 56324 1234\r\n"
if _, err := conn.Write([]byte(header)); err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing header")
}
if _, err := conn.Write([]byte("GET / HTTP/1.1\r\nHost: proxy-protocol\r\n\r\n")); err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing request")
}
_, err = conn.Write([]byte(header))
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing header")

_, err = conn.Write([]byte("GET / HTTP/1.1\r\nHost: proxy-protocol\r\n\r\n"))
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing request")

data, err := io.ReadAll(conn)
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error reading connection data")
Expand Down Expand Up @@ -100,12 +99,11 @@ var _ = framework.DescribeSetting("use-proxy-protocol", func() {
defer conn.Close()

header := "PROXY TCP4 192.168.0.1 192.168.0.11 56324 443\r\n"
if _, err := conn.Write([]byte(header)); err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing header")
}
if _, err := conn.Write([]byte("GET / HTTP/1.1\r\nHost: proxy-protocol\r\n\r\n")); err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing request")
}
_, err = conn.Write([]byte(header))
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing header")

_, err = conn.Write([]byte("GET / HTTP/1.1\r\nHost: proxy-protocol\r\n\r\n"))
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing request")

data, err := io.ReadAll(conn)
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error reading connection data")
Expand Down Expand Up @@ -213,12 +211,12 @@ var _ = framework.DescribeSetting("use-proxy-protocol", func() {
defer conn.Close()

header := "PROXY TCP4 192.168.0.1 192.168.0.11 56324 8080\r\n"
if _, err := conn.Write([]byte(header)); err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing header")
}
if _, err := conn.Write([]byte("GET / HTTP/1.1\r\nHost: proxy-protocol\r\n\r\n")); err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing request")
}
_, err = conn.Write([]byte(header))
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing header")

_, err = conn.Write([]byte("GET / HTTP/1.1\r\nHost: proxy-protocol\r\n\r\n"))
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error writing request")

_, err = io.ReadAll(conn)
assert.Nil(ginkgo.GinkgoT(), err, "unexpected error reading connection data")

Expand Down
5 changes: 2 additions & 3 deletions test/e2e/ssl/secret_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,8 @@ var _ = framework.IngressNginxDescribe("[SSL] secret update", func() {

dummySecret.Data["some-key"] = []byte("some value")

if _, err := f.KubeClientSet.CoreV1().Secrets(f.Namespace).Update(context.TODO(), dummySecret, metav1.UpdateOptions{}); err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "updating secret")
}
_, err = f.KubeClientSet.CoreV1().Secrets(f.Namespace).Update(context.TODO(), dummySecret, metav1.UpdateOptions{})
assert.Nil(ginkgo.GinkgoT(), err, "updating secret")

assert.NotContains(ginkgo.GinkgoT(), log, fmt.Sprintf("starting syncing of secret %v/dummy", f.Namespace))
assert.NotContains(ginkgo.GinkgoT(), log, fmt.Sprintf("error obtaining PEM from secret %v/dummy", f.Namespace))
Expand Down