Merge branch 'main' into refactor_splitting

shotover · Oct 14, 2024 · fad6f6a · fad6f6a
2 parents 9250400 + 5a41409
commit fad6f6a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 68 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ec2-cargo/src/main.rs b/ec2-cargo/src/main.rs
@@ -1,4 +1,6 @@
-use aws_throwaway::{Aws, CleanupResources, Ec2Instance, Ec2InstanceDefinition, InstanceType};
+use aws_throwaway::{
+    Aws, CleanupResources, Ec2Instance, Ec2InstanceDefinition, IngressRestriction, InstanceType,
+};
 use cargo_metadata::{Metadata, MetadataCommand};
 use clap::Parser;
 use shellfish::{async_fn, handler::DefaultAsyncHandler, rustyline::DefaultEditor, Command, Shell};
@@ -47,6 +49,7 @@ async fn main() {
 
     let aws = Aws::builder(CleanupResources::AllResources)
         .use_az(Some("us-east-1b".into()))
+        .use_ingress_restriction(IngressRestriction::LocalPublicAddress)
         .build()
         .await;
     let instance_type = InstanceType::from(args.instance_type.as_str());

diff --git a/shotover-proxy/Cargo.toml b/shotover-proxy/Cargo.toml
@@ -17,10 +17,8 @@ scylla.workspace = true
 anyhow.workspace = true
 tokio.workspace = true
 tracing.workspace = true
-clap.workspace = true
 rstest = "0.22.0"
 rstest_reuse = "0.7.0"
-cassandra-cpp = { version = "3.0.0", default-features = false }
 test-helpers = { path = "../test-helpers" }
 redis.workspace = true
 chacha20poly1305.workspace = true
@@ -30,11 +28,9 @@ uuid.workspace = true
 itertools.workspace = true
 cdrs-tokio.workspace = true
 redis-protocol.workspace = true
-tokio-util.workspace = true
 bincode.workspace = true
 futures.workspace = true
 hex.workspace = true
-hex-literal.workspace = true
 cassandra-protocol.workspace = true
 bytes.workspace = true
 rand.workspace = true

diff --git a/shotover-proxy/benches/windsock/cloud/aws.rs b/shotover-proxy/benches/windsock/cloud/aws.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use aws_throwaway::{Aws, Ec2Instance, InstanceType};
+use aws_throwaway::{Aws, Ec2Instance, IngressRestriction, InstanceType};
 use aws_throwaway::{CleanupResources, Ec2InstanceDefinition};
 use regex::Regex;
 use serde::{Deserialize, Serialize};
@@ -25,6 +25,7 @@ impl AwsInstances {
         AwsInstances {
             aws: Aws::builder(CleanupResources::WithAppTag(AWS_THROWAWAY_TAG.to_owned()))
                 .use_az(Some("us-east-1b".into()))
+                .use_ingress_restriction(IngressRestriction::LocalPublicAddress)
                 // shotover metrics port
                 .expose_ports_to_internet(vec![9001])
                 .build()

diff --git a/windsock-cloud-docker/Cargo.toml b/windsock-cloud-docker/Cargo.toml
@@ -9,4 +9,3 @@ license = "Apache-2.0"
 [dependencies]
 shell-quote.workspace = true
 tokio.workspace = true
-subprocess.workspace = true