Fix FetchIngressIP error checking

brandond · brandond · commit 9f3a64fcd87c · 2025-02-10T10:16:22.000-08:00
Signed-off-by: Brad Davidson &lt;brad.davidson@rancher.com&gt;
diff --git a/tests/e2e/testutils.go b/tests/e2e/testutils.go
@@ -348,12 +348,11 @@ func FetchIngressIP(kubeconfig string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	ingressIP := strings.Trim(res, " ")
-	ingressIPs := strings.Split(ingressIP, " ")
-	if len(ingressIPs) == 0 {
-		return nil, errors.New("no ingress IP found")
+	res = strings.TrimSpace(res)
+	if res == "" {
+		return nil, errors.New("no ingress IPs found")
 	}
-	return ingressIPs, nil
+	return strings.Split(res, " "), nil
 }
 
 func (v VagrantNode) FetchNodeExternalIP() (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -348,12 +348,11 @@ func FetchIngressIP(kubeconfig string) ([]string, error) {`
`348`	`348`	`if err != nil {`
`349`	`349`	`return nil, err`
`350`	`350`	`}`
`351`		`- ingressIP := strings.Trim(res, " ")`
`352`		`- ingressIPs := strings.Split(ingressIP, " ")`
`353`		`- if len(ingressIPs) == 0 {`
`354`		`- return nil, errors.New("no ingress IP found")`
	`351`	`+ res = strings.TrimSpace(res)`
	`352`	`+ if res == "" {`
	`353`	`+ return nil, errors.New("no ingress IPs found")`
`355`	`354`	`}`
`356`		`- return ingressIPs, nil`
	`355`	`+ return strings.Split(res, " "), nil`
`357`	`356`	`}`
`358`	`357`
`359`	`358`	`func (v VagrantNode) FetchNodeExternalIP() (string, error) {`