update endpoint is a PUT on the resource, add unauthorized coverage

Author: iximeow

nexus/external-api/output/nexus_tags.txt

@@ -62,7 +62,7 @@ instance_serial_console_stream           GET      /v1/instances/{instance}/seria
 instance_ssh_public_key_list             GET      /v1/instances/{instance}/ssh-public-keys
 instance_start                           POST     /v1/instances/{instance}/start
 instance_stop                            POST     /v1/instances/{instance}/stop
-instance_update                          PUT      /v1/instances/{instance}/update
+instance_update                          PUT      /v1/instances/{instance}
 instance_view                            GET      /v1/instances/{instance}
 
 API operations found with tag "login"

nexus/external-api/src/lib.rs

@@ -1120,7 +1120,7 @@ pub trait NexusExternalApi {
     /// Update instance
     #[endpoint {
         method = PUT,
-        path = "/v1/instances/{instance}/update",
+        path = "/v1/instances/{instance}",
         tags = ["instances"],
     }]
     async fn instance_update(

nexus/tests/integration_tests/endpoints.rs

@@ -432,6 +432,8 @@ pub static DEMO_INSTANCE_CREATE: Lazy<params::InstanceCreate> =
         boot_device: None,
         start: true,
     });
+pub static DEMO_INSTANCE_UPDATE: Lazy<params::InstanceUpdate> =
+    Lazy::new(|| params::InstanceUpdate { boot_device: None });
 
 // The instance needs a network interface, too.
 pub static DEMO_INSTANCE_NIC_NAME: Lazy<Name> =
@@ -1797,6 +1799,9 @@ pub static VERIFY_ENDPOINTS: Lazy<Vec<VerifyEndpoint>> = Lazy::new(|| {
             allowed_methods: vec![
                 AllowedMethod::Get,
                 AllowedMethod::Delete,
+                AllowedMethod::Put(
+                    serde_json::to_value(&*DEMO_INSTANCE_UPDATE).unwrap()
+                ),
             ],
         },
 

nexus/tests/integration_tests/instances.rs

@@ -3881,8 +3881,7 @@ async fn test_cannot_detach_boot_device(cptestctx: &ControlPlaneTestContext) {
     assert_eq!(err.message, "boot disk cannot be detached");
 
     // Change the instance's boot disk.
-    let url_instance_update =
-        format!("/v1/instances/{}/update", instance.identity.id);
+    let url_instance_update = format!("/v1/instances/{}", instance.identity.id);
 
     let builder =
         RequestBuilder::new(client, http::Method::PUT, &url_instance_update)
@@ -3983,8 +3982,7 @@ async fn test_boot_device_can_be_changed(cptestctx: &ControlPlaneTestContext) {
     assert_eq!(instance.boot_device_id, Some(disks[0].identity.id.clone()));
 
     // Change the instance's boot disk.
-    let url_instance_update =
-        format!("/v1/instances/{}/update", instance.identity.id);
+    let url_instance_update = format!("/v1/instances/{}", instance.identity.id);
 
     let builder =
         RequestBuilder::new(client, http::Method::PUT, &url_instance_update)
@@ -4060,8 +4058,7 @@ async fn test_boot_device_must_be_attached(
 
     // Update the instance's boot device to the unattached disk. This should
     // fail.
-    let url_instance_update =
-        format!("/v1/instances/{}/update", instance.identity.id);
+    let url_instance_update = format!("/v1/instances/{}", instance.identity.id);
 
     let builder =
         RequestBuilder::new(client, http::Method::PUT, &url_instance_update)

openapi/nexus.json

@@ -1949,6 +1949,50 @@
             "$ref": "#/components/responses/Error"
           }
         }
+      },
+      "put": {
+        "tags": [
+          "instances"
+        ],
+        "summary": "Update instance configuration",
+        "operationId": "instance_update",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "project",
+            "description": "Name or ID of the project",
+            "schema": {
+              "$ref": "#/components/schemas/NameOrId"
+            }
+          },
+          {
+            "in": "path",
+            "name": "instance",
+            "description": "Name or ID of the instance",
+            "required": true,
+            "schema": {
+              "$ref": "#/components/schemas/NameOrId"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Instance"
+                }
+              }
+            }
+          },
+          "4XX": {
+            "$ref": "#/components/responses/Error"
+          },
+          "5XX": {
+            "$ref": "#/components/responses/Error"
+          }
+        }
       }
     },
     "/v1/instances/{instance}/disks": {
@@ -2622,52 +2666,6 @@
         }
       }
     },
-    "/v1/instances/{instance}/update": {
-      "put": {
-        "tags": [
-          "instances"
-        ],
-        "summary": "Update instance configuration",
-        "operationId": "instance_update",
-        "parameters": [
-          {
-            "in": "query",
-            "name": "project",
-            "description": "Name or ID of the project",
-            "schema": {
-              "$ref": "#/components/schemas/NameOrId"
-            }
-          },
-          {
-            "in": "path",
-            "name": "instance",
-            "description": "Name or ID of the instance",
-            "required": true,
-            "schema": {
-              "$ref": "#/components/schemas/NameOrId"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Instance"
-                }
-              }
-            }
-          },
-          "4XX": {
-            "$ref": "#/components/responses/Error"
-          },
-          "5XX": {
-            "$ref": "#/components/responses/Error"
-          }
-        }
-      }
-    },
     "/v1/ip-pools": {
       "get": {
         "tags": [