tag = "type" is the best

oxidecomputer · Apr 20, 2022 · 6b0a10f · 6b0a10f
1 parent 3b516c4
commit 6b0a10f
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 55 deletions.
diff --git a/nexus/src/external_api/params.rs b/nexus/src/external_api/params.rs
@@ -345,6 +345,7 @@ impl JsonSchema for BlockSize {
 
 /// Different sources for a disk
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
+#[serde(tag = "type")]
 pub enum DiskSource {
     /// Create a blank disk
     Blank {

diff --git a/openapi/nexus.json b/openapi/nexus.json
@@ -4940,93 +4940,85 @@
             "description": "Create a blank disk",
             "type": "object",
             "properties": {
-              "Blank": {
-                "type": "object",
-                "properties": {
-                  "block_size": {
-                    "description": "size of blocks for this Disk. valid values are: 512, 2048, or 4096",
-                    "allOf": [
-                      {
-                        "$ref": "#/components/schemas/BlockSize"
-                      }
-                    ]
+              "block_size": {
+                "description": "size of blocks for this Disk. valid values are: 512, 2048, or 4096",
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/BlockSize"
                   }
-                },
-                "required": [
-                  "block_size"
+                ]
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "Blank"
                 ]
               }
             },
             "required": [
-              "Blank"
-            ],
-            "additionalProperties": false
+              "block_size",
+              "type"
+            ]
           },
           {
             "description": "Create a disk from a disk snapshot",
             "type": "object",
             "properties": {
-              "Snapshot": {
-                "type": "object",
-                "properties": {
-                  "snapshot_id": {
-                    "type": "string",
-                    "format": "uuid"
-                  }
-                },
-                "required": [
-                  "snapshot_id"
+              "snapshot_id": {
+                "type": "string",
+                "format": "uuid"
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "Snapshot"
                 ]
               }
             },
             "required": [
-              "Snapshot"
-            ],
-            "additionalProperties": false
+              "snapshot_id",
+              "type"
+            ]
           },
           {
             "description": "Create a disk from a project image",
             "type": "object",
             "properties": {
-              "Image": {
-                "type": "object",
-                "properties": {
-                  "image_id": {
-                    "type": "string",
-                    "format": "uuid"
-                  }
-                },
-                "required": [
-                  "image_id"
+              "image_id": {
+                "type": "string",
+                "format": "uuid"
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "Image"
                 ]
               }
             },
             "required": [
-              "Image"
-            ],
-            "additionalProperties": false
+              "image_id",
+              "type"
+            ]
           },
           {
             "description": "Create a disk from a global image",
             "type": "object",
             "properties": {
-              "GlobalImage": {
-                "type": "object",
-                "properties": {
-                  "image_id": {
-                    "type": "string",
-                    "format": "uuid"
-                  }
-                },
-                "required": [
-                  "image_id"
+              "image_id": {
+                "type": "string",
+                "format": "uuid"
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "GlobalImage"
                 ]
               }
             },
             "required": [
-              "GlobalImage"
-            ],
-            "additionalProperties": false
+              "image_id",
+              "type"
+            ]
           }
         ]
       },