Fix NPE (#112999)

* Fix NPE * bump version
kubernetes · Oct 15, 2022 · 0005364 · 0005364
1 parent 6f579d3
commit 0005364
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/test/images/agnhost/VERSION b/test/images/agnhost/VERSION
@@ -1 +1 @@
-2.41
+2.42
diff --git a/test/images/agnhost/no-snat-test-proxy/main.go b/test/images/agnhost/no-snat-test-proxy/main.go
@@ -79,16 +79,18 @@ func checknosnat(w http.ResponseWriter, req *http.Request) {
 	if err != nil {
 		w.WriteHeader(500)
 		fmt.Fprintf(w, "error querying %q, err: %v", url, err)
-	} else {
-		body, err := io.ReadAll(resp.Body)
-		if err != nil {
-			w.WriteHeader(500)
-			fmt.Fprintf(w, "error reading body of response from %q, err: %v", url, err)
-		} else {
-			// Respond the same status code and body as /checknosnat on the internal Pod
-			w.WriteHeader(resp.StatusCode)
-			w.Write(body)
-		}
+		return
 	}
-	resp.Body.Close()
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		w.WriteHeader(500)
+		fmt.Fprintf(w, "error reading body of response from %q, err: %v", url, err)
+		return
+	}
+
+	// Respond the same status code and body as /checknosnat on the internal Pod
+	w.WriteHeader(resp.StatusCode)
+	w.Write(body)
 }