default fix up

Author: ahl

Cargo.lock

@@ -5,12 +5,10 @@
 [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,12 +5,10 @@
 [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,10 +80,9 @@ async fn do_run() -> Result<(), CmdError> {
         id: sa_id,
         sim_mode,
         controller_address: controller_addr,
-        dropshot: {
-            let mut c = ConfigDropshot::default();
-            c.bind_address = sa_addr;
-            c
+        dropshot: ConfigDropshot {
+            bind_address: sa_addr,
+            ..Default::default()
         },
         log: ConfigLogging::StderrTerminal {
             level: ConfigLoggingLevel::Info,

src/bin/sled_agent.rs

@@ -221,15 +221,13 @@ mod test {
         .unwrap();
 
         assert_eq!(config, ConfigController {
-            dropshot_external: {
-                let mut c = ConfigDropshot::default();
-                c.bind_address = "10.1.2.3:4567".parse::<SocketAddr>().unwrap();
-                c
+            dropshot_external: ConfigDropshot {
+                bind_address: "10.1.2.3:4567".parse::<SocketAddr>().unwrap(),
+                ..Default::default()
             },
-            dropshot_internal: {
-                let mut c = ConfigDropshot::default();
-                c.bind_address = "10.1.2.3:4568".parse::<SocketAddr>().unwrap();
-                c
+            dropshot_internal: ConfigDropshot {
+                bind_address: "10.1.2.3:4568".parse::<SocketAddr>().unwrap(),
+                ..Default::default()
             },
             log: ConfigLogging::File {
                 level: ConfigLoggingLevel::Debug,

src/oxide_controller/config.rs

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

tests/common/mod.rs

@@ -9,7 +9,6 @@
 #
 [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
@@ -18,7 +17,6 @@ request_body_max_bytes = 1024
 #
 [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