Add test for building paths

Refactor the relevant part of the code away from the main function.
That helps mocking the Applications for which we want to build paths.

This allows us to cover building the paths for the gateway by separate tests.

Author: ezr-ondrej

controllers/cloud.redhat.com/providers/web/resources_caddygateway.go

@@ -250,6 +250,30 @@ func makeWebGatewayConfigMap(p *providers.Provider) (string, error) {
 	}
 	bopHostname := fmt.Sprintf("%s-%s.%s.svc:8090", p.Env.GetClowdName(), "mbop", p.Env.GetClowdNamespace())
 
+	upstreamList, whitelistStrings := buildUpstreamAndWhiteLists(bopHostname, appList)
+
+	cmData, err := GenerateConfig(
+		getCertHostname(p.Env.Status.Hostname),
+		fmt.Sprintf("http://%s", bopHostname),
+		whitelistStrings,
+		upstreamList,
+	)
+	if err != nil {
+		return "", err
+	}
+
+	cm.Data = map[string]string{
+		"Caddyfile.json": cmData,
+	}
+
+	h := sha256.New()
+	h.Write([]byte(cmData))
+	hash := fmt.Sprintf("%x", h.Sum(nil))
+
+	return hash, p.Cache.Update(CoreCaddyConfigMap, cm)
+}
+
+func buildUpstreamAndWhiteLists(bopHostname string, appList *crd.ClowdAppList) ([]ProxyRoute, []string) {
 	whitelistStrings := []string{}
 	upstreamList := []ProxyRoute{{
 		Upstream: bopHostname,
@@ -307,25 +331,7 @@ func makeWebGatewayConfigMap(p *providers.Provider) (string, error) {
 		}
 	}
 
-	cmData, err := GenerateConfig(
-		getCertHostname(p.Env.Status.Hostname),
-		fmt.Sprintf("http://%s", bopHostname),
-		whitelistStrings,
-		upstreamList,
-	)
-	if err != nil {
-		return "", err
-	}
-
-	cm.Data = map[string]string{
-		"Caddyfile.json": cmData,
-	}
-
-	h := sha256.New()
-	h.Write([]byte(cmData))
-	hash := fmt.Sprintf("%x", h.Sum(nil))
-
-	return hash, p.Cache.Update(CoreCaddyConfigMap, cm)
+	return upstreamList, whitelistStrings
 }
 
 func makeWebGatewayDeployment(_ *crd.ClowdEnvironment, o obj.ClowdObject, objMap providers.ObjectMap, _ bool, _ bool) error {

controllers/cloud.redhat.com/providers/web/resources_caddygateway_test.go

@@ -0,0 +1,78 @@
+package web
+
+import (
+	"testing"
+
+	crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
+	"github.com/stretchr/testify/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestBuildUpstreamAndWhiteLists(t *testing.T) {
+	bopHostname := "test-bop-hostname"
+	appList := &crd.ClowdAppList{
+		Items: []crd.ClowdApp{
+			{
+				Spec: crd.ClowdAppSpec{
+					Deployments: []crd.Deployment{
+						{
+							Name: "test-deployment-1",
+							WebServices: crd.WebServices{
+								Public: crd.PublicWebService{
+									Enabled:        true,
+									APIPath:        "test-api",
+									WhitelistPaths: []string{"/whitelist-path-1", "/whitelist-path-2"},
+								},
+							},
+						},
+					},
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-app-1",
+					Namespace: "test-namespace-1",
+				},
+			},
+			{
+				Spec: crd.ClowdAppSpec{
+					Deployments: []crd.Deployment{
+						{
+							Name: "test-deployment-2",
+							WebServices: crd.WebServices{
+								Public: crd.PublicWebService{
+									Enabled: true,
+									APIPaths: []crd.APIPath{
+										"/api-path-1",
+										"/api-path-2",
+									},
+								},
+							},
+						},
+					},
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-app-2",
+					Namespace: "test-namespace-2",
+				},
+			},
+		},
+	}
+
+	// Call the function under test
+	upstreamList, whitelistStrings := buildUpstreamAndWhiteLists(bopHostname, appList)
+
+	expectedUpstreamList := []ProxyRoute{
+		{Upstream: bopHostname, Path: "/v1/registrations*"},
+		{Upstream: bopHostname, Path: "/v1/check_registration*"},
+		{Upstream: "test-app-1-test-deployment-1.test-namespace-1.svc:8000", Path: "/api/test-api/*"},
+		{Upstream: "test-app-2-test-deployment-2.test-namespace-2.svc:8000", Path: "/api-path-1"},
+		{Upstream: "test-app-2-test-deployment-2.test-namespace-2.svc:8000", Path: "/api-path-2"},
+	}
+
+	expectedWhitelistStrings := []string{
+		"/whitelist-path-1",
+		"/whitelist-path-2",
+	}
+
+	assert.ElementsMatch(t, expectedUpstreamList, upstreamList, "Upstream list does not match expected")
+	assert.ElementsMatch(t, expectedWhitelistStrings, whitelistStrings, "Whitelist strings do not match expected")
+}