refactor: GetURL() -> GetIdentity()

Signed-off-by: KevFan <[email protected]>
Kuadrant · Aug 22, 2024 · 3412363 · 3412363
1 parent e963418
commit 3412363
Show file tree

Hide file tree

Showing 18 changed files with 113 additions and 112 deletions.
diff --git a/README.md b/README.md
@@ -45,8 +45,8 @@ type MyPolicySpec struct {
   TargetRef gwapiv1alpha2.LocalPolicyTargetReference
 }
 
-func (p *MyPolicy) GetURL() string {
-	return machinery.UrlFromObject(p)
+func (p *MyPolicy) GetIdentity() string {
+	return machinery.IdentityFromObject(p)
 }
 
 func (p *MyPolicy) GetTargetRefs() []machinery.PolicyTargetReference {

diff --git a/controller/object.go b/controller/object.go
@@ -32,8 +32,8 @@ func (o *RuntimeObject) GetName() string {
 	return o.Object.GetName()
 }
 
-func (o *RuntimeObject) GetURL() string {
-	return machinery.UrlFromObject(o)
+func (o *RuntimeObject) GetIdentity() string {
+	return machinery.IdentityFromObject(o)
 }
 
 // ObjectAs casts an Object generically into any kind

diff --git a/examples/color_policy/color_policy.go b/examples/color_policy/color_policy.go
@@ -16,8 +16,8 @@ type ColorPolicy struct {
 
 var _ machinery.Policy = &ColorPolicy{}
 
-func (p *ColorPolicy) GetURL() string {
-	return machinery.UrlFromObject(p)
+func (p *ColorPolicy) GetIdentity() string {
+	return machinery.IdentityFromObject(p)
 }
 
 func (p *ColorPolicy) GetTargetRefs() []machinery.PolicyTargetReference {

diff --git a/examples/json_patch/color_policy.go b/examples/json_patch/color_policy.go
@@ -7,6 +7,7 @@ import (
 	gwapi "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
 	jsonpatch "github.com/evanphx/json-patch"
+
 	"github.com/kuadrant/policy-machinery/machinery"
 )
 
@@ -19,8 +20,8 @@ type ColorPolicy struct {
 
 var _ machinery.Policy = &ColorPolicy{}
 
-func (p *ColorPolicy) GetURL() string {
-	return machinery.UrlFromObject(p)
+func (p *ColorPolicy) GetIdentity() string {
+	return machinery.IdentityFromObject(p)
 }
 
 func (p *ColorPolicy) GetTargetRefs() []machinery.PolicyTargetReference {

diff --git a/examples/kuadrant/apis/v1alpha2/dnspolicy_types.go b/examples/kuadrant/apis/v1alpha2/dnspolicy_types.go
@@ -44,8 +44,8 @@ func (p *DNSPolicy) GetName() string {
 	return p.Name
 }
 
-func (p *DNSPolicy) GetURL() string {
-	return machinery.UrlFromObject(p)
+func (p *DNSPolicy) GetIdentity() string {
+	return machinery.IdentityFromObject(p)
 }
 
 func (p *DNSPolicy) GetTargetRefs() []machinery.PolicyTargetReference {

diff --git a/examples/kuadrant/apis/v1alpha2/tlspolicy_types.go b/examples/kuadrant/apis/v1alpha2/tlspolicy_types.go
@@ -46,8 +46,8 @@ func (p *TLSPolicy) GetName() string {
 	return p.Name
 }
 
-func (p *TLSPolicy) GetURL() string {
-	return machinery.UrlFromObject(p)
+func (p *TLSPolicy) GetIdentity() string {
+	return machinery.IdentityFromObject(p)
 }
 
 func (p *TLSPolicy) GetTargetRefs() []machinery.PolicyTargetReference {

diff --git a/examples/kuadrant/apis/v1beta3/authpolicy_types.go b/examples/kuadrant/apis/v1beta3/authpolicy_types.go
@@ -49,8 +49,8 @@ func (p *AuthPolicy) GetName() string {
 	return p.Name
 }
 
-func (p *AuthPolicy) GetURL() string {
-	return machinery.UrlFromObject(p)
+func (p *AuthPolicy) GetIdentity() string {
+	return machinery.IdentityFromObject(p)
 }
 
 func (p *AuthPolicy) GetTargetRefs() []machinery.PolicyTargetReference {

diff --git a/examples/kuadrant/apis/v1beta3/ratelimitpolicy_types.go b/examples/kuadrant/apis/v1beta3/ratelimitpolicy_types.go
@@ -56,8 +56,8 @@ func (p *RateLimitPolicy) GetName() string {
 	return p.Name
 }
 
-func (p *RateLimitPolicy) GetURL() string {
-	return machinery.UrlFromObject(p)
+func (p *RateLimitPolicy) GetIdentity() string {
+	return machinery.IdentityFromObject(p)
 }
 
 func (p *RateLimitPolicy) GetTargetRefs() []machinery.PolicyTargetReference {

diff --git a/examples/kuadrant/reconcilers/envoy_gateway.go b/examples/kuadrant/reconcilers/envoy_gateway.go
@@ -44,7 +44,7 @@ func (p *EnvoyGatewayProvider) ReconcileSecurityPolicies(ctx context.Context, _
 				logger.Error(fmt.Errorf("unexpected topology path length to build Envoy SecurityPolicy"), "path", lo.Map(path, machinery.MapTargetableToURLFunc))
 				return false
 			}
-			return path[0].GetURL() == gateway.GetURL() && lo.ContainsBy(targetables.Parents(path[0]), func(parent machinery.Targetable) bool {
+			return path[0].GetIdentity() == gateway.GetIdentity() && lo.ContainsBy(targetables.Parents(path[0]), func(parent machinery.Targetable) bool {
 				gc, ok := parent.(*machinery.GatewayClass)
 				return ok && gc.Spec.ControllerName == "gateway.envoyproxy.io/gatewayclass-controller"
 			})

diff --git a/examples/kuadrant/reconcilers/istio.go b/examples/kuadrant/reconcilers/istio.go
@@ -47,7 +47,7 @@ func (p *IstioGatewayProvider) ReconcileAuthorizationPolicies(ctx context.Contex
 				logger.Error(fmt.Errorf("unexpected topology path length to build Istio AuthorizationPolicy"), "path", lo.Map(path, machinery.MapTargetableToURLFunc))
 				return false
 			}
-			return path[0].GetURL() == gateway.GetURL() && lo.ContainsBy(targetables.Parents(path[0]), func(parent machinery.Targetable) bool {
+			return path[0].GetIdentity() == gateway.GetIdentity() && lo.ContainsBy(targetables.Parents(path[0]), func(parent machinery.Targetable) bool {
 				gc, ok := parent.(*machinery.GatewayClass)
 				return ok && gc.Spec.ControllerName == "istio.io/gateway-controller"
 			})

diff --git a/machinery/core_types.go b/machinery/core_types.go
@@ -22,8 +22,8 @@ type Namespace struct {
 
 var _ Targetable = &Namespace{}
 
-func (n *Namespace) GetURL() string {
-	return UrlFromObject(n)
+func (n *Namespace) GetIdentity() string {
+	return IdentityFromObject(n)
 }
 
 func (n *Namespace) SetPolicies(policies []Policy) {
@@ -42,8 +42,8 @@ type Service struct {
 
 var _ Targetable = &Service{}
 
-func (s *Service) GetURL() string {
-	return UrlFromObject(s)
+func (s *Service) GetIdentity() string {
+	return IdentityFromObject(s)
 }
 
 func (s *Service) SetPolicies(policies []Policy) {
@@ -71,8 +71,8 @@ func (p *ServicePort) GroupVersionKind() schema.GroupVersionKind {
 
 func (p *ServicePort) SetGroupVersionKind(schema.GroupVersionKind) {}
 
-func (p *ServicePort) GetURL() string {
-	return namespacedSectionName(UrlFromObject(p.Service), gwapiv1.SectionName(p.Name))
+func (p *ServicePort) GetIdentity() string {
+	return namespacedSectionName(IdentityFromObject(p.Service), gwapiv1.SectionName(p.Name))
 }
 
 func (p *ServicePort) GetNamespace() string {

diff --git a/machinery/gateway_api_test_helper.go b/machinery/gateway_api_test_helper.go
@@ -539,8 +539,8 @@ type TestPolicySpec struct {
 
 var _ Policy = &TestPolicy{}
 
-func (p *TestPolicy) GetURL() string {
-	return UrlFromObject(p)
+func (p *TestPolicy) GetIdentity() string {
+	return IdentityFromObject(p)
 }
 
 func (p *TestPolicy) GetTargetRefs() []PolicyTargetReference {

diff --git a/machinery/gateway_api_topology.go b/machinery/gateway_api_topology.go
@@ -638,15 +638,15 @@ func findListenerFromParentRefFunc(gateways []*Gateway, listeners []*Listener, r
 		}
 		if parentRef.SectionName != nil {
 			listener, ok := lo.Find(listeners, func(l *Listener) bool {
-				return l.Gateway.GetURL() == gateway.GetURL() && l.Name == *parentRef.SectionName
+				return l.Gateway.GetIdentity() == gateway.GetIdentity() && l.Name == *parentRef.SectionName
 			})
 			if !ok {
 				return nil
 			}
 			return []Object{listener}
 		}
 		return lo.FilterMap(listeners, func(l *Listener, _ int) (Object, bool) {
-			return l, l.Gateway.GetURL() == gateway.GetURL()
+			return l, l.Gateway.GetIdentity() == gateway.GetIdentity()
 		})
 	}
 }