and again

doc/api/garage-admin-v2.json

@@ -3922,23 +3922,26 @@
             }
           },
           {
-            "allOf": [
+            "$ref": "#/components/schemas/NodeRoleUpdate"
-              {
+          }
-                "$ref": "#/components/schemas/NodeAssignedRole"
+        ]
-              },
+      },
-              {
+      "NodeRoleUpdate": {
-                "type": "object",
+        "allOf": [
-                "required": [
+          {
-                  "id"
+            "$ref": "#/components/schemas/NodeAssignedRole"
-                ],
+          },
-                "properties": {
+          {
-                  "id": {
+            "type": "object",
-                    "type": "string",
+            "required": [
-                    "description": "ID of the node for which this change applies"
+              "id"
-                  }
+            ],
-                }
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "ID of the node for which this change applies"
               }
-            ]
+            }
           }
         ]
       },
@@ -4350,43 +4353,39 @@
       "WorkerStateResp": {
         "oneOf": [
           {
-            "type": "string",
+            "$ref": "#/components/schemas/Yolo"
-            "enum": [
+	  },
-              "busy"
-            ]
-          },
           {
+            "$ref": "#/components/schemas/WorkerStateRespStrs"
+	  }
+        ]
+      },
+      "Yolo": {
+        "type": "object",
+        "required": [
+          "throttled"
+        ],
+        "properties": {
+          "throttled": {
             "type": "object",
             "required": [
-              "throttled"
+              "durationSecs"
             ],
             "properties": {
-              "throttled": {
+              "durationSecs": {
-                "type": "object",
+                "type": "number",
-                "required": [
+                "format": "float"
-                  "durationSecs"
-                ],
-                "properties": {
-                  "durationSecs": {
-                    "type": "number",
-                    "format": "float"
-                  }
-                }
               }
             }
-          },
-          {
-            "type": "string",
-            "enum": [
-              "idle"
-            ]
-          },
-          {
-            "type": "string",
-            "enum": [
-              "done"
-            ]
           }
+        }
+      },
+      "WorkerStateRespStrs": {
+        "type": "string",
+        "enum": [
+          "busy",
+          "idle",
+          "done"
         ]
       },
       "ZoneRedundancy": {

src/api/admin/openapi.rs

@@ -293,13 +293,16 @@ pub enum NodeRoleChangeOpenapi {
 		/// Set `remove` to `true` to remove the node from the layout
 		remove: bool,
 	},
-	#[serde(rename_all = "camelCase")]
+	Update(NodeRoleUpdate),
-	Update {
+}
-		/// ID of the node for which this change applies
+
-		id: String,
+#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
-		#[serde(flatten)]
+#[serde(rename_all = "camelCase")]
-		role: NodeAssignedRole,
+pub struct NodeRoleUpdate {
-	},
+	/// ID of the node for which this change applies
+	id: String,
+	#[serde(flatten)]
+	role: NodeAssignedRole,
 }
 
 #[utoipa::path(post,