Fix tests

pkg/comp-functions/functions/vshnpostgres/loadBalancer.go

@@ -17,7 +17,7 @@ import (
 
 var serviceName = "primary-service"
 
-func AddLoadBalancerIPToConnectionDetails(ctx context.Context, svc *runtime.ServiceRuntime) *xfnproto.Result {
+func AddPrimaryService(ctx context.Context, svc *runtime.ServiceRuntime) *xfnproto.Result {
 
 	comp, err := getVSHNPostgreSQL(ctx, svc)
 

pkg/comp-functions/functions/vshnpostgres/loadBalancer_test.go

@@ -18,13 +18,11 @@ func TestNothingToDo(t *testing.T) {
 		svc.Config.Data["externalDatabaseConnectionsEnabled"] = "true"
 
 		// When
-		result := AddLoadBalancerIPToConnectionDetails(ctx, svc)
+		result := AddPrimaryService(ctx, svc)
 
 		desired := svc.GetAllDesired()
 
-		if len(desired) != 2 {
-			t.Fatal("Expected 2 resources in desired, got", len(desired))
-		}
+		assert.Len(t, desired, 2)
 
 		// Then
 		assert.NotNil(t, result)
@@ -42,7 +40,7 @@ func TestLoadBalancerParameterSet(t *testing.T) {
 		svc.Config.Data["externalDatabaseConnectionsEnabled"] = "true"
 
 		// When
-		result := AddLoadBalancerIPToConnectionDetails(ctx, svc)
+		result := AddPrimaryService(ctx, svc)
 
 		// Then
 		assert.NotNil(t, result)
@@ -59,26 +57,26 @@ func TestLoadBalancerServiceObserverCreated(t *testing.T) {
 		svc.Config.Data["externalDatabaseConnectionsEnabled"] = "true"
 
 		// When
-		result := AddLoadBalancerIPToConnectionDetails(ctx, svc)
+		result := AddPrimaryService(ctx, svc)
 
 		// Then
 		assert.Nil(t, result)
 	})
 }
 
-// this test normally should return Warning because it's copy of TestLoadBalancerParameterSet()
-// but due to disabled LoadBalancer in config it returns Normal
+// The primary-service should be deployed even if loadbalancing is disabled.
+// However it should not be allowed to be set to type LoadBalancer.
 func TestLoadBalancerNotEnabled(t *testing.T) {
 	ctx := context.Background()
 
 	t.Run("Verify composition", func(t *testing.T) {
 
 		//Given
-		svc := commontest.LoadRuntimeFromFile(t, "vshn-postgres/loadbalancer/01-LoadBalancerSet.yaml")
+		svc := commontest.LoadRuntimeFromFile(t, "vshn-postgres/loadbalancer/02-ServiceObserverPresent.yaml")
 		svc.Config.Data["externalDatabaseConnectionsEnabled"] = "false"
 
 		// When
-		result := AddLoadBalancerIPToConnectionDetails(ctx, svc)
+		result := AddPrimaryService(ctx, svc)
 
 		// Then
 		assert.Nil(t, result)

pkg/comp-functions/functions/vshnpostgres/register.go

@@ -51,7 +51,7 @@ func init() {
 			},
 			{
 				Name:    "load-balancer",
-				Execute: AddLoadBalancerIPToConnectionDetails,
+				Execute: AddPrimaryService,
 			},
 			{
 				Name:    "namespaceQuotas",