Update dropshot and openapiv3 deps

The json specification generated by the updated openapiv3 is ordered
slightly differently, but not in a way that matters to anything but
"brute force" diff checks like expectorate.  This updates the dependency
and applies the reordering to the recorded OpenAPI specs.

internal-dns/tests/output/test-server.json

@@ -33,18 +33,6 @@
     }
   },
   "components": {
-    "responses": {
-      "Error": {
-        "description": "Error",
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/Error"
-            }
-          }
-        }
-      }
-    },
     "schemas": {
       "Error": {
         "description": "Error information from a response.",
@@ -65,6 +53,18 @@
           "request_id"
         ]
       }
+    },
+    "responses": {
+      "Error": {
+        "description": "Error",
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/Error"
+            }
+          }
+        }
+      }
     }
   }
 }

nexus/src/bin/nexus.rs

@@ -27,6 +27,7 @@ struct Args {
         short = 'O',
         long = "openapi",
         help = "Print the external OpenAPI Spec document and exit",
+        conflicts_with = "openapi_internal",
         action
     )]
     openapi: bool,
@@ -40,7 +41,7 @@ struct Args {
     openapi_internal: bool,
 
     #[clap(name = "CONFIG_FILE_PATH", action)]
-    config_file_path: PathBuf,
+    config_file_path: Option<PathBuf>,
 }
 
 #[tokio::main]
@@ -53,14 +54,25 @@ async fn main() {
 async fn do_run() -> Result<(), CmdError> {
     let args = Args::parse();
 
-    let config = Config::from_file(args.config_file_path)
-        .map_err(|e| CmdError::Failure(anyhow!(e)))?;
-
     if args.openapi {
         run_openapi_external().map_err(|err| CmdError::Failure(anyhow!(err)))
     } else if args.openapi_internal {
         run_openapi_internal().map_err(|err| CmdError::Failure(anyhow!(err)))
     } else {
+        let config_path = match args.config_file_path {
+            Some(path) => path,
+            None => {
+                use clap::CommandFactory;
+
+                eprintln!("{}", Args::command().render_help());
+                return Err(CmdError::Usage(
+                    "CONFIG_FILE_PATH is required".to_string(),
+                ));
+            }
+        };
+        let config = Config::from_file(config_path)
+            .map_err(|e| CmdError::Failure(anyhow!(e)))?;
+
         run_server(&config).await.map_err(|err| CmdError::Failure(anyhow!(err)))
     }
 }

nexus/tests/output/cmd-nexus-noargs-stderr

@@ -1,6 +1,13 @@
-error: the following required arguments were not provided:
-  <CONFIG_FILE_PATH>
+See README.adoc for more information
 
-Usage: nexus <CONFIG_FILE_PATH>
+Usage: nexus [OPTIONS] [CONFIG_FILE_PATH]
 
-For more information, try '--help'.
+Arguments:
+  [CONFIG_FILE_PATH]  
+
+Options:
+  -O, --openapi           Print the external OpenAPI Spec document and exit
+  -I, --openapi-internal  Print the internal OpenAPI Spec document and exit
+  -h, --help              Print help
+
+nexus: CONFIG_FILE_PATH is required

openapi/bootstrap-agent.json

@@ -160,18 +160,6 @@
     }
   },
   "components": {
-    "responses": {
-      "Error": {
-        "description": "Error",
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/Error"
-            }
-          }
-        }
-      }
-    },
     "schemas": {
       "Baseboard": {
         "description": "Describes properties that should uniquely identify a Gimlet.",
@@ -977,6 +965,18 @@
         "description": "Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. Names cannot be a UUID though they may contain a UUID.",
         "type": "string"
       }
+    },
+    "responses": {
+      "Error": {
+        "description": "Error",
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/Error"
+            }
+          }
+        }
+      }
     }
   }
 }

openapi/dns-server.json

@@ -54,18 +54,6 @@
     }
   },
   "components": {
-    "responses": {
-      "Error": {
-        "description": "Error",
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/Error"
-            }
-          }
-        }
-      }
-    },
     "schemas": {
       "DnsConfig": {
         "type": "object",
@@ -251,6 +239,18 @@
           "weight"
         ]
       }
+    },
+    "responses": {
+      "Error": {
+        "description": "Error",
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/Error"
+            }
+          }
+        }
+      }
     }
   }
 }