Replace network policies tests TestEnv with mocks (#194)

otterize · May 28, 2023 · 8773e42 · 8773e42
1 parent e296bb4
commit 8773e42
Show file tree

Hide file tree

Showing 5 changed files with 617 additions and 370 deletions.
diff --git a/src/operator/controllers/external_traffic/endpoints_reconciler.go b/src/operator/controllers/external_traffic/endpoints_reconciler.go
@@ -32,6 +32,10 @@ type EndpointsReconciler struct {
 	injectablerecorder.InjectableRecorder
 }
 
+type EndpointsReconcilerInterface interface {
+	Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error)
+}
+
 func (r *EndpointsReconciler) formatPolicyName(serviceName string) string {
 	return fmt.Sprintf(OtterizeExternalNetworkPolicyNameTemplate, serviceName)
 }

diff --git a/src/operator/controllers/intents_reconcilers/generate.go b/src/operator/controllers/intents_reconcilers/generate.go
@@ -1,3 +1,4 @@
 package intents_reconcilers
 
 //go:generate go run github.com/golang/mock/mockgen@v1.6.0 -destination=./mocks/mock_k8s_client.go -package=intentsreconcilersmocks sigs.k8s.io/controller-runtime/pkg/client Client
+//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -destination=./mocks/mock_endpoints_reconciler.go -package=intentsreconcilersmocks -source=../external_traffic/endpoints_reconciler.go EndpointsReconciler
diff --git a/src/operator/controllers/intents_reconcilers/mocks/mock_endpoints_reconciler.go b/src/operator/controllers/intents_reconcilers/mocks/mock_endpoints_reconciler.go
diff --git a/src/operator/controllers/intents_reconcilers/network_policy.go b/src/operator/controllers/intents_reconcilers/network_policy.go
@@ -36,7 +36,7 @@ const (
 type NetworkPolicyReconciler struct {
 	client.Client
 	Scheme                      *runtime.Scheme
-	endpointsReconciler         *external_traffic.EndpointsReconciler
+	endpointsReconciler         external_traffic.EndpointsReconcilerInterface
 	RestrictToNamespaces        []string
 	enableNetworkPolicyCreation bool
 	enforcementEnabledGlobally  bool
@@ -46,7 +46,7 @@ type NetworkPolicyReconciler struct {
 func NewNetworkPolicyReconciler(
 	c client.Client,
 	s *runtime.Scheme,
-	endpointsReconciler *external_traffic.EndpointsReconciler,
+	endpointsReconciler external_traffic.EndpointsReconcilerInterface,
 	restrictToNamespaces []string,
 	enableNetworkPolicyCreation bool,
 	enforcementEnabledGlobally bool) *NetworkPolicyReconciler {
@@ -200,9 +200,11 @@ func (r *NetworkPolicyReconciler) CreateNetworkPolicy(ctx context.Context, inten
 	for _, pod := range podList.Items {
 		var endpointsList corev1.EndpointsList
 		err = r.List(
-			ctx, &endpointsList,
+			ctx,
+			&endpointsList,
 			&client.MatchingFields{otterizev1alpha2.EndpointsPodNamesIndexField: pod.Name},
-			&client.ListOptions{Namespace: pod.Namespace})
+			&client.ListOptions{Namespace: pod.Namespace},
+		)
 
 		if err != nil {
 			return err
@@ -280,7 +282,6 @@ func (r *NetworkPolicyReconciler) deleteNetworkPolicy(
 	policyName := fmt.Sprintf(otterizev1alpha2.OtterizeNetworkPolicyNameTemplate, intent.GetServerName(), intentsObjNamespace)
 	policy := &v1.NetworkPolicy{}
 	err := r.Get(ctx, types.NamespacedName{Name: policyName, Namespace: intent.GetServerNamespace(intentsObjNamespace)}, policy)
-
 	if err != nil {
 		if k8serrors.IsNotFound(err) {
 			return nil