fix: align MCP server with PR #1417 review changes

Remove Safe field from Interaction type and all test assertions.
Cast ReadWriteMode to string in configmap parser.
Update all test ConfigMap YAML fixtures to remove safe: fields.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jajajhhz

pkg/deviceapi/api_test.go

@@ -103,18 +103,15 @@ func newTestDeploymentAndConfigMap() []runtime.Object {
 				"instructions": `instructions:
   get_temperature:
     readWrite: R
-    safe: true
     description: |
       GET /get_temperature
       Response: {"temperature": 36.5, "unit": "celsius"}
   set_unit:
     readWrite: W
-    safe: false
     description: |
       POST /set_unit {"unit": "fahrenheit"}
   status:
     readWrite: R
-    safe: true
 `,
 			},
 		},
@@ -185,13 +182,11 @@ func newTestDeploymentAndConfigMap() []runtime.Object {
 				"instructions": `instructions:
   move_joint:
     readWrite: W
-    safe: false
     description: |
       Move a specific joint to a target angle.
       Topic: robot-arm/commands/move_joint
   joint_positions:
     readWrite: R
-    safe: true
     description: |
       Real-time joint positions.
       Topic: robot-arm/status/joint_positions
@@ -264,15 +259,11 @@ func TestGetDeviceDesc(t *testing.T) {
 	getTemp, ok := interactionMap["get_temperature"]
 	require.True(t, ok, "get_temperature interaction should exist")
 	assert.Equal(t, "R", getTemp.ReadWrite)
-	assert.NotNil(t, getTemp.Safe)
-	assert.True(t, *getTemp.Safe)
 	assert.Contains(t, getTemp.Description, "GET /get_temperature")
 
 	setUnit, ok := interactionMap["set_unit"]
 	require.True(t, ok, "set_unit interaction should exist")
 	assert.Equal(t, "W", setUnit.ReadWrite)
-	assert.NotNil(t, setUnit.Safe)
-	assert.False(t, *setUnit.Safe)
 }
 
 func TestGetDeviceDescNotFound(t *testing.T) {
@@ -307,14 +298,10 @@ func TestGetDeviceDescRobotArm(t *testing.T) {
 	moveJoint, ok := interactionMap["move_joint"]
 	require.True(t, ok)
 	assert.Equal(t, "W", moveJoint.ReadWrite)
-	assert.NotNil(t, moveJoint.Safe)
-	assert.False(t, *moveJoint.Safe)
 
 	jointPos, ok := interactionMap["joint_positions"]
 	require.True(t, ok)
 	assert.Equal(t, "R", jointPos.ReadWrite)
-	assert.NotNil(t, jointPos.Safe)
-	assert.True(t, *jointPos.Safe)
 }
 
 func TestListDevicesNoDevices(t *testing.T) {

pkg/deviceapi/configmap.go

@@ -27,8 +27,7 @@ func parseInstructionsFromConfigMap(cm *corev1.ConfigMap) ([]Interaction, error)
 		interaction := Interaction{Name: name}
 		if instr != nil {
 			interaction.Description = strings.TrimSpace(instr.Description)
-			interaction.ReadWrite = instr.ReadWrite
-			interaction.Safe = instr.Safe
+			interaction.ReadWrite = string(instr.ReadWrite)
 		}
 		interactions = append(interactions, interaction)
 	}

pkg/deviceapi/resolver_test.go

@@ -19,13 +19,11 @@ func TestParseInstructionsFromConfigMap(t *testing.T) {
 			"instructions": `instructions:
   read_temp:
     readWrite: R
-    safe: true
     description: |
       GET /read_temp
       Returns temperature in Celsius.
   write_config:
     readWrite: W
-    safe: false
     description: |
       POST /write_config with JSON body.
   legacy_instruction:
@@ -44,19 +42,14 @@ func TestParseInstructionsFromConfigMap(t *testing.T) {
 
 	readTemp := interactionMap["read_temp"]
 	assert.Equal(t, "R", readTemp.ReadWrite)
-	assert.NotNil(t, readTemp.Safe)
-	assert.True(t, *readTemp.Safe)
 	assert.Contains(t, readTemp.Description, "GET /read_temp")
 
 	writeConfig := interactionMap["write_config"]
 	assert.Equal(t, "W", writeConfig.ReadWrite)
-	assert.NotNil(t, writeConfig.Safe)
-	assert.False(t, *writeConfig.Safe)
 
 	// Legacy instruction without extended fields.
 	legacy := interactionMap["legacy_instruction"]
 	assert.Equal(t, "", legacy.ReadWrite)
-	assert.Nil(t, legacy.Safe)
 	assert.Equal(t, "", legacy.Description)
 }
 

pkg/deviceapi/types.go

@@ -25,6 +25,5 @@ type DeviceDesc struct {
 type Interaction struct {
 	Name        string `json:"name"`
 	ReadWrite   string `json:"readWrite,omitempty"`
-	Safe        *bool  `json:"safe,omitempty"`
 	Description string `json:"description,omitempty"`
 }

pkg/mcp/server/e2e_spec_test.go

@@ -172,7 +172,6 @@ func specK8sObjects() []runtime.Object {
 				"instructions": `instructions:
   move_joint:
     readWrite: W
-    safe: false
     description: |
       Move a specific joint to a target angle.
       ## Topic
@@ -186,7 +185,6 @@ func specK8sObjects() []runtime.Object {
       - ` + "`speed`" + `: 1-100 (% of max speed)
   gripper:
     readWrite: W
-    safe: false
     description: |
       Open or close the gripper.
       ## Topic
@@ -197,15 +195,13 @@ func specK8sObjects() []runtime.Object {
       ` + "```" + `
   joint_positions:
     readWrite: R
-    safe: true
     description: |
       Real-time joint positions. Subscribe to receive continuous updates.
       ## Topic
       ` + "`robot-arm/status/joint_positions`" + `
       Published every 100ms. Array is [J1..J6] in degrees.
   emergency_stop:
     readWrite: W
-    safe: false
     description: |
       Immediately halt all motion.
       ## Topic
@@ -261,20 +257,17 @@ func specK8sObjects() []runtime.Object {
 				"instructions": `instructions:
   temperature:
     readWrite: R
-    safe: true
     description: |
       Temperature readings. Subject: ` + "`sensors.<node_id>.temperature`" + `
       Wildcard: ` + "`sensors.*.temperature`" + ` for all nodes.
       Published every 5 seconds per node.
   vibration:
     readWrite: R
-    safe: true
     description: |
       Vibration readings. Subject: ` + "`sensors.<node_id>.vibration`" + `
       Values above 0.5g indicate potential failure.
   configure_interval:
     readWrite: W
-    safe: false
     description: |
       Change reporting interval. Uses NATS request/reply.
       Subject: ` + "`sensors.<node_id>.config.interval`" + `
@@ -329,20 +322,17 @@ func specK8sObjects() []runtime.Object {
 				"instructions": `instructions:
   get_temperature:
     readWrite: R
-    safe: true
     description: |
       GET /get_temperature
       Response: {"temperature": 36.5, "unit": "celsius"}
       Updates every 3 seconds.
   set_unit:
     readWrite: W
-    safe: false
     description: |
       POST /set_unit {"unit": "fahrenheit"}
       Response: {"status": "ok", "unit": "fahrenheit"}
   status:
     readWrite: R
-    safe: true
     description: |
       GET /status — returns plain text: ` + "`running`" + ` or ` + "`error: <message>`" + `.
 `,
@@ -466,34 +456,26 @@ func TestE2ESpecRobotArmMQTT(t *testing.T) {
 		interactionMap[intr.Name] = intr
 	}
 
-	// move_joint: W, unsafe, topic info
+	// move_joint: W, topic info
 	moveJoint := interactionMap["move_joint"]
 	assert.Equal(t, "W", moveJoint.ReadWrite)
-	require.NotNil(t, moveJoint.Safe)
-	assert.False(t, *moveJoint.Safe)
 	assert.Contains(t, moveJoint.Description, "robot-arm/commands/move_joint")
 	assert.Contains(t, moveJoint.Description, "joint")
 	assert.Contains(t, moveJoint.Description, "angle")
 
-	// gripper: W, unsafe
+	// gripper: W
 	gripper := interactionMap["gripper"]
 	assert.Equal(t, "W", gripper.ReadWrite)
-	require.NotNil(t, gripper.Safe)
-	assert.False(t, *gripper.Safe)
 	assert.Contains(t, gripper.Description, "robot-arm/commands/gripper")
 
-	// joint_positions: R, safe
+	// joint_positions: R
 	jointPos := interactionMap["joint_positions"]
 	assert.Equal(t, "R", jointPos.ReadWrite)
-	require.NotNil(t, jointPos.Safe)
-	assert.True(t, *jointPos.Safe)
 	assert.Contains(t, jointPos.Description, "robot-arm/status/joint_positions")
 
-	// emergency_stop: W, unsafe
+	// emergency_stop: W
 	eStop := interactionMap["emergency_stop"]
 	assert.Equal(t, "W", eStop.ReadWrite)
-	require.NotNil(t, eStop.Safe)
-	assert.False(t, *eStop.Safe)
 	assert.Contains(t, eStop.Description, "robot-arm/commands/emergency_stop")
 }
 
@@ -536,26 +518,20 @@ func TestE2ESpecSensorArrayNATS(t *testing.T) {
 		interactionMap[intr.Name] = intr
 	}
 
-	// temperature: R, safe, NATS subject pattern
+	// temperature: R, NATS subject pattern
 	temp := interactionMap["temperature"]
 	assert.Equal(t, "R", temp.ReadWrite)
-	require.NotNil(t, temp.Safe)
-	assert.True(t, *temp.Safe)
 	assert.Contains(t, temp.Description, "sensors.")
 	assert.Contains(t, temp.Description, "temperature")
 
-	// vibration: R, safe
+	// vibration: R
 	vib := interactionMap["vibration"]
 	assert.Equal(t, "R", vib.ReadWrite)
-	require.NotNil(t, vib.Safe)
-	assert.True(t, *vib.Safe)
 	assert.Contains(t, vib.Description, "vibration")
 
-	// configure_interval: W, unsafe, request/reply
+	// configure_interval: W, request/reply
 	cfgInterval := interactionMap["configure_interval"]
 	assert.Equal(t, "W", cfgInterval.ReadWrite)
-	require.NotNil(t, cfgInterval.Safe)
-	assert.False(t, *cfgInterval.Safe)
 	assert.Contains(t, cfgInterval.Description, "request/reply")
 }
 
@@ -593,25 +569,19 @@ func TestE2ESpecThermometerHTTP(t *testing.T) {
 		interactionMap[intr.Name] = intr
 	}
 
-	// get_temperature: R, safe, GET endpoint
+	// get_temperature: R, GET endpoint
 	getTemp := interactionMap["get_temperature"]
 	assert.Equal(t, "R", getTemp.ReadWrite)
-	require.NotNil(t, getTemp.Safe)
-	assert.True(t, *getTemp.Safe)
 	assert.Contains(t, getTemp.Description, "GET /get_temperature")
 
-	// set_unit: W, unsafe, POST endpoint
+	// set_unit: W, POST endpoint
 	setUnit := interactionMap["set_unit"]
 	assert.Equal(t, "W", setUnit.ReadWrite)
-	require.NotNil(t, setUnit.Safe)
-	assert.False(t, *setUnit.Safe)
 	assert.Contains(t, setUnit.Description, "POST /set_unit")
 
-	// status: R, safe
+	// status: R
 	status := interactionMap["status"]
 	assert.Equal(t, "R", status.ReadWrite)
-	require.NotNil(t, status.Safe)
-	assert.True(t, *status.Safe)
 	assert.Contains(t, status.Description, "GET /status")
 }
 
@@ -760,7 +730,6 @@ func TestE2ESpecGracefulDegradation(t *testing.T) {
 	for _, intr := range desc.Interactions {
 		interactionNames[intr.Name] = true
 		assert.Equal(t, "", intr.ReadWrite, "legacy instructions have no readWrite")
-		assert.Nil(t, intr.Safe, "legacy instructions have no safe field")
 		assert.Equal(t, "", intr.Description, "legacy instructions have no description")
 	}
 	assert.True(t, interactionNames["read_value"])

pkg/mcp/server/server_test.go

@@ -110,13 +110,11 @@ func testK8sObjects() []runtime.Object {
 				"instructions": `instructions:
   get_temperature:
     readWrite: R
-    safe: true
     description: |
       GET /get_temperature
       Response: {"temperature": 36.5, "unit": "celsius"}
   set_unit:
     readWrite: W
-    safe: false
     description: |
       POST /set_unit {"unit": "fahrenheit"}
 `,
@@ -175,20 +173,17 @@ func testK8sObjects() []runtime.Object {
 				"instructions": `instructions:
   move_joint:
     readWrite: W
-    safe: false
     description: |
       Move a specific joint to a target angle.
       Topic: robot-arm/commands/move_joint
       Message format: {"joint": 1, "angle": 45.0, "speed": 50}
   joint_positions:
     readWrite: R
-    safe: true
     description: |
       Real-time joint positions. Subscribe to receive continuous updates.
       Topic: robot-arm/status/joint_positions
   emergency_stop:
     readWrite: W
-    safe: false
     description: |
       Immediately halt all motion. Publish any message to trigger.
       Topic: robot-arm/commands/emergency_stop
@@ -308,15 +303,11 @@ func TestMCPGetDeviceDescHTTP(t *testing.T) {
 	getTemp, ok := interactionMap["get_temperature"]
 	require.True(t, ok)
 	assert.Equal(t, "R", getTemp.ReadWrite)
-	assert.NotNil(t, getTemp.Safe)
-	assert.True(t, *getTemp.Safe)
 	assert.Contains(t, getTemp.Description, "GET /get_temperature")
 
 	setUnit, ok := interactionMap["set_unit"]
 	require.True(t, ok)
 	assert.Equal(t, "W", setUnit.ReadWrite)
-	assert.NotNil(t, setUnit.Safe)
-	assert.False(t, *setUnit.Safe)
 }
 
 func TestMCPGetDeviceDescMQTT(t *testing.T) {
@@ -346,15 +337,11 @@ func TestMCPGetDeviceDescMQTT(t *testing.T) {
 	moveJoint, ok := interactionMap["move_joint"]
 	require.True(t, ok)
 	assert.Equal(t, "W", moveJoint.ReadWrite)
-	assert.NotNil(t, moveJoint.Safe)
-	assert.False(t, *moveJoint.Safe)
 	assert.Contains(t, moveJoint.Description, "robot-arm/commands/move_joint")
 
 	jointPos, ok := interactionMap["joint_positions"]
 	require.True(t, ok)
 	assert.Equal(t, "R", jointPos.ReadWrite)
-	assert.NotNil(t, jointPos.Safe)
-	assert.True(t, *jointPos.Safe)
 
 	eStop, ok := interactionMap["emergency_stop"]
 	require.True(t, ok)