removed the duplicate rate-limit structs from pkg/vmcp/config

Signed-off-by: Sanskarzz <sanskar.gur@gmail.com>

Author: Sanskarzz

cmd/thv-operator/Taskfile.yml

@@ -168,7 +168,7 @@ tasks:
         platforms: [windows]
         ignore_error: true   # Windows has no mkdir -p, so just ignore error if it exists
       - go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3
-      - $(go env GOPATH)/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./cmd/thv-operator/..." paths="./pkg/json/..." paths="./pkg/vmcp/config/..." paths="./pkg/vmcp/auth/types/..." paths="./pkg/telemetry/..." paths="./pkg/audit/..."
+      - $(go env GOPATH)/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./cmd/thv-operator/..." paths="./pkg/json/..." paths="./pkg/ratelimit/types/..." paths="./pkg/vmcp/config/..." paths="./pkg/vmcp/auth/types/..." paths="./pkg/telemetry/..." paths="./pkg/audit/..."
 
   operator-manifests:
     desc: Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects
@@ -286,6 +286,7 @@ tasks:
     sources:
       - '{{.ROOT_DIR}}/cmd/thv-operator/config/crd/bases/**/*.yaml'
       - '{{.ROOT_DIR}}/cmd/thv-operator/api/**/*.go'
+      - '{{.ROOT_DIR}}/pkg/ratelimit/types/*.go'
       - '{{.ROOT_DIR}}/pkg/vmcp/config/*.go'
       - '{{.ROOT_DIR}}/pkg/vmcp/auth/types/*.go'
       - '{{.ROOT_DIR}}/pkg/telemetry/*.go'

cmd/thv-operator/api/v1beta1/mcpserver_types.go

@@ -7,6 +7,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	ratelimittypes "github.com/stacklok/toolhive/pkg/ratelimit/types"
 )
 
 // Condition types for MCPServer
@@ -373,7 +375,7 @@ type MCPServerSpec struct {
 	// RateLimiting defines rate limiting configuration for the MCP server.
 	// Requires Redis session storage to be configured for distributed rate limiting.
 	// +optional
-	RateLimiting *RateLimitConfig `json:"rateLimiting,omitempty"`
+	RateLimiting *ratelimittypes.RateLimitConfig `json:"rateLimiting,omitempty"`
 }
 
 // ResourceOverrides defines overrides for annotations and labels on created resources
@@ -525,69 +527,17 @@ type SessionStorageConfig struct {
 }
 
 // RateLimitConfig defines rate limiting configuration for an MCP server.
-// At least one of shared, perUser, or tools must be configured.
-//
-// +kubebuilder:validation:XValidation:rule="has(self.shared) || has(self.perUser) || (has(self.tools) && size(self.tools) > 0)",message="at least one of shared, perUser, or tools must be configured"
-//
-//nolint:lll // kubebuilder marker exceeds line length
-type RateLimitConfig struct {
-	// Shared is a token bucket shared across all users for the entire server.
-	// +optional
-	Shared *RateLimitBucket `json:"shared,omitempty" yaml:"shared,omitempty"`
-
-	// PerUser is a token bucket applied independently to each authenticated user
-	// at the server level. Requires authentication to be enabled.
-	// Each unique userID creates Redis keys that expire after 2x refillPeriod.
-	// Memory formula: unique_users_per_TTL_window * (1 + num_tools_with_per_user_limits) keys.
-	// +optional
-	PerUser *RateLimitBucket `json:"perUser,omitempty" yaml:"perUser,omitempty"`
-
-	// Tools defines per-tool rate limit overrides.
-	// Each entry applies additional rate limits to calls targeting a specific tool name.
-	// A request must pass both the server-level limit and the per-tool limit.
-	// +listType=map
-	// +listMapKey=name
-	// +optional
-	Tools []ToolRateLimitConfig `json:"tools,omitempty" yaml:"tools,omitempty"`
-}
+// +gendoc
+type RateLimitConfig = ratelimittypes.RateLimitConfig
 
 // RateLimitBucket defines a token bucket configuration with a maximum capacity
 // and a refill period. Used by both shared and per-user rate limits.
-type RateLimitBucket struct {
-	// MaxTokens is the maximum number of tokens (bucket capacity).
-	// This is also the burst size: the maximum number of requests that can be served
-	// instantaneously before the bucket is depleted.
-	// +kubebuilder:validation:Required
-	// +kubebuilder:validation:Minimum=1
-	MaxTokens int32 `json:"maxTokens" yaml:"maxTokens"`
-
-	// RefillPeriod is the duration to fully refill the bucket from zero to maxTokens.
-	// The effective refill rate is maxTokens / refillPeriod tokens per second.
-	// Format: Go duration string (e.g., "1m0s", "30s", "1h0m0s").
-	// +kubebuilder:validation:Required
-	RefillPeriod metav1.Duration `json:"refillPeriod" yaml:"refillPeriod"`
-}
+// +gendoc
+type RateLimitBucket = ratelimittypes.RateLimitBucket
 
 // ToolRateLimitConfig defines rate limits for a specific tool.
