refactor: kuadrant package in library package

api/v1alpha1/dnspolicy_types.go

@@ -26,7 +26,7 @@ import (
 
 	kuadrantdnsv1alpha1 "github.com/kuadrant/dns-operator/api/v1alpha1"
 
-	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 )
 
 type RoutingStrategy string
@@ -129,8 +129,8 @@ type DNSPolicyStatus struct {
 	HealthCheck *HealthCheckStatus `json:"healthCheck,omitempty"`
 }
 
-var _ utils.KuadrantPolicy = &DNSPolicy{}
-var _ utils.Referrer = &DNSPolicy{}
+var _ kuadrant.KuadrantPolicy = &DNSPolicy{}
+var _ kuadrant.Referrer = &DNSPolicy{}
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status

api/v1alpha1/tlspolicy_types.go

@@ -25,7 +25,7 @@ import (
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
-	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 )
 
 const (
@@ -116,8 +116,8 @@ type TLSPolicyStatus struct {
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 }
 
-var _ utils.KuadrantPolicy = &TLSPolicy{}
-var _ utils.Referrer = &TLSPolicy{}
+var _ kuadrant.KuadrantPolicy = &TLSPolicy{}
+var _ kuadrant.Referrer = &TLSPolicy{}
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status

api/v1beta1/kuadrant_types.go

@@ -23,7 +23,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -76,8 +76,8 @@ func (r *KuadrantStatus) Equals(other *KuadrantStatus, logger logr.Logger) bool
 	}
 
 	// Marshalling sorts by condition type
-	currentMarshaledJSON, _ := utils.ConditionMarshal(r.Conditions)
-	otherMarshaledJSON, _ := utils.ConditionMarshal(other.Conditions)
+	currentMarshaledJSON, _ := kuadrant.ConditionMarshal(r.Conditions)
+	otherMarshaledJSON, _ := kuadrant.ConditionMarshal(other.Conditions)
 	if string(currentMarshaledJSON) != string(otherMarshaledJSON) {
 		diff := cmp.Diff(string(currentMarshaledJSON), string(otherMarshaledJSON))
 		logger.V(1).Info("Conditions not equal", "difference", diff)

api/v1beta2/authpolicy_types.go

@@ -11,6 +11,7 @@ import (
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 )
 
@@ -191,8 +192,8 @@ func (s *AuthPolicyStatus) Equals(other *AuthPolicyStatus, logger logr.Logger) b
 	}
 
 	// Marshalling sorts by condition type
-	currentMarshaledJSON, _ := utils.ConditionMarshal(s.Conditions)
-	otherMarshaledJSON, _ := utils.ConditionMarshal(other.Conditions)
+	currentMarshaledJSON, _ := kuadrant.ConditionMarshal(s.Conditions)
+	otherMarshaledJSON, _ := kuadrant.ConditionMarshal(other.Conditions)
 	if string(currentMarshaledJSON) != string(otherMarshaledJSON) {
 		diff := cmp.Diff(string(currentMarshaledJSON), string(otherMarshaledJSON))
 		logger.V(1).Info("Conditions not equal", "difference", diff)
@@ -202,8 +203,8 @@ func (s *AuthPolicyStatus) Equals(other *AuthPolicyStatus, logger logr.Logger) b
 	return true
 }
 
-var _ utils.KuadrantPolicy = &AuthPolicy{}
-var _ utils.Referrer = &AuthPolicy{}
+var _ kuadrant.KuadrantPolicy = &AuthPolicy{}
+var _ kuadrant.Referrer = &AuthPolicy{}
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
@@ -307,8 +308,8 @@ type AuthPolicyList struct {
 	Items           []AuthPolicy `json:"items"`
 }
 
