Remove download changes, add bind arg to client_benchmark

Signed-off-by: Daniel Carl Jones <[email protected]>

mountpoint-s3-client/examples/client_benchmark.rs

@@ -89,6 +89,12 @@ enum Client {
         key: String,
         #[arg(long, help = "AWS region", default_value = "us-east-1")]
         region: String,
+        #[clap(
+            long,
+            help = "One or more network interfaces to use when accessing S3. Requires Linux 5.7+ or running as root.",
+            value_name = "NETWORK_INTERFACE"
+        )]
+        bind: Option<Vec<String>>,
     },
     #[command(about = "Download a key from a mock S3 server")]
     Mock {
@@ -122,9 +128,17 @@ fn main() {
     let args = CliArgs::parse();
 
     match args.client {
-        Client::Real { bucket, key, region } => {
+        Client::Real {
+            bucket,
+            key,
+            region,
+            bind,
+        } => {
             let mut config = S3ClientConfig::new().endpoint_config(EndpointConfig::new(&region));
             config = config.throughput_target_gbps(args.throughput_target_gbps);
+            if let Some(interfaces) = &bind {
+                config = config.network_interface_names(interfaces.clone());
+            }
             config = config.part_size(args.part_size);
             let client = S3CrtClient::new(config).expect("couldn't create client");
 

mountpoint-s3-client/examples/download.rs

@@ -43,22 +43,6 @@ pub struct CliArgs {
         value_parser = parse_range,
     )]
     pub range: Option<Range<u64>>,
-
-    #[arg(
-        long,
-        help = "Configure S3 client's desired throughput in Gbps",
-        default_value_t = 10.0,
-        visible_alias = "maximum-throughput-gbps",
-        value_name = "GBPS"
-    )]
-    throughput_target_gbps: f64,
-
-    #[clap(
-        long,
-        help = "One or more network interfaces to use when accessing S3. Requires Linux 5.7+ or running as root.",
-        value_name = "NETWORK_INTERFACE"
-    )]
-    pub bind: Option<Vec<String>>,
 }
 
 /// Empty error type, since we don't care too much for an example.
@@ -96,15 +80,8 @@ fn main() {
     let region = &args.region;
     let range = args.range;
 
-    let mut config = S3ClientConfig::new();
-
-    config = config.endpoint_config(EndpointConfig::new(region));
-    config = config.throughput_target_gbps(args.throughput_target_gbps);
-    if let Some(interfaces) = &args.bind {
-        config = config.network_interface_names(interfaces.clone());
-    }
-
-    let client = S3CrtClient::new(config).expect("couldn't create client");
+    let client = S3CrtClient::new(S3ClientConfig::new().endpoint_config(EndpointConfig::new(region)))
+        .expect("couldn't create client");
 
     let last_offset = Arc::new(Mutex::new(None));
     let last_offset_clone = Arc::clone(&last_offset);