update for DropshotConfig::request_body_max_bytes

Author: ahl

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "rust-analyzer.rustfmt.overrideCommand": [
+    "rustup",
+    "run",
+    "nightly-2020-06-02",
+    "rustfmt"
+  ]
+}

Cargo.lock

@@ -13,7 +13,7 @@ futures = "0.3.1"
 http = "0.2.0"
 dropshot = { git = "https://github.com/oxidecomputer/dropshot" }
 hyper = "0.13"
-schemars = { version = "0.7", features = [ "chrono", "uuid" ] }
+schemars = { version = "0.8", features = [ "chrono", "uuid" ] }
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 tokio = { version = "0.2", features = [ "full" ] }

Cargo.toml

@@ -336,6 +336,11 @@ the **external** API (i.e., the one that operators and developers using the
 Oxide rack will use).  In general, servers can bind to more than one IP address
 and port, but this is not (yet?) supported.
 
+|`dropshot_external.request_body_max_bytes`
+|`1000`
+|Yes
+|Specifies the maximum request body size for the **external** API.
+
 |`dropshot_internal`
 |
 |Yes
@@ -351,6 +356,11 @@ the **internal** API (i.e., the one used by the sled agent).  In general,
 servers can bind to more than one IP address and port, but this is not (yet?)
 supported.
 
+|`dropshot_internal.request_body_max_bytes`
+|`1000`
+|Yes
+|Specifies the maximum request body size for the **internal** API.
+
 |`log`
 |
 |Yes

README.adoc

@@ -5,10 +5,12 @@
 [dropshot_external]
 # IP address and TCP port on which to listen for the external API
 bind_address = "127.0.0.1:12220"
+request_body_max_bytes = 1024
 
 [dropshot_internal]
 # IP address and TCP port on which to listen for the internal API
 bind_address = "127.0.0.1:12221"
+request_body_max_bytes = 1024
 
 [log]
 # Show log messages of this level and more severe

examples/config-file.toml

@@ -5,10 +5,12 @@
 [dropshot_external]
 # IP address and TCP port on which to listen for the external API
 bind_address = "127.0.0.1:12220"
+request_body_max_bytes = 1024
 
 [dropshot_internal]
 # IP address and TCP port on which to listen for the internal API
 bind_address = "127.0.0.1:12221"
+request_body_max_bytes = 1024
 
 [log]
 # Show log messages of this level and more severe

examples/config.toml

@@ -80,8 +80,10 @@ async fn do_run() -> Result<(), CmdError> {
         id: sa_id,
         sim_mode,
         controller_address: controller_addr,
-        dropshot: ConfigDropshot {
-            bind_address: sa_addr,
+        dropshot: {
+            let mut c = ConfigDropshot::default();
+            c.bind_address = sa_addr;
+            c
         },
         log: ConfigLogging::StderrTerminal {
             level: ConfigLoggingLevel::Info,

src/bin/sled_agent.rs

@@ -207,8 +207,10 @@ mod test {
             r##"
             [dropshot_external]
             bind_address = "10.1.2.3:4567"
+            request_body_max_bytes = 1024
             [dropshot_internal]
             bind_address = "10.1.2.3:4568"
+            request_body_max_bytes = 1024
             [log]
             mode = "file"
             level = "debug"
@@ -217,12 +219,17 @@ mod test {
             "##,
         )
         .unwrap();
+
         assert_eq!(config, ConfigController {
-            dropshot_external: ConfigDropshot {
-                bind_address: "10.1.2.3:4567".parse::<SocketAddr>().unwrap(),
+            dropshot_external: {
+                let mut c = ConfigDropshot::default();
+                c.bind_address = "10.1.2.3:4567".parse::<SocketAddr>().unwrap();
+                c
             },
-            dropshot_internal: ConfigDropshot {
-                bind_address: "10.1.2.3:4568".parse::<SocketAddr>().unwrap(),
+            dropshot_internal: {
+                let mut c = ConfigDropshot::default();
+                c.bind_address = "10.1.2.3:4568".parse::<SocketAddr>().unwrap();
+                c
             },
             log: ConfigLogging::File {
                 level: ConfigLoggingLevel::Debug,

src/oxide_controller/config.rs

@@ -103,8 +103,10 @@ pub async fn start_sled_agent(
         id,
         sim_mode: SimMode::Explicit,
         controller_address,
-        dropshot: ConfigDropshot {
-            bind_address: SocketAddr::new("127.0.0.1".parse().unwrap(), 0),
+        dropshot: {
+            let mut c = ConfigDropshot::default();
+            c.bind_address = SocketAddr::new("127.0.0.1".parse().unwrap(), 0);
+            c
         },
         /* TODO-cleanup this is unused */
         log: ConfigLogging::StderrTerminal {

tests/common/mod.rs

@@ -9,6 +9,7 @@
 #
 [dropshot_external]
 bind_address = "127.0.0.1:0"
+request_body_max_bytes = 1024
 
 #
 # NOTE: for the test suite, the port MUST be 0 (in order to bind to any
@@ -17,6 +18,7 @@ bind_address = "127.0.0.1:0"
 #
 [dropshot_internal]
 bind_address = "127.0.0.1:0"
+request_body_max_bytes = 1024
 
 #
 # NOTE: for the test suite, if mode = "file", the file path MUST be the sentinel