-func (l *AuthPolicyList) GetItems() []utils.KuadrantPolicy {
-	return utils.Map(l.Items, func(item AuthPolicy) utils.KuadrantPolicy {
+func (l *AuthPolicyList) GetItems() []kuadrant.KuadrantPolicy {
+	return utils.Map(l.Items, func(item AuthPolicy) kuadrant.KuadrantPolicy {
 		return &item
 	})
 }

api/v1beta2/authpolicy_types_test.go

@@ -12,7 +12,7 @@ import (
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
-	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 )
 
 func TestCommonAuthRuleSpecGetRouteSelectors(t *testing.T) {
@@ -86,7 +86,7 @@ func TestAuthPolicyListGetItems(t *testing.T) {
 	if len(result) != 1 {
 		t.Errorf("Expected 1 item, got %d", len(result))
 	}
-	_, ok := result[0].(utils.KuadrantPolicy)
+	_, ok := result[0].(kuadrant.KuadrantPolicy)
 	if !ok {
 		t.Errorf("Expected item to be a KuadrantPolicy")
 	}

api/v1beta2/ratelimitpolicy_types.go

@@ -26,6 +26,7 @@ import (
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 )
 
@@ -154,8 +155,8 @@ func (s *RateLimitPolicyStatus) Equals(other *RateLimitPolicyStatus, logger logr
 	}
 
 	// Marshalling sorts by condition type
-	currentMarshaledJSON, _ := utils.ConditionMarshal(s.Conditions)
-	otherMarshaledJSON, _ := utils.ConditionMarshal(other.Conditions)
+	currentMarshaledJSON, _ := kuadrant.ConditionMarshal(s.Conditions)
+	otherMarshaledJSON, _ := kuadrant.ConditionMarshal(other.Conditions)
 	if string(currentMarshaledJSON) != string(otherMarshaledJSON) {
 		if logger.V(1).Enabled() {
 			diff := cmp.Diff(string(currentMarshaledJSON), string(otherMarshaledJSON))
@@ -167,8 +168,8 @@ func (s *RateLimitPolicyStatus) Equals(other *RateLimitPolicyStatus, logger logr
 	return true
 }
 
-var _ utils.KuadrantPolicy = &RateLimitPolicy{}
-var _ utils.Referrer = &RateLimitPolicy{}
+var _ kuadrant.KuadrantPolicy = &RateLimitPolicy{}
+var _ kuadrant.Referrer = &RateLimitPolicy{}
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
@@ -217,8 +218,8 @@ type RateLimitPolicyList struct {
 	Items           []RateLimitPolicy `json:"items"`
 }
 
-func (l *RateLimitPolicyList) GetItems() []utils.KuadrantPolicy {
-	return utils.Map(l.Items, func(item RateLimitPolicy) utils.KuadrantPolicy {
+func (l *RateLimitPolicyList) GetItems() []kuadrant.KuadrantPolicy {
+	return utils.Map(l.Items, func(item RateLimitPolicy) kuadrant.KuadrantPolicy {
 		return &item
 	})
 }

api/v1beta2/ratelimitpolicy_types_test.go

@@ -10,7 +10,7 @@ import (
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
-	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 )
 
 func testBuildBasicRLP(name string, kind gatewayapiv1.Kind) *RateLimitPolicy {
@@ -70,7 +70,7 @@ func TestRateLimitPolicyListGetItems(t *testing.T) {
 	if len(result) != 1 {
 		t.Errorf("Expected 1 item, got %d", len(result))
 	}
-	_, ok := result[0].(utils.KuadrantPolicy)
+	_, ok := result[0].(kuadrant.KuadrantPolicy)
 	if !ok {
 		t.Errorf("Expected item to be a KuadrantPolicy")
 	}

api/v1beta2/route_selectors.go

@@ -4,6 +4,7 @@ import (
 	"github.com/elliotchance/orderedmap/v2"
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 )
 
@@ -40,7 +41,7 @@ func (s *RouteSelector) SelectRules(route *gatewayapiv1.HTTPRoute) (rules []gate
 	for idx := range s.Matches {
 		routeSelectorMatch := s.Matches[idx]
 		for idx, rule := range route.Spec.Rules {
-			rs := utils.HTTPRouteRuleSelector{HTTPRouteMatch: &routeSelectorMatch}
+			rs := kuadrant.HTTPRouteRuleSelector{HTTPRouteMatch: &routeSelectorMatch}
 			if rs.Selects(rule) {
 				rulesIndices.Set(idx, rule)
 			}

api/v1beta2/route_selectors_test.go

@@ -11,6 +11,7 @@ import (
 	"k8s.io/utils/ptr"
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 )
 
@@ -144,7 +145,7 @@ func TestRouteSelectors(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			rules := tc.routeSelector.SelectRules(tc.route)
 			rulesToStringSlice := func(rules []gatewayapiv1.HTTPRouteRule) []string {
-				return utils.Map(utils.Map(rules, utils.HTTPRouteRuleToString), func(r string) string { return fmt.Sprintf("{%s}", r) })
+				return utils.Map(utils.Map(rules, kuadrant.HTTPRouteRuleToString), func(r string) string { return fmt.Sprintf("{%s}", r) })
 			}
 			if !reflect.DeepEqual(rules, tc.expected) {
 				t.Errorf("expected %v, got %v", rulesToStringSlice(tc.expected), rulesToStringSlice(rules))

controllers/authpolicy_authconfig.go

@@ -8,15 +8,16 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
-	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
+	authorinoapi "github.com/kuadrant/authorino/api/v1beta2"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 
-	authorinoapi "github.com/kuadrant/authorino/api/v1beta2"
 	api "github.com/kuadrant/kuadrant-operator/api/v1beta2"
 	"github.com/kuadrant/kuadrant-operator/pkg/common"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 )
 
 func (r *AuthPolicyReconciler) reconcileAuthConfigs(ctx context.Context, ap *api.AuthPolicy, targetNetworkObject client.Object) error {
@@ -66,14 +67,14 @@ func (r *AuthPolicyReconciler) desiredAuthConfig(ctx context.Context, ap *api.Au
 	case *gatewayapiv1.HTTPRoute:
 		route = obj
 		var err error
-		hosts, err = utils.HostnamesFromHTTPRoute(ctx, obj, r.Client())
+		hosts, err = kuadrant.HostnamesFromHTTPRoute(ctx, obj, r.Client())
 		if err != nil {
 			return nil, err
 		}
 	case *gatewayapiv1.Gateway:
 		// fake a single httproute with all rules from all httproutes accepted by the gateway,
 		// that do not have an authpolicy of its own, so we can generate wasm rules for those cases
-		gw := utils.GatewayWrapper{Gateway: obj}
+		gw := kuadrant.GatewayWrapper{Gateway: obj}
 		gwHostnames := gw.Hostnames()
 		if len(gwHostnames) == 0 {
 			gwHostnames = []gatewayapiv1.Hostname{"*"}

controllers/authpolicy_controller.go

@@ -15,9 +15,9 @@ import (
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	api "github.com/kuadrant/kuadrant-operator/api/v1beta2"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 	"github.com/kuadrant/kuadrant-operator/pkg/library/mappers"
 	reconcilerutils "github.com/kuadrant/kuadrant-operator/pkg/library/reconcilers"
-	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 	"github.com/kuadrant/kuadrant-operator/pkg/reconcilers"
 )
 
@@ -28,7 +28,7 @@ type AuthPolicyReconciler struct {
 	*reconcilers.BaseReconciler
 	TargetRefReconciler reconcilerutils.TargetRefReconciler
 	// OverriddenPolicyMap tracks the overridden policies to report their status.
-	OverriddenPolicyMap *utils.OverriddenPolicyMap
+	OverriddenPolicyMap *kuadrant.OverriddenPolicyMap
 }
 
 //+kubebuilder:rbac:groups=kuadrant.io,resources=authpolicies,verbs=get;list;watch;create;update;patch;delete
@@ -73,7 +73,7 @@ func (r *AuthPolicyReconciler) Reconcile(eventCtx context.Context, req ctrl.Requ
 				if delResErr == nil {
 					delResErr = err
 				}
-				return r.reconcileStatus(ctx, ap, targetNetworkObject, utils.NewErrTargetNotFound(ap.Kind(), ap.GetTargetRef(), delResErr))
+				return r.reconcileStatus(ctx, ap, targetNetworkObject, kuadrant.NewErrTargetNotFound(ap.Kind(), ap.GetTargetRef(), delResErr))
 			}
 			return ctrl.Result{}, err
 		}
@@ -139,11 +139,11 @@ func (r *AuthPolicyReconciler) Reconcile(eventCtx context.Context, req ctrl.Requ
 // validate performs validation before proceeding with the reconcile loop, returning a common.ErrInvalid on any failing validation
 func (r *AuthPolicyReconciler) validate(ap *api.AuthPolicy, targetNetworkObject client.Object) error {
 	if err := ap.Validate(); err != nil {
-		return utils.NewErrInvalid(ap.Kind(), err)
+		return kuadrant.NewErrInvalid(ap.Kind(), err)
 	}
 
-	if err := utils.ValidateHierarchicalRules(ap, targetNetworkObject); err != nil {
-		return utils.NewErrInvalid(ap.Kind(), err)
+	if err := kuadrant.ValidateHierarchicalRules(ap, targetNetworkObject); err != nil {
+		return kuadrant.NewErrInvalid(ap.Kind(), err)
 	}
 
 	return nil

controllers/authpolicy_controller_test.go

@@ -28,7 +28,7 @@ import (
 
 	kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	api "github.com/kuadrant/kuadrant-operator/api/v1beta2"
-	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 )
 
 const (
@@ -335,7 +335,7 @@ var _ = Describe("AuthPolicy controller", func() {
 					return false
 				}
 				condition := meta.FindStatusCondition(existingPolicy.Status.Conditions, string(gatewayapiv1alpha2.PolicyConditionAccepted))
-				return condition != nil && condition.Reason == string(utils.PolicyReasonUnknown) && strings.Contains(condition.Message, "cannot match any route rules, check for invalid route selectors in the policy")
+				return condition != nil && condition.Reason == string(kuadrant.PolicyReasonUnknown) && strings.Contains(condition.Message, "cannot match any route rules, check for invalid route selectors in the policy")
 			}, 30*time.Second, 5*time.Second).Should(BeTrue())
 
 			// check istio authorizationpolicy
@@ -380,7 +380,7 @@ var _ = Describe("AuthPolicy controller", func() {
 					return false
 				}
 				condition := meta.FindStatusCondition(existingPolicy.Status.Conditions, string(gatewayapiv1alpha2.PolicyConditionAccepted))
-				return condition != nil && condition.Reason == string(utils.PolicyReasonUnknown) && strings.Contains(condition.Message, "cannot match any route rules, check for invalid route selectors in the policy")
+				return condition != nil && condition.Reason == string(kuadrant.PolicyReasonUnknown) && strings.Contains(condition.Message, "cannot match any route rules, check for invalid route selectors in the policy")
 			}, 30*time.Second, 5*time.Second).Should(BeTrue())
 
 			iapKey := types.NamespacedName{Name: istioAuthorizationPolicyName(testGatewayName, policy.Spec.TargetRef), Namespace: testNamespace}
@@ -1075,7 +1075,7 @@ var _ = Describe("AuthPolicy controller", func() {
 
 				acceptedCondMatch := acceptedCond.Status == metav1.ConditionFalse && acceptedCond.Reason == reason && acceptedCond.Message == message
 
-				enforcedCond := meta.FindStatusCondition(existingPolicy.Status.Conditions, string(utils.PolicyReasonEnforced))
+				enforcedCond := meta.FindStatusCondition(existingPolicy.Status.Conditions, string(kuadrant.PolicyReasonEnforced))
 				enforcedCondMatch := enforcedCond == nil
 
 				return acceptedCondMatch && enforcedCondMatch
@@ -1152,7 +1152,7 @@ var _ = Describe("AuthPolicy controller", func() {
 
 				acceptedCondMatch := acceptedCond.Status == metav1.ConditionTrue && acceptedCond.Reason == string(gatewayapiv1alpha2.PolicyReasonAccepted)
 
-				enforcedCond := meta.FindStatusCondition(existingPolicy.Status.Conditions, string(utils.PolicyReasonEnforced))
+				enforcedCond := meta.FindStatusCondition(existingPolicy.Status.Conditions, string(kuadrant.PolicyReasonEnforced))
 				if enforcedCond == nil {
 					return false
 				}
@@ -1179,7 +1179,7 @@ var _ = Describe("AuthPolicy controller", func() {
 			logf.Log.V(1).Info("Creating AuthPolicy", "key", client.ObjectKeyFromObject(policy).String(), "error", err)
 			Expect(err).ToNot(HaveOccurred())
 
-			Eventually(assertAcceptedCondTrueAndEnforcedCond(policy, metav1.ConditionTrue, string(utils.PolicyReasonEnforced),
+			Eventually(assertAcceptedCondTrueAndEnforcedCond(policy, metav1.ConditionTrue, string(kuadrant.PolicyReasonEnforced),
 				"AuthPolicy has been successfully enforced"), 30*time.Second, 5*time.Second).Should(BeTrue())
 		})
 
@@ -1198,7 +1198,7 @@ var _ = Describe("AuthPolicy controller", func() {
 			logf.Log.V(1).Info("Creating AuthPolicy", "key", client.ObjectKeyFromObject(policy).String(), "error", err)
 			Expect(err).ToNot(HaveOccurred())
 
-			Eventually(assertAcceptedCondTrueAndEnforcedCond(policy, metav1.ConditionFalse, string(utils.PolicyReasonUnknown),
+			Eventually(assertAcceptedCondTrueAndEnforcedCond(policy, metav1.ConditionFalse, string(kuadrant.PolicyReasonUnknown),
 				"AuthPolicy has encountered some issues: AuthScheme is not ready yet"), 30*time.Second, 5*time.Second).Should(BeTrue())
 		})
 
@@ -1228,7 +1228,7 @@ var _ = Describe("AuthPolicy controller", func() {
 			// check policy status
 			Eventually(isAuthPolicyAccepted(gwPolicy), 30*time.Second, 5*time.Second).Should(BeTrue())
 			Eventually(
-				assertAcceptedCondTrueAndEnforcedCond(gwPolicy, metav1.ConditionFalse, string(utils.PolicyReasonOverridden),
+				assertAcceptedCondTrueAndEnforcedCond(gwPolicy, metav1.ConditionFalse, string(kuadrant.PolicyReasonOverridden),
 					fmt.Sprintf("AuthPolicy is overridden by [{\"Namespace\":\"%s\",\"Name\":\"%s\"}]", testNamespace, routePolicy.Name)),
 				30*time.Second, 5*time.Second).Should(BeTrue())
 
@@ -1527,7 +1527,7 @@ func isAuthPolicyAccepted(policy *api.AuthPolicy) func() bool {
 }
 
 func isAuthPolicyEnforced(policy *api.AuthPolicy) func() bool {
-	return isAuthPolicyConditionTrue(policy, string(utils.PolicyConditionEnforced))
+	return isAuthPolicyConditionTrue(policy, string(kuadrant.PolicyConditionEnforced))
 }
 
 func isAuthPolicyConditionTrue(policy *api.AuthPolicy, condition string) func() bool {

controllers/authpolicy_istio_authorizationpolicy.go

@@ -19,6 +19,7 @@ import (
 
 	api "github.com/kuadrant/kuadrant-operator/api/v1beta2"
 	"github.com/kuadrant/kuadrant-operator/pkg/common"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
 	"github.com/kuadrant/kuadrant-operator/pkg/library/reconcilers"
 	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 )
@@ -78,7 +79,7 @@ func (r *AuthPolicyReconciler) deleteIstioAuthorizationPolicies(ctx context.Cont
 	return nil
 }
 
-func (r *AuthPolicyReconciler) istioAuthorizationPolicy(ctx context.Context, ap *api.AuthPolicy, targetNetworkObject client.Object, gw utils.GatewayWrapper) (*istio.AuthorizationPolicy, error) {
+func (r *AuthPolicyReconciler) istioAuthorizationPolicy(ctx context.Context, ap *api.AuthPolicy, targetNetworkObject client.Object, gw kuadrant.GatewayWrapper) (*istio.AuthorizationPolicy, error) {
 	logger, _ := logr.FromContext(ctx)
 	logger = logger.WithName("istioAuthorizationPolicy")