-// At least one of shared or perUser must be configured.
-//
-// +kubebuilder:validation:XValidation:rule="has(self.shared) || has(self.perUser)",message="at least one of shared or perUser must be configured"
-//
-//nolint:lll // kubebuilder marker exceeds line length
-type ToolRateLimitConfig struct {
-	// Name is the MCP tool name this limit applies to.
-	// +kubebuilder:validation:Required
-	// +kubebuilder:validation:MinLength=1
-	Name string `json:"name" yaml:"name"`
-
-	// Shared token bucket for this specific tool.
-	// +optional
-	Shared *RateLimitBucket `json:"shared,omitempty" yaml:"shared,omitempty"`
-
-	// PerUser token bucket configuration for this tool.
-	// +optional
-	PerUser *RateLimitBucket `json:"perUser,omitempty" yaml:"perUser,omitempty"`
-}
+// +gendoc
+type ToolRateLimitConfig = ratelimittypes.ToolRateLimitConfig
 
 // Permission profile types
 const (

cmd/thv-operator/api/v1beta1/mcpserver_types_test.go

@@ -129,16 +129,16 @@ func TestVirtualMCPServerSpecRateLimitingJSONRoundtrip(t *testing.T) {
 			Address:  "redis.default.svc.cluster.local:6379",
 		},
 		Config: vmcpconfig.Config{
-			RateLimiting: &vmcpconfig.RateLimitConfig{
-				Shared: &vmcpconfig.RateLimitBucket{MaxTokens: 10, RefillPeriod: metav1.Duration{Duration: time.Minute}},
-				PerUser: &vmcpconfig.RateLimitBucket{
+			RateLimiting: &RateLimitConfig{
+				Shared: &RateLimitBucket{MaxTokens: 10, RefillPeriod: metav1.Duration{Duration: time.Minute}},
+				PerUser: &RateLimitBucket{
 					MaxTokens:    2,
 					RefillPeriod: metav1.Duration{Duration: time.Minute},
 				},
-				Tools: []vmcpconfig.ToolRateLimitConfig{
+				Tools: []ToolRateLimitConfig{
 					{
 						Name: "backend_a_echo",
-						Shared: &vmcpconfig.RateLimitBucket{
+						Shared: &RateLimitBucket{
 							MaxTokens:    5,
 							RefillPeriod: metav1.Duration{Duration: 30 * time.Second},
 						},

cmd/thv-operator/api/v1beta1/zz_generated.deepcopy.go

@@ -1612,15 +1612,15 @@ func TestConverter_RateLimitingPassThrough(t *testing.T) {
 		Spec: mcpv1beta1.VirtualMCPServerSpec{
 			GroupRef: &mcpv1beta1.MCPGroupRef{Name: "test-group"},
 			Config: vmcpconfig.Config{
-				RateLimiting: &vmcpconfig.RateLimitConfig{
-					PerUser: &vmcpconfig.RateLimitBucket{
+				RateLimiting: &mcpv1beta1.RateLimitConfig{
+					PerUser: &mcpv1beta1.RateLimitBucket{
 						MaxTokens:    2,
 						RefillPeriod: metav1.Duration{Duration: time.Minute},
 					},
-					Tools: []vmcpconfig.ToolRateLimitConfig{
+					Tools: []mcpv1beta1.ToolRateLimitConfig{
 						{
 							Name: "backend_a_echo",
-							Shared: &vmcpconfig.RateLimitBucket{
+							Shared: &mcpv1beta1.RateLimitBucket{
 								MaxTokens:    5,
 								RefillPeriod: metav1.Duration{Duration: 30 * time.Second},
 							},

cmd/thv-operator/pkg/vmcpconfig/converter_test.go

@@ -112,8 +112,8 @@ var _ = Describe("CEL Validation for SessionStorageConfig on VirtualMCPServer",
 		Context("rateLimiting", func() {
 			It("should reject rate limiting without redis session storage", func() {
 				vmcp := newVirtualMCPServerWithSessionStorage("vmcp-rl-no-redis", nil)
-				vmcp.Spec.Config.RateLimiting = &vmcpconfig.RateLimitConfig{
-					Shared: &vmcpconfig.RateLimitBucket{
+				vmcp.Spec.Config.RateLimiting = &mcpv1beta1.RateLimitConfig{
+					Shared: &mcpv1beta1.RateLimitBucket{
 						MaxTokens:    1,
 						RefillPeriod: metav1.Duration{Duration: time.Minute},
 					},
@@ -129,8 +129,8 @@ var _ = Describe("CEL Validation for SessionStorageConfig on VirtualMCPServer",
 					Provider: "redis",
 					Address:  "redis:6379",
 				})
-				vmcp.Spec.Config.RateLimiting = &vmcpconfig.RateLimitConfig{
-					PerUser: &vmcpconfig.RateLimitBucket{
+				vmcp.Spec.Config.RateLimiting = &mcpv1beta1.RateLimitConfig{
+					PerUser: &mcpv1beta1.RateLimitBucket{
 						MaxTokens:    1,
 						RefillPeriod: metav1.Duration{Duration: time.Minute},
 					},
@@ -153,8 +153,8 @@ var _ = Describe("CEL Validation for SessionStorageConfig on VirtualMCPServer",
 						Audience: "test-audience",
 					},
 				}
-				vmcp.Spec.Config.RateLimiting = &vmcpconfig.RateLimitConfig{
-					PerUser: &vmcpconfig.RateLimitBucket{
+				vmcp.Spec.Config.RateLimiting = &mcpv1beta1.RateLimitConfig{
+					PerUser: &mcpv1beta1.RateLimitBucket{
 						MaxTokens:    1,
 						RefillPeriod: metav1.Duration{Duration: time.Minute},
 					},