add translator context method, remove unused function

Signed-off-by: kkk777-7 <[email protected]>

Author: kkk777-7

internal/gatewayapi/contexts.go

@@ -18,6 +18,7 @@ import (
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
 	"github.com/envoyproxy/gateway/internal/gatewayapi/resource"
 	"github.com/envoyproxy/gateway/internal/ir"
+	"github.com/envoyproxy/gateway/internal/utils"
 )
 
 // GatewayContext wraps a Gateway and provides helper methods for
@@ -672,3 +673,11 @@ func (t *TranslatorContext) GetService(namespace, name string) *corev1.Service {
 	}
 	return nil
 }
+
+func (t *TranslatorContext) SetServices(svcs []*corev1.Service) {
+	serviceMap := make(map[types.NamespacedName]*corev1.Service, len(svcs))
+	for _, svc := range svcs {
+		serviceMap[utils.NamespacedName(svc)] = svc
+	}
+	t.ServiceMap = serviceMap
+}

internal/gatewayapi/listener_test.go

@@ -846,8 +846,8 @@ func TestProcessTracingServiceName(t *testing.T) {
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			translator := &Translator{}
+			translatorContext := &TranslatorContext{}
 			resources := &resource.Resources{}
-			translatorContext := translator.buildTranslatorContext(resources)
 
 			// Mock service to resolve BackendRefs
 			resources.Services = append(resources.Services,
@@ -896,6 +896,7 @@ func TestProcessTracingServiceName(t *testing.T) {
 					},
 				},
 			)
+			translatorContext.SetServices(resources.Services)
 
 			result, err := translator.processTracing(translatorContext, tc.gateway, tc.envoyProxy, tc.mergeGateways, resources)
 

internal/gatewayapi/resource/resource.go

@@ -113,16 +113,6 @@ func (r *Resources) GetEnvoyProxy(namespace, name string) *egv1a1.EnvoyProxy {
 	return nil
 }
 
-// GetService returns the Service with the given namespace and name.
-func (r *Resources) GetService(namespace, name string) *corev1.Service {
-	for _, svc := range r.Services {
-		if svc.Namespace == namespace && svc.Name == name {
-			return svc
-		}
-	}
-	return nil
-}
-
 // GetServiceByLabels returns the Service matching the given labels and namespace target.
 func (r *Resources) GetServiceByLabels(labels map[string]string, namespace string) *corev1.Service {
 	for _, svc := range r.Services {

internal/gatewayapi/securitypolicy_test.go

@@ -879,6 +879,7 @@ func hasParentFalseCondition(p *egv1a1.SecurityPolicy) bool {
 // --- TCP branch: validateSecurityPolicyForTCP(...) returns err -> SetTranslationErrorForPolicyAncestors(...) + return
 func Test_SecurityPolicy_TCP_Invalid_setsStatus_and_returns(t *testing.T) {
 	tr := &Translator{GatewayControllerName: "gateway.envoyproxy.io/gatewayclass-controller"}
+	trContext := &TranslatorContext{}
 
 	// Create an invalid TCP policy (has CORS which is not allowed for TCP)
 	policy := sp("default", "bad-tcp")
@@ -936,10 +937,10 @@ func Test_SecurityPolicy_TCP_Invalid_setsStatus_and_returns(t *testing.T) {
 	gatewayRouteMap := make(map[string]map[string]sets.Set[string])
 	resources := resource.NewResources()
 	xdsIR := make(resource.XdsIRMap)
-	translatorContext := tr.buildTranslatorContext(resources)
+	trContext.SetServices(resources.Services)
 
 	// Process the policy - this should set error status
-	tr.processSecurityPolicyForRoute(translatorContext, resources, xdsIR, routeMap, gatewayRouteMap, policy, target)
+	tr.processSecurityPolicyForRoute(trContext, resources, xdsIR, routeMap, gatewayRouteMap, policy, target)
 
 	// Assert that the policy has a False condition (error was set)
 	require.True(t, hasParentFalseCondition(policy))
@@ -948,6 +949,7 @@ func Test_SecurityPolicy_TCP_Invalid_setsStatus_and_returns(t *testing.T) {
 // --- non-TCP branch: malformed CIDR should return err -> SetTranslationErrorForPolicyAncestors(...) + return
 func Test_SecurityPolicy_HTTP_Invalid_setsStatus_and_returns(t *testing.T) {
 	tr := &Translator{GatewayControllerName: "gateway.envoyproxy.io/gatewayclass-controller"}
+	trContext := &TranslatorContext{}
 
 	// Create an invalid HTTP policy (malformed CIDR)
 	policy := sp("default", "bad-http")
@@ -1011,10 +1013,10 @@ func Test_SecurityPolicy_HTTP_Invalid_setsStatus_and_returns(t *testing.T) {
 	gatewayRouteMap := make(map[string]map[string]sets.Set[string])
 	resources := resource.NewResources()
 	xdsIR := make(resource.XdsIRMap)
-	translatorContext := tr.buildTranslatorContext(resources)
+	trContext.SetServices(resources.Services)
 
 	// Process the policy - this should set error status
-	tr.processSecurityPolicyForRoute(translatorContext, resources, xdsIR, routeMap, gatewayRouteMap, policy, target)
+	tr.processSecurityPolicyForRoute(trContext, resources, xdsIR, routeMap, gatewayRouteMap, policy, target)
 
 	// Assert that the policy has a False condition (error was set)
 	require.True(t, hasParentFalseCondition(policy))

internal/gatewayapi/translator.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 
 	"golang.org/x/exp/maps"
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
@@ -221,7 +220,8 @@ func newTranslateResult(
 func (t *Translator) Translate(resources *resource.Resources) (*TranslateResult, error) {
 	var errs error
 
-	translatorContext := t.buildTranslatorContext(resources)
+	translatorContext := &TranslatorContext{}
+	translatorContext.SetServices(resources.Services)
 
 	// Get Gateways belonging to our GatewayClass.
 	acceptedGateways, failedGateways := t.GetRelevantGateways(resources)
@@ -333,16 +333,6 @@ func (t *Translator) Translate(resources *resource.Resources) (*TranslateResult,
 		extServerPolicies, backends, xdsIR, infraIR), errs
 }
 
-func (t *Translator) buildTranslatorContext(resource *resource.Resources) *TranslatorContext {
-	serviceMap := make(map[types.NamespacedName]*corev1.Service, len(resource.Services))
-	for _, svc := range resource.Services {
-		serviceMap[utils.NamespacedName(svc)] = svc
-	}
-	return &TranslatorContext{
-		ServiceMap: serviceMap,
-	}
-}
-
 // GetRelevantGateways returns GatewayContexts, containing a copy of the original
 // Gateway with the Listener statuses reset.
 func (t *Translator) GetRelevantGateways(resources *resource.Resources) (