apply suggestions

Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com>

Author: evacchi

apix/config/v1alpha1/endpointpickerconfig_types.go

@@ -316,10 +316,10 @@ type FlowControlConfig struct {
 	PriorityBands []PriorityBandConfig `json:"priorityBands,omitempty"`
 
 	// +optional
-	// UsageLimitPolicyRef specifies the UsageLimitPolicy plugin to use for adaptive capacity management.
+	// UsageLimitPolicyPluginRef specifies the UsageLimitPolicy plugin to use for adaptive capacity management.
 	// Must reference a named plugin instance defined in the top-level Plugins section.
 	// If omitted, a default static policy (threshold=1.0, no gating) is used.
-	UsageLimitPolicyRef string `json:"usageLimitPolicyRef,omitempty"`
+	UsageLimitPolicyPluginRef string `json:"usageLimitPolicyPluginRef,omitempty"`
 }
 
 func (fcc *FlowControlConfig) String() string {
@@ -346,8 +346,8 @@ func (fcc *FlowControlConfig) String() string {
 		parts = append(parts, fmt.Sprintf("PriorityBands: %v", fcc.PriorityBands))
 	}
 
-	if fcc.UsageLimitPolicyRef != "" {
-		parts = append(parts, "UsageLimitPolicyRef: "+fcc.UsageLimitPolicyRef)
+	if fcc.UsageLimitPolicyPluginRef != "" {
+		parts = append(parts, "UsageLimitPolicyRef: "+fcc.UsageLimitPolicyPluginRef)
 	}
 
 	return "{" + strings.Join(parts, ", ") + "}"

pkg/epp/flowcontrol/config.go

@@ -61,8 +61,8 @@ func NewConfigFromAPI(apiConfig *configapi.FlowControlConfig, handle plugin.Hand
 
 func ensureUsageLimitPolicy(apiConfig *configapi.FlowControlConfig, handle plugin.Handle) (flowcontrol.UsageLimitPolicy, error) {
 	ref := registry.DefaultUsageLimitPolicyRef
-	if apiConfig != nil && apiConfig.UsageLimitPolicyRef != "" {
-		ref = apiConfig.UsageLimitPolicyRef
+	if apiConfig != nil && apiConfig.UsageLimitPolicyPluginRef != "" {
+		ref = apiConfig.UsageLimitPolicyPluginRef
 	}
 	p := handle.Plugin(ref)
 	if p == nil {

pkg/epp/flowcontrol/config_test.go

@@ -108,9 +108,9 @@ func TestNewConfigFromAPI(t *testing.T) {
 			},
 		},
 		{
-			name: "Success - UsageLimitPolicyRef is resolved",
+			name: "Success - UsageLimitPolicyPluginRef is resolved",
 			apiConfig: &configapi.FlowControlConfig{
-				UsageLimitPolicyRef: usagelimits.StaticUsageLimitPolicyType,
+				UsageLimitPolicyPluginRef: usagelimits.StaticUsageLimitPolicyType,
 			},
 			assertion: func(t *testing.T, cfg *Config) {
 				require.NotNil(t, cfg.UsageLimitPolicy, "UsageLimitPolicy should be resolved from the handle")
@@ -121,7 +121,7 @@ func TestNewConfigFromAPI(t *testing.T) {
 		{
 			name: "Success - Func-based UsageLimitPolicy resolved via PluginRef",
 			apiConfig: &configapi.FlowControlConfig{
-				UsageLimitPolicyRef: funcPolicyName,
+				UsageLimitPolicyPluginRef: funcPolicyName,
 			},
 			assertion: func(t *testing.T, cfg *Config) {
 				require.NotNil(t, cfg.UsageLimitPolicy)
@@ -143,7 +143,7 @@ func TestNewConfigFromAPI(t *testing.T) {
 		{
 			name: "Success - Struct-based UsageLimitPolicy resolved via PluginRef",
 			apiConfig: &configapi.FlowControlConfig{
-				UsageLimitPolicyRef: structPolicyName,
+				UsageLimitPolicyPluginRef: structPolicyName,
 			},
 			assertion: func(t *testing.T, cfg *Config) {
 				require.NotNil(t, cfg.UsageLimitPolicy)

pkg/epp/flowcontrol/registry/config.go

@@ -23,7 +23,6 @@ import (
 	"time"
 
 	"k8s.io/apimachinery/pkg/api/resource"
-	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/framework/plugins/flowcontrol/usagelimits"
 
 	configapi "sigs.k8s.io/gateway-api-inference-extension/apix/config/v1alpha1"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/flowcontrol/contracts"
@@ -32,6 +31,7 @@ import (
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/framework/interface/plugin"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/framework/plugins/flowcontrol/fairness"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/framework/plugins/flowcontrol/ordering"
+	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/framework/plugins/flowcontrol/usagelimits"
 )
 
 // --- Defaults ---