e2e-tests: simplify bosh curl helper

- Always passing a value to json.Unmarshal so just use "any", a generic
  doesn't help

- bosh curl always returns json from the bosh director api, so
  specifically adding --json adds no value

- bosh curl is independent of the deployment, so can further be
  simplified

[TNZ-66259](https://vmw-jira.broadcom.net/browse/TNZ-66259)

Authored-by: Andrew Garner <andrew.garner@broadcom.com>

Author: abg

src/e2e-tests/proxy_healthcheck_test.go

@@ -4,16 +4,16 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
+	"os/exec"
 	"slices"
 	"strings"
 	"time"
 
-	"e2e-tests/utilities/bosh"
-	"e2e-tests/utilities/cmd"
 	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	"e2e-tests/utilities/bosh"
 )
 
 var _ = Describe("Proxy healthcheck", Ordered, Label("proxy", "healthchecks"), func() {
@@ -135,7 +135,7 @@ func boshDNSAddress(deploymentName, jobName string) string {
 	// Get all links
 	var deploymentLinks []link
 
-	err := curl(deploymentName, "/links?deployment="+deploymentName, &deploymentLinks)
+	err := curl("/links?deployment="+deploymentName, &deploymentLinks)
 	Expect(err).NotTo(HaveOccurred())
 
 	// Get first proxy link
@@ -152,41 +152,25 @@ func boshDNSAddress(deploymentName, jobName string) string {
 	// Get links address
 	var address linkAddress
 
-	err = curl(deploymentName, "/link_address?link_id="+targetLinkID, &address)
+	err = curl("/link_address?link_id="+targetLinkID, &address)
 	Expect(err).NotTo(HaveOccurred())
 
 	return address.Address
 }
 
-func curl[T any](deploymentName, endpoint string, target *T) error {
+func curl(endpoint string, target any) error {
 	var output bytes.Buffer
-	if err := cmd.RunWithoutOutput(io.MultiWriter(&output, GinkgoWriter),
-		"bosh",
-		"--deployment="+deploymentName,
-		"curl",
-		endpoint,
-		"--json",
-	); err != nil {
+	cmd := exec.Command("bosh", "curl", endpoint)
+	cmd.Stdout = &output
+	cmd.Stderr = GinkgoWriter
+	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("remote curl failed: %w", err)
 	}
 
-	var result struct {
-		Blocks []string `json:"Blocks"`
-	}
-
-	if err := json.Unmarshal(output.Bytes(), &result); err != nil {
-		return fmt.Errorf("failed to unmarshal bosh curl response (%q): %w", output.String(), err)
-	}
-
-	if len(result.Blocks) == 0 {
-		return fmt.Errorf("no response blocks provided by bosh curl (%q)", output.String())
-	}
-
-	// Does bosh curl ever return >1 Blocks?
-	err := json.Unmarshal([]byte(result.Blocks[0]), target)
-	if err != nil {
+	if err := json.Unmarshal(output.Bytes(), target); err != nil {
 		return fmt.Errorf("failed to parse JSON: %w", err)
 	}
+
 	return nil
 }