Update aws-throwaway (fix build times)

Cargo.toml

@@ -61,7 +61,7 @@ rand_distr = "0.4.1"
 clap = { version = "4.0.4", features = ["cargo", "derive"] }
 async-trait = "0.1.30"
 typetag = "0.2.5"
-aws-throwaway = "0.5.0"
+aws-throwaway = { version = "0.6.0", default-features = false }
 tokio-bin-process = "0.4.0"
 ordered-float = { version = "4.0.0", features = ["serde"] }
 hyper = { version = "0.14.14", features = ["server"] }

ec2-cargo/src/main.rs

@@ -61,7 +61,7 @@ until sudo apt-get update -qq
 do
   sleep 1
 done
-sudo apt-get install -y cmake pkg-config g++ libssl-dev librdkafka-dev uidmap
+sudo apt-get install -y cmake pkg-config g++ libssl-dev librdkafka-dev uidmap unzip
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 curl -sSL https://get.docker.com/ | sudo sh
@@ -73,6 +73,10 @@ sudo /bin/docker1 "$@"
 ' | sudo dd of=/bin/docker
 sudo chmod +x /bin/docker
 
+curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+unzip awscliv2.zip
+./aws/install
+
 echo "export RUST_BACKTRACE=1" >> .profile
 echo "export CARGO_TERM_COLOR=always" >> .profile
 echo 'source "$HOME/.cargo/env"' >> .profile

shotover-proxy/benches/windsock/cloud/mod.rs

@@ -34,6 +34,7 @@ impl Cloud for AwsCloud {
             // AWS is not initialized, it'll be faster to cleanup resources skipping initialization
             None => AwsInstances::cleanup().await,
         }
+        println!("All AWS throwaway resources have been deleted");
     }
 
     async fn create_resources(&mut self, required: Vec<CloudResourcesRequired>) -> CloudResources {

shotover-proxy/benches/windsock/readme.md

@@ -7,6 +7,8 @@ Refer to the windsock docs and `cargo windsock --help` for more flags.
 
 ## Running in AWS
 
+First ensure you have the [AWS CLI V2 installed locally](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html).
+
 ### Aws credentials
 
 Refer to the [aws-sdk docs](https://docs.aws.amazon.com/sdk-for-rust/latest/dg/credentials.html) for full information on credentials.

windsock-cloud-docker/src/container.rs

@@ -28,12 +28,20 @@ impl Container {
             .await;
             container_bash("apt-get update").await;
             container_bash(
-            "DEBIAN_FRONTEND=noninteractive apt-get install -y curl git cmake pkg-config g++ libssl-dev librdkafka-dev uidmap psmisc",
+            "DEBIAN_FRONTEND=noninteractive apt-get install -y curl git cmake pkg-config g++ libssl-dev librdkafka-dev uidmap psmisc unzip",
         ).await;
             container_bash(
                 "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y",
             )
             .await;
+            container_bash(
+                r#"
+curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+unzip awscliv2.zip
+./aws/install
+                "#,
+            )
+            .await;
         } else {
             cleanup().await;
         }