Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix windsock cloud benches #1772

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Fix windsock cloud benches #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 19 additions & 61 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion ec2-cargo/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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};
Expand Down Expand Up @@ -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());
Expand Down
4 changes: 0 additions & 4 deletions shotover-proxy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion shotover-proxy/benches/windsock/cloud/aws.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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};
Expand All @@ -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()
Expand Down
1 change: 0 additions & 1 deletion windsock-cloud-docker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ license = "Apache-2.0"
[dependencies]
shell-quote.workspace = true
tokio.workspace = true
subprocess.workspace = true
Loading