Skip to content

Commit cc4cebc

Browse files
ChrisJBurnsclaude
andcommitted
Add WorkloadKind constants to replace string literals
Define WorkloadKindMCPServer, WorkloadKindVirtualMCPServer, and WorkloadKindMCPRemoteProxy constants in the API types and use them across all controllers. This fixes a goconst lint violation where "MCPServer" appeared as a raw string literal 4+ times. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 2cb9a59 commit cc4cebc

8 files changed

Lines changed: 18 additions & 11 deletions

File tree

cmd/thv-operator/api/v1alpha1/mcpoidcconfig_types.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,13 @@ type InlineOIDCSharedConfig struct {
144144
InsecureAllowHTTP bool `json:"insecureAllowHTTP"`
145145
}
146146

147+
// Well-known WorkloadReference Kind values.
148+
const (
149+
WorkloadKindMCPServer = "MCPServer"
150+
WorkloadKindVirtualMCPServer = "VirtualMCPServer"
151+
WorkloadKindMCPRemoteProxy = "MCPRemoteProxy"
152+
)
153+
147154
// WorkloadReference identifies a workload that references a shared configuration resource.
148155
// Namespace is implicit — cross-namespace references are not supported.
149156
type WorkloadReference struct {

cmd/thv-operator/controllers/mcpexternalauthconfig_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func (r *MCPExternalAuthConfigReconciler) handleConfigHashChange(
157157
// Update the status with the list of referencing workloads
158158
refs := make([]mcpv1alpha1.WorkloadReference, 0, len(referencingServers))
159159
for _, server := range referencingServers {
160-
refs = append(refs, mcpv1alpha1.WorkloadReference{Kind: "MCPServer", Name: server.Name})
160+
refs = append(refs, mcpv1alpha1.WorkloadReference{Kind: mcpv1alpha1.WorkloadKindMCPServer, Name: server.Name})
161161
}
162162
ctrlutil.SortWorkloadRefs(refs)
163163
externalAuthConfig.Status.ReferencingWorkloads = refs
@@ -306,7 +306,7 @@ func (r *MCPExternalAuthConfigReconciler) SetupWithManager(mgr ctrl.Manager) err
306306
continue
307307
}
308308
for _, ref := range cfg.Status.ReferencingWorkloads {
309-
if ref.Kind == "MCPServer" && ref.Name == server.Name {
309+
if ref.Kind == mcpv1alpha1.WorkloadKindMCPServer && ref.Name == server.Name {
310310
requests = append(requests, reconcile.Request{NamespacedName: nn})
311311
break
312312
}

cmd/thv-operator/controllers/mcpoidcconfig_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func (r *MCPOIDCConfigReconciler) findReferencingWorkloads(
226226
if vmcp.Spec.IncomingAuth != nil &&
227227
vmcp.Spec.IncomingAuth.OIDCConfigRef != nil &&
228228
vmcp.Spec.IncomingAuth.OIDCConfigRef.Name == oidcConfig.Name {
229-
refs = append(refs, mcpv1alpha1.WorkloadReference{Kind: "VirtualMCPServer", Name: vmcp.Name})
229+
refs = append(refs, mcpv1alpha1.WorkloadReference{Kind: mcpv1alpha1.WorkloadKindVirtualMCPServer, Name: vmcp.Name})
230230
}
231231
}
232232

@@ -275,7 +275,7 @@ func (r *MCPOIDCConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
275275
continue
276276
}
277277
for _, ref := range cfg.Status.ReferencingWorkloads {
278-
if ref.Kind == "MCPServer" && ref.Name == server.Name {
278+
if ref.Kind == mcpv1alpha1.WorkloadKindMCPServer && ref.Name == server.Name {
279279
requests = append(requests, reconcile.Request{NamespacedName: nn})
280280
break
281281
}
@@ -333,7 +333,7 @@ func (r *MCPOIDCConfigReconciler) mapVirtualMCPServerToOIDCConfig(
333333
continue
334334
}
335335
for _, ref := range cfg.Status.ReferencingWorkloads {
336-
if ref.Kind == "VirtualMCPServer" && ref.Name == vmcp.Name {
336+
if ref.Kind == mcpv1alpha1.WorkloadKindVirtualMCPServer && ref.Name == vmcp.Name {
337337
requests = append(requests, reconcile.Request{NamespacedName: nn})
338338
break
339339
}

cmd/thv-operator/controllers/mcpserver_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2132,7 +2132,7 @@ func (r *MCPServerReconciler) updateOIDCConfigReferencingWorkloads(
21322132
serverName string,
21332133
) error {
21342134
ref := mcpv1alpha1.WorkloadReference{
2135-
Kind: "MCPServer",
2135+
Kind: mcpv1alpha1.WorkloadKindMCPServer,
21362136
Name: serverName,
21372137
}
21382138

cmd/thv-operator/controllers/mcptelemetryconfig_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func (r *MCPTelemetryConfigReconciler) SetupWithManager(mgr ctrl.Manager) error
179179
continue
180180
}
181181
for _, ref := range cfg.Status.ReferencingWorkloads {
182-
if ref.Kind == "MCPServer" && ref.Name == server.Name {
182+
if ref.Kind == mcpv1alpha1.WorkloadKindMCPServer && ref.Name == server.Name {
183183
requests = append(requests, reconcile.Request{NamespacedName: nn})
184184
break
185185
}

cmd/thv-operator/controllers/toolconfig_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func (r *ToolConfigReconciler) handleConfigHashChange(
143143
// Update the status with the list of referencing workloads
144144
refs := make([]mcpv1alpha1.WorkloadReference, 0, len(referencingServers))
145145
for _, server := range referencingServers {
146-
refs = append(refs, mcpv1alpha1.WorkloadReference{Kind: "MCPServer", Name: server.Name})
146+
refs = append(refs, mcpv1alpha1.WorkloadReference{Kind: mcpv1alpha1.WorkloadKindMCPServer, Name: server.Name})
147147
}
148148
ctrlutil.SortWorkloadRefs(refs)
149149
toolConfig.Status.ReferencingWorkloads = refs
@@ -293,7 +293,7 @@ func (r *ToolConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
293293
continue
294294
}
295295
for _, ref := range cfg.Status.ReferencingWorkloads {
296-
if ref.Kind == "MCPServer" && ref.Name == server.Name {
296+
if ref.Kind == mcpv1alpha1.WorkloadKindMCPServer && ref.Name == server.Name {
297297
requests = append(requests, reconcile.Request{NamespacedName: nn})
298298
break
299299
}

cmd/thv-operator/controllers/virtualmcpserver_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2824,7 +2824,7 @@ func (r *VirtualMCPServerReconciler) updateOIDCConfigReferencingWorkloads(
28242824
oidcConfig *mcpv1alpha1.MCPOIDCConfig,
28252825
vmcpName string,
28262826
) error {
2827-
ref := mcpv1alpha1.WorkloadReference{Kind: "VirtualMCPServer", Name: vmcpName}
2827+
ref := mcpv1alpha1.WorkloadReference{Kind: mcpv1alpha1.WorkloadKindVirtualMCPServer, Name: vmcpName}
28282828
// Check if already listed
28292829
for _, entry := range oidcConfig.Status.ReferencingWorkloads {
28302830
if entry.Kind == ref.Kind && entry.Name == ref.Name {

cmd/thv-operator/pkg/controllerutil/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func FindWorkloadRefsFromMCPServers(
114114
}
115115
refs := make([]mcpv1alpha1.WorkloadReference, 0, len(servers))
116116
for _, server := range servers {
117-
refs = append(refs, mcpv1alpha1.WorkloadReference{Kind: "MCPServer", Name: server.Name})
117+
refs = append(refs, mcpv1alpha1.WorkloadReference{Kind: mcpv1alpha1.WorkloadKindMCPServer, Name: server.Name})
118118
}
119119
SortWorkloadRefs(refs)
120120
return refs, nil

0 commit comments

Comments
 (0)