(cleanup): Remove export of func from the tests since it is not required

Author: camilamacedo86

test/catalogd-e2e/unpack_test.go

@@ -2,7 +2,12 @@ package catalogde2e
 
 import (
 	"context"
+	"fmt"
+	"io"
+	"k8s.io/client-go/kubernetes"
+	"net/url"
 	"os"
+	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -76,7 +81,7 @@ var _ = Describe("ClusterCatalog Unpacking", func() {
 			Expect(catalog.ObjectMeta.Labels).To(HaveKeyWithValue("olm.operatorframework.io/metadata.name", catalogName))
 
 			By("Making sure the catalog content is available via the http server")
-			actualFBC, err := ReadTestCatalogServerContents(ctx, catalog, c, kubeClient)
+			actualFBC, err := readTestCatalogServerContents(ctx, catalog, kubeClient)
 			Expect(err).To(Not(HaveOccurred()))
 
 			expectedFBC, err := os.ReadFile("../../catalogd/testdata/catalogs/test-catalog/expected_all.json")
@@ -102,3 +107,40 @@ var _ = Describe("ClusterCatalog Unpacking", func() {
 		})
 	})
 })
+
+func readTestCatalogServerContents(ctx context.Context, catalog *catalogdv1.ClusterCatalog, kubeClient kubernetes.Interface) ([]byte, error) {
+	if catalog == nil {
+		return nil, fmt.Errorf("cannot read nil catalog")
+	}
+	if catalog.Status.URLs == nil {
+		return nil, fmt.Errorf("catalog %q has no catalog urls", catalog.Name)
+	}
+	url, err := url.Parse(catalog.Status.URLs.Base)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing clustercatalog url %q: %v", catalog.Status.URLs.Base, err)
+	}
+	// url is expected to be in the format of
+	// http://{service_name}.{namespace}.svc/catalogs/{catalog_name}/
+	// so to get the namespace and name of the service we grab only
+	// the hostname and split it on the '.' character
+	ns := strings.Split(url.Hostname(), ".")[1]
+	name := strings.Split(url.Hostname(), ".")[0]
+	port := url.Port()
+	// the ProxyGet() call below needs an explicit port value, so if
+	// value from url.Port() is empty, we assume port 443.
+	if port == "" {
+		if url.Scheme == "https" {
+			port = "443"
+		} else {
+			port = "80"
+		}
+	}
+	resp := kubeClient.CoreV1().Services(ns).ProxyGet(url.Scheme, name, port, url.JoinPath("api", "v1", "all").Path, map[string]string{})
+	rc, err := resp.Stream(ctx)
+	if err != nil {
+		return nil, err
+	}
+	defer rc.Close()
+
+	return io.ReadAll(rc)
+}