Fix tool step type in vMCP CRD (#2608)

* Fix tool step type in vMCP CRD

The actual type is `type: "tool"` not `tool_call`.

```
pkg/vmcp/composer/composer.go:	// StepTypeTool executes a backend tool.
pkg/vmcp/composer/composer.go:	StepTypeTool StepType = "tool"
```

So this fixes this erroneous reference.

Signed-off-by: Juan Antonio Osorio <[email protected]>

* bump chart

Signed-off-by: Juan Antonio Osorio <[email protected]>

* Fix chainsaw tests

Signed-off-by: Juan Antonio Osorio <[email protected]>

---------

Signed-off-by: Juan Antonio Osorio <[email protected]>

Author: JAORMX

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

@@ -233,12 +233,12 @@ func (*VirtualMCPCompositeToolDefinition) validateStepType(index int, step Workf
 		WorkflowStepTypeElicitation: true,
 	}
 	if !validTypes[stepType] {
-		return fmt.Errorf("spec.steps[%d].type must be one of: tool_call, elicitation", index)
+		return fmt.Errorf("spec.steps[%d].type must be one of: tool, elicitation", index)
 	}
 
 	if stepType == WorkflowStepTypeToolCall {
 		if step.Tool == "" {
-			return fmt.Errorf("spec.steps[%d].tool is required when type is tool_call", index)
+			return fmt.Errorf("spec.steps[%d].tool is required when type is tool", index)
 		}
 		if !isValidToolReference(step.Tool) {
 			return fmt.Errorf("spec.steps[%d].tool must be in format 'workload.tool_name'", index)

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

@@ -171,7 +171,7 @@ func TestVirtualMCPCompositeToolDefinitionValidate(t *testing.T) {
 			errMsg:  "spec.steps[0].id is required",
 		},
 		{
-			name: "missing tool for tool_call step",
+			name: "missing tool for tool step",
 			ctd: &VirtualMCPCompositeToolDefinition{
 				Spec: VirtualMCPCompositeToolDefinitionSpec{
 					Name:        "deploy_app",
@@ -186,7 +186,7 @@ func TestVirtualMCPCompositeToolDefinitionValidate(t *testing.T) {
 				},
 			},
 			wantErr: true,
-			errMsg:  "spec.steps[0].tool is required when type is tool_call",
+			errMsg:  "spec.steps[0].tool is required when type is tool",
 		},
 		{
 			name: "invalid tool reference format",

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

@@ -226,14 +226,14 @@ type WorkflowStep struct {
 	// +kubebuilder:validation:Required
 	ID string `json:"id"`
 
-	// Type is the step type (tool_call, elicitation, etc.)
-	// +kubebuilder:validation:Enum=tool_call;elicitation
-	// +kubebuilder:default=tool_call
+	// Type is the step type (tool, elicitation, etc.)
+	// +kubebuilder:validation:Enum=tool;elicitation
+	// +kubebuilder:default=tool
 	// +optional
 	Type string `json:"type,omitempty"`
 
 	// Tool is the tool to call (format: "workload.tool_name")
-	// Only used when Type is "tool_call"
+	// Only used when Type is "tool"
 	// +optional
 	Tool string `json:"tool,omitempty"`
 
@@ -505,7 +505,7 @@ const (
 // Workflow step types
 const (
 	// WorkflowStepTypeToolCall calls a backend tool
-	WorkflowStepTypeToolCall = "tool_call"
+	WorkflowStepTypeToolCall = "tool"
 
 	// WorkflowStepTypeElicitation requests user input
 	WorkflowStepTypeElicitation = "elicitation"

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

@@ -283,7 +283,7 @@ func validateCompositeToolStep(
 // validateStepType validates the step type and type-specific requirements
 func validateStepType(toolIndex, stepIndex int, step WorkflowStep) error {
 	if step.Type != "" && step.Type != WorkflowStepTypeToolCall && step.Type != WorkflowStepTypeElicitation {
-		return fmt.Errorf("spec.compositeTools[%d].steps[%d].type must be tool_call or elicitation", toolIndex, stepIndex)
+		return fmt.Errorf("spec.compositeTools[%d].steps[%d].type must be tool or elicitation", toolIndex, stepIndex)
 	}
 
 	stepType := step.Type
@@ -292,7 +292,7 @@ func validateStepType(toolIndex, stepIndex int, step WorkflowStep) error {
 	}
 
 	if stepType == WorkflowStepTypeToolCall && step.Tool == "" {
-		return fmt.Errorf("spec.compositeTools[%d].steps[%d].tool is required when type is tool_call", toolIndex, stepIndex)
+		return fmt.Errorf("spec.compositeTools[%d].steps[%d].tool is required when type is tool", toolIndex, stepIndex)
 	}
 
 	if stepType == WorkflowStepTypeElicitation && step.Message == "" {

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

@@ -306,7 +306,7 @@ func TestVirtualMCPServerValidate(t *testing.T) {
 			errMsg:  "spec.compositeTools[0].steps[0].id is required",
 		},
 		{
-			name: "invalid composite tool - tool_call step without tool",
+			name: "invalid composite tool - tool step without tool",
 			vmcp: &VirtualMCPServer{
 				Spec: VirtualMCPServerSpec{
 					GroupRef: GroupRef{Name: "test-group"},
@@ -325,7 +325,7 @@ func TestVirtualMCPServerValidate(t *testing.T) {
 				},
 			},
 			wantErr: true,
-			errMsg:  "spec.compositeTools[0].steps[0].tool is required when type is tool_call",
+			errMsg:  "spec.compositeTools[0].steps[0].tool is required when type is tool",
 		},
 		{
 			name: "invalid composite tool - elicitation step without message",

deploy/charts/operator-crds/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: toolhive-operator-crds
 description: A Helm chart for installing the ToolHive Operator CRDs into Kubernetes.
 type: application
-version: 0.0.56
+version: 0.0.57
 appVersion: "0.0.1"

deploy/charts/operator-crds/README.md

@@ -1,7 +1,7 @@
 
 # ToolHive Operator CRDs Helm Chart
 
-![Version: 0.0.56](https://img.shields.io/badge/Version-0.0.56-informational?style=flat-square)
+![Version: 0.0.57](https://img.shields.io/badge/Version-0.0.57-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for installing the ToolHive Operator CRDs into Kubernetes.

deploy/charts/operator-crds/crds/toolhive.stacklok.dev_virtualmcpcompositetooldefinitions.yaml

@@ -179,14 +179,13 @@ spec:
                     tool:
                       description: |-
                         Tool is the tool to call (format: "workload.tool_name")
-                        Only used when Type is "tool_call"
+                        Only used when Type is "tool"
                       type: string
                     type:
-                      default: tool_call
-                      description: Type is the step type (tool_call, elicitation,
-                        etc.)
+                      default: tool
+                      description: Type is the step type (tool, elicitation, etc.)
                       enum:
-                      - tool_call
+                      - tool
                       - elicitation
                       type: string
                   required:

deploy/charts/operator-crds/crds/toolhive.stacklok.dev_virtualmcpservers.yaml

@@ -265,14 +265,14 @@ spec:
                           tool:
                             description: |-
                               Tool is the tool to call (format: "workload.tool_name")
-                              Only used when Type is "tool_call"
+                              Only used when Type is "tool"
                             type: string
                           type:
-                            default: tool_call
-                            description: Type is the step type (tool_call, elicitation,
+                            default: tool
+                            description: Type is the step type (tool, elicitation,
                               etc.)
                             enum:
-                            - tool_call
+                            - tool
                             - elicitation
                             type: string
                         required: