common moved to utils

Kuadrant · Apr 16, 2024 · e773993 · e773993
1 parent 835aabf
commit e773993
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/controllers/dnspolicy_controller_multi_cluster_test.go b/controllers/dnspolicy_controller_multi_cluster_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/kuadrant/kuadrant-operator/api/v1alpha1"
 	"github.com/kuadrant/kuadrant-operator/pkg/common"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 	"github.com/kuadrant/kuadrant-operator/pkg/multicluster"
 )
 
@@ -38,10 +39,10 @@ var _ = Describe("DNSPolicy Multi Cluster", func() {
 		CreateNamespace(&testNamespace)
 
 		var err error
-		err, clusterID = common.GetClusterUID(ctx, k8sClient)
+		err, clusterID = utils.GetClusterUID(ctx, k8sClient)
 		Expect(err).To(BeNil())
 
-		clusterID = common.ToBase36HashLen(clusterID, common.ClusterIDLength)
+		clusterID = common.ToBase36HashLen(clusterID, utils.ClusterIDLength)
 
 		gatewayClass = testBuildGatewayClass("foo", "default", "kuadrant.io/bar")
 		Expect(k8sClient.Create(ctx, gatewayClass)).To(Succeed())
@@ -55,8 +56,8 @@ var _ = Describe("DNSPolicy Multi Cluster", func() {
 			Gateway
 		Expect(k8sClient.Create(ctx, gateway)).To(Succeed())
 
-		clusterOneIDHash = common.ToBase36HashLen(TestClusterNameOne, common.ClusterIDLength)
-		clusterTwoIDHash = common.ToBase36HashLen(TestClusterNameTwo, common.ClusterIDLength)
+		clusterOneIDHash = common.ToBase36HashLen(TestClusterNameOne, utils.ClusterIDLength)
+		clusterTwoIDHash = common.ToBase36HashLen(TestClusterNameTwo, utils.ClusterIDLength)
 		gwHash = common.ToBase36HashLen(gateway.Name+"-"+gateway.Namespace, 6)
 
 		//Set multi cluster gateway status

diff --git a/controllers/dnspolicy_controller_single_cluster_test.go b/controllers/dnspolicy_controller_single_cluster_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/kuadrant/kuadrant-operator/api/v1alpha1"
 	"github.com/kuadrant/kuadrant-operator/pkg/common"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 )
 
 var _ = Describe("DNSPolicy Single Cluster", func() {
@@ -37,10 +38,10 @@ var _ = Describe("DNSPolicy Single Cluster", func() {
 		CreateNamespace(&testNamespace)
 
 		var err error
-		err, clusterUID := common.GetClusterUID(ctx, k8sClient)
+		err, clusterUID := utils.GetClusterUID(ctx, k8sClient)
 		Expect(err).To(BeNil())
 
-		clusterID = common.ToBase36HashLen(clusterUID, common.ClusterIDLength)
+		clusterID = common.ToBase36HashLen(clusterUID, utils.ClusterIDLength)
 
 		gatewayClass = testBuildGatewayClass("foo", "default", "kuadrant.io/bar")
 		Expect(k8sClient.Create(ctx, gatewayClass)).To(Succeed())

diff --git a/controllers/dnspolicy_dnsrecords.go b/controllers/dnspolicy_dnsrecords.go
@@ -44,7 +44,7 @@ func (r *DNSPolicyReconciler) reconcileDNSRecords(ctx context.Context, dnsPolicy
 
 func (r *DNSPolicyReconciler) reconcileGatewayDNSRecords(ctx context.Context, gw *gatewayapiv1.Gateway, dnsPolicy *v1alpha1.DNSPolicy) error {
 	log := crlog.FromContext(ctx)
-	err, clusterID := common.GetClusterUID(ctx, r.Client())
+	err, clusterID := utils.GetClusterUID(ctx, r.Client())
 	if err != nil {
 		return fmt.Errorf("failed to generate cluster ID: %w", err)
 	}

diff --git a/pkg/multicluster/target.go b/pkg/multicluster/target.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/kuadrant/kuadrant-operator/api/v1alpha1"
 	"github.com/kuadrant/kuadrant-operator/pkg/common"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 )
 
 const (
@@ -33,7 +34,7 @@ func (t *GatewayTarget) GetName() string {
 }
 
 func (t *GatewayTarget) GetShortCode() string {
-	return common.ToBase36HashLen(t.GetName(), common.ClusterIDLength)
+	return common.ToBase36HashLen(t.GetName(), utils.ClusterIDLength)
 }
 
 // GroupTargetsByGeo groups targets based on Geo Code.
@@ -108,7 +109,7 @@ func (t *ClusterGatewayTarget) GetName() string {
 }
 
 func (t *ClusterGatewayTarget) GetShortCode() string {
-	return common.ToBase36HashLen(t.GetName(), common.ClusterIDLength)
+	return common.ToBase36HashLen(t.GetName(), utils.ClusterIDLength)
 }
 
 func (t *ClusterGatewayTarget) setGeo(defaultGeo v1alpha1.GeoCode) {