put cases together

Author: randmonkey

test/helpers/conditions.go

@@ -13,7 +13,7 @@ import (
 // CheckAllConditionsTrue returns true if all the conditions with given type in `conditionTypes` are set to `True` in the given resource.
 // If it returns `false`, the second return value contains a message to tell what conditions are not `True`.
 func CheckAllConditionsTrue(resource k8sutils.ConditionsAware, conditionTypes []consts.ConditionType) (bool, string) {
-	failedConditions := make([]string, 0, len(conditionTypes))
+	var failedConditions []string
 	lo.ForEach(conditionTypes, func(conditionType consts.ConditionType, _ int) {
 		if !k8sutils.HasConditionTrue(conditionType, resource) {
 			failedConditions = append(failedConditions, string(conditionType))

test/helpers/deploy/deploy_resources.go

@@ -1034,32 +1034,6 @@ func KonnectExtension(
 	return ke
 }
 
-// KonnectExtensionRefencingKonnectGatewayControlPlane deploys a KonnectExtension attached to a Konnect CP represented by the given KonnectGatewayControlPlane.
-func KonnectExtensionRefencingKonnectGatewayControlPlane(
-	t *testing.T,
-	ctx context.Context,
-	cl client.Client,
-	cp *konnectv1alpha1.KonnectGatewayControlPlane,
-) *konnectv1alpha1.KonnectExtension {
-	return KonnectExtension(
-		t, ctx, cl,
-		func(obj client.Object) {
-			ke, ok := obj.(*konnectv1alpha1.KonnectExtension)
-			require.Truef(t, ok, "Expect object %s/%s to be a KonnectExtension, actual type %T",
-				obj.GetNamespace(), obj.GetName(), obj)
-			ke.Spec.KonnectControlPlane = konnectv1alpha1.KonnectExtensionControlPlane{
-				ControlPlaneRef: commonv1alpha1.ControlPlaneRef{
-					Type: commonv1alpha1.ControlPlaneRefKonnectNamespacedRef,
-					KonnectNamespacedRef: &commonv1alpha1.KonnectNamespacedRef{
-						Name:      cp.Name,
-						Namespace: cp.Namespace,
-					},
-				},
-			}
-		},
-	)
-}
-
 // ObjectSupportingKonnectConfiguration defines the interface of types supporting setting `KonnectConfiguration`.
 type ObjectSupportingKonnectConfiguration interface {
 	*konnectv1alpha1.KonnectGatewayControlPlane |
@@ -1083,34 +1057,6 @@ func WithKonnectConfiguration[T ObjectSupportingKonnectConfiguration](
 	}
 }
 
-// KonnectExtensionWithAPIAuthRefAndCPID deploys a KonnectExtension attaching to control plane
-// by the CP's ID and the API auth configuration to the Konnect server where the CP is in.
-func KonnectExtensionWithAPIAuthRefAndCPID(
-	t *testing.T,
-	ctx context.Context,
-	cl client.Client,
-	apiAuth konnectv1alpha1.KonnectAPIAuthConfigurationRef,
-	cpID string,
-	opts ...ObjOption,
-) *konnectv1alpha1.KonnectExtension {
-	opts = append(opts, func(obj client.Object) {
-		ke, ok := obj.(*konnectv1alpha1.KonnectExtension)
-		require.Truef(t, ok, "Expect object %s/%s to be a KonnectExtension, actual type %T",
-			obj.GetNamespace(), obj.GetName(), obj)
-		ke.Spec.KonnectConfiguration = &konnectv1alpha1.KonnectConfiguration{
-			APIAuthConfigurationRef: apiAuth,
-		}
-		ke.Spec.KonnectControlPlane.ControlPlaneRef = commonv1alpha1.ControlPlaneRef{
-			Type:      commonv1alpha1.ControlPlaneRefKonnectID,
-			KonnectID: lo.ToPtr(cpID),
-		}
-	})
-	return KonnectExtension(
-		t, ctx, cl,
-		opts...,
-	)
-}
-
 func logObjectCreate[
 	T interface {
 		client.Object

test/integration/test_konnect_extension.go

@@ -8,7 +8,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -22,7 +21,7 @@ import (
 	konnectv1alpha1 "github.com/kong/kubernetes-configuration/api/konnect/v1alpha1"
 )
 
-func TestKonnectExtensionKonnectGatewayControlPlaneNamespacedRef(t *testing.T) {
+func TestKonnectExtension(t *testing.T) {
 	ns, _ := helpers.SetupTestEnv(t, GetCtx(), GetEnv())
 
 	// Let's generate a unique test ID that we can refer to in Konnect entities.
@@ -58,38 +57,17 @@ func TestKonnectExtensionKonnectGatewayControlPlaneNamespacedRef(t *testing.T) {
 		assertKonnectEntityProgrammed(t, cp)
 	}, testutils.ObjectUpdateTimeout, testutils.ObjectUpdateTick)
 
-	t.Logf("Creating a KonnectExtension")
-	ke := deploy.KonnectExtensionRefencingKonnectGatewayControlPlane(
-		t, ctx,
-		clientNamespaced,
-		cp,
-	)
-	t.Cleanup(deleteObjectAndWaitForDeletionFn(t, ke.DeepCopy()))
-
-	t.Logf("Waiting for KonnectExtension %s/%s to have ControlPlaneRefValid contition set to True", ke.Namespace, ke.Name)
-	require.EventuallyWithT(t, func(t *assert.CollectT) {
-		err := GetClients().MgrClient.Get(GetCtx(), types.NamespacedName{Name: ke.Name, Namespace: ke.Namespace}, ke)
-		require.NoError(t, err)
-		assert.Truef(t, lo.ContainsBy(
-			ke.Status.Conditions, func(cond metav1.Condition) bool {
-				return cond.Type == konnectv1alpha1.ControlPlaneRefValidConditionType &&
-					cond.Status == metav1.ConditionTrue
-			},
-		), "ControlPlaneRefValid has not been set to True, conditions: %+v", ke.Status.Conditions)
-	}, testutils.ObjectUpdateTimeout, testutils.ObjectUpdateTick)
-
-	// TODO: Create a DataPlane using this KonnectExtension:
-	// https://github.com/Kong/gateway-operator/issues/726
 	// Create a secret used as dataplane certificate for the KonnectExtension.
 	s := deploy.Secret(
 		t, ctx, clientNamespaced,
 		// TODO: Fill real certificate data here after DP certifcates provisioning is done:
 		// https://github.com/Kong/gateway-operator/issues/874
 		map[string][]byte{},
 	)
-	// Create a KonnectExtension attaching to the CP by its ID.
-	t.Logf("Creating a KonnectExtension and waiting for Konnect control plane ref resolved")
-	ke = deploy.KonnectExtension(
+
+	// Tests on KonnectExtension with KonnectID control plane ref.
+	t.Logf("Creating a KonnectExtension with KonnectID typed control plane ref")
+	keWithKonnectIDCPRef := deploy.KonnectExtension(
 		t, ctx, clientNamespaced,
 		deploy.WithKonnectConfiguration[*konnectv1alpha1.KonnectExtension](konnectv1alpha1.KonnectConfiguration{
 			APIAuthConfigurationRef: konnectv1alpha1.KonnectAPIAuthConfigurationRef{
@@ -100,30 +78,42 @@ func TestKonnectExtensionKonnectGatewayControlPlaneNamespacedRef(t *testing.T) {
 		setKonnectExtensionDPCertSecretRef(t, s),
 	)
 
-	t.Cleanup(deleteObjectAndWaitForDeletionFn(t, ke.DeepCopy()))
+	t.Cleanup(deleteObjectAndWaitForDeletionFn(t, keWithKonnectIDCPRef.DeepCopy()))
 
-	t.Logf("Waiting for KonnectExtension %s/%s to have expected conditions set to True", ke.Namespace, ke.Name)
+	t.Logf("Waiting for KonnectExtension %s/%s to have expected conditions set to True", keWithKonnectIDCPRef.Namespace, keWithKonnectIDCPRef.Name)
 	require.EventuallyWithT(t, func(t *assert.CollectT) {
-		ok, msg := checkKonnectExtensionConditions(t, ke)
-		assert.Truef(t, ok, "condition check failed: %s, conditions: %+v", msg, ke.Status.Conditions)
+		ok, msg := checkKonnectExtensionConditions(t, keWithKonnectIDCPRef)
+		assert.Truef(t, ok, "condition check failed: %s, conditions: %+v", msg, keWithKonnectIDCPRef.Status.Conditions)
 	}, testutils.ObjectUpdateTimeout, testutils.ObjectUpdateTick)
 
-	t.Logf("waiting for status.konnect and status.dataPlaneClientAuth to be set for KonnectExtension %s/%s", ke.Namespace, ke.Name)
-	require.EventuallyWithT(t, func(t *assert.CollectT) {
-		err := GetClients().MgrClient.Get(GetCtx(), types.NamespacedName{Name: ke.Name, Namespace: ke.Namespace}, ke)
-		require.NoError(t, err)
-		// Check Konnect control plane ID
-		assert.NotNil(t, ke.Status.Konnect, "status.konnect should be present")
-		assert.Equal(t, cp.GetKonnectID(), ke.Status.Konnect.ControlPlaneID, "Konnect control plane ID should be set in status")
-		// Check dataplane client auth
-		assert.NotNil(t, ke.Status.DataPlaneClientAuth, "status.dataPlaneClientAuth should be present")
-		assert.NotNil(t, ke.Status.DataPlaneClientAuth.CertificateSecretRef, "status.dataPlaneClientAuth.certiifcateSecretRef should be present")
-		assert.Equal(t, s.Name, ke.Status.DataPlaneClientAuth.CertificateSecretRef.Name,
-			"status.dataPlaneClientAuth.certiifcateSecretRef should have the expected secret name")
+	t.Logf("waiting for status.konnect and status.dataPlaneClientAuth to be set for KonnectExtension %s/%s", keWithKonnectIDCPRef.Namespace, keWithKonnectIDCPRef.Name)
+	require.EventuallyWithT(t,
+		checkKonnectExtensionStatus(t, keWithKonnectIDCPRef, cp.GetKonnectID(), s.Name),
+		testutils.ObjectUpdateTimeout, testutils.ObjectUpdateTick)
+
+	// Tests on KonnectExtension with KonnectNamespacedRef control plane ref.
+	// REVIEW: should we separate the KonnectExtensions with different control plane refs to different cases?
+	t.Logf("Creating a KonnectExtension with KonnectNamespacedRef typed control plane ref")
+	keWithNamespacedCPRef := deploy.KonnectExtension(
+		t, ctx,
+		clientNamespaced,
+		setKonnectExtesionKonnectNamespacedRefControlPlaneRef(t, cp),
+		setKonnectExtensionDPCertSecretRef(t, s),
+	)
+	t.Cleanup(deleteObjectAndWaitForDeletionFn(t, keWithNamespacedCPRef.DeepCopy()))
 
+	t.Logf("Waiting for KonnectExtension %s/%s to have expected conditions set to True", keWithNamespacedCPRef.Namespace, keWithNamespacedCPRef.Name)
+	require.EventuallyWithT(t, func(t *assert.CollectT) {
+		ok, msg := checkKonnectExtensionConditions(t, keWithNamespacedCPRef)
+		assert.Truef(t, ok, "condition check failed: %s, conditions: %+v", msg, keWithNamespacedCPRef.Status.Conditions)
 	}, testutils.ObjectUpdateTimeout, testutils.ObjectUpdateTick)
 
-	// TODO: Create DataPlanes using the KonnectExtension after DP certifcates provisioning is done:
+	t.Logf("waiting for status.konnect and status.dataPlaneClientAuth to be set for KonnectExtension %s/%s", keWithNamespacedCPRef.Namespace, keWithNamespacedCPRef.Name)
+	require.EventuallyWithT(t,
+		checkKonnectExtensionStatus(t, keWithNamespacedCPRef, cp.GetKonnectID(), s.Name),
+		testutils.ObjectUpdateTimeout, testutils.ObjectUpdateTick)
+
+	// TODO: Create DataPlanes using the KonnectExtensions after DP certifcates provisioning is done:
 	// https://github.com/Kong/gateway-operator/issues/874
 
 }
@@ -141,7 +131,25 @@ func setKonnectExtensionKonnectIDControlPlaneRef(t *testing.T, cpID string) depl
 	}
 }
 
-func setKonnectExtensionDPCertSecretRef(t *testing.T, s *corev1.Secret) func(client.Object) {
+func setKonnectExtesionKonnectNamespacedRefControlPlaneRef(
+	t *testing.T, cp *konnectv1alpha1.KonnectGatewayControlPlane,
+) deploy.ObjOption {
+	return func(obj client.Object) {
+		ke, ok := obj.(*konnectv1alpha1.KonnectExtension)
+		require.True(t, ok)
+		// TODO: use `WithKonnectIDControlPlaneRef` after KonnectExtension support `SetControlPlaneRef`:
+		// https://github.com/Kong/kubernetes-configuration/issues/328
+		ke.Spec.KonnectControlPlane.ControlPlaneRef = commonv1alpha1.ControlPlaneRef{
+			Type: commonv1alpha1.ControlPlaneRefKonnectNamespacedRef,
+			KonnectNamespacedRef: &commonv1alpha1.KonnectNamespacedRef{
+				Name:      cp.Name,
+				Namespace: cp.Namespace,
+			},
+		}
+	}
+}
+
+func setKonnectExtensionDPCertSecretRef(t *testing.T, s *corev1.Secret) deploy.ObjOption {
 	return func(obj client.Object) {
 		ke, ok := obj.(*konnectv1alpha1.KonnectExtension)
 		require.True(t, ok)
@@ -167,3 +175,22 @@ func checkKonnectExtensionConditions(t *assert.CollectT, ke *konnectv1alpha1.Kon
 	}
 	return helpers.CheckAllConditionsTrue(ke, checkConditionTypes)
 }
+
+func checkKonnectExtensionStatus(t *testing.T,
+	ke *konnectv1alpha1.KonnectExtension,
+	expectedKonnectCPID string,
+	expectedDPCertificateSecretName string,
+) func(t *assert.CollectT) {
+	return func(t *assert.CollectT) {
+		err := GetClients().MgrClient.Get(GetCtx(), types.NamespacedName{Name: ke.Name, Namespace: ke.Namespace}, ke)
+		require.NoError(t, err)
+		// Check Konnect control plane ID
+		assert.NotNil(t, ke.Status.Konnect, "status.konnect should be present")
+		assert.Equal(t, expectedKonnectCPID, ke.Status.Konnect.ControlPlaneID, "Konnect control plane ID should be set in status")
+		// Check dataplane client auth
+		assert.NotNil(t, ke.Status.DataPlaneClientAuth, "status.dataPlaneClientAuth should be present")
+		assert.NotNil(t, ke.Status.DataPlaneClientAuth.CertificateSecretRef, "status.dataPlaneClientAuth.certiifcateSecretRef should be present")
+		assert.Equal(t, expectedDPCertificateSecretName, ke.Status.DataPlaneClientAuth.CertificateSecretRef.Name,
+			"status.dataPlaneClientAuth.certiifcateSecretRef should have the expected secret name")
+	}
+}