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

Jump to bottom

Various bugfixes #46

Merged
merged 2 commits into from
Feb 4, 2024
Merged

Various bugfixes #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01308d3
Various bugfixes
rukai Feb 2, 2024
6b086b7
Merge branch 'main' into bug_fixes
conorbros Feb 4, 2024
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
37 changes: 20 additions & 17 deletions aws-throwaway/src/backend/cli/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ impl Aws {
let result: SecurityGroup = run_command(&command).await.unwrap();
tracing::info!("created security group");

let mut futures = FuturesUnordered::<Pin<Box<dyn Future<Output = ()>>>>::new();
let mut futures =
FuturesUnordered::<Pin<Box<dyn Future<Output = ()> + Send>>>::new();
futures.push(Box::pin(Aws::create_ingress_rule_internal(tags, name)));
if !ports.contains(&22) {
// SSH
Expand Down Expand Up @@ -505,13 +506,14 @@ impl Aws {
struct ElasticIp {
#[serde(alias = "PublicIp")]
public_ip: String,
#[serde(alias = "AllocationId")]
allocation_id: String,
}
let result: ElasticIp = run_command(&[
"ec2",
"allocate-address",
"--tag-specifications",
&self.tags.create_tags("elastic-Ip", "aws-throwaway"),
&self.tags.create_tags("elastic-ip", "aws-throwaway"),
])
.await
.unwrap();
Expand Down Expand Up @@ -576,7 +578,7 @@ impl Aws {
"AvailabilityZone={AZ},GroupName={}",
self.placement_group_name
);
let user_data = base64::engine::general_purpose::STANDARD.encode(format!(
let user_data = format!(
r#"#!/bin/bash
sudo systemctl stop ssh
echo "{}" > /etc/ssh/ssh_host_ed25519_key.pub
Expand All @@ -586,7 +588,8 @@ echo "ClientAliveInterval 30" >> /etc/ssh/sshd_config
sudo systemctl start ssh
"#,
self.host_public_key, self.host_private_key
));
);
let user_data = base64::engine::general_purpose::STANDARD.encode(user_data);
let block_device_mappings = format!(
"DeviceName=/dev/sda1,Ebs={{DeleteOnTermination=true,VolumeSize={},VolumeType=gp2}}",
definition.volume_size_gb
Expand All @@ -612,7 +615,7 @@ sudo systemctl start ssh
"--block-device-mappings",
&block_device_mappings,
];
let value;
let mut value = vec![];
if definition.network_interface_count == 1 {
command.push("--subnet-id");
command.push(&self.subnet_id);
Expand All @@ -621,18 +624,18 @@ sudo systemctl start ssh
command.push("--security-group-ids");
command.push(&self.security_group_id);
} else {
command.push("--networking-interfaces");
value = (0..definition.network_interface_count)
.map(|i| {
format!(
"DeleteOnTermination=true,AssociatePublicIpAddress=false,DeviceIndex={i},Groups={},SubnetId={},Description={i}",
&self.security_group_id,
&self.subnet_id
)
})
.collect::<Vec<_>>()
.join(",");
command.push(&value);
command.push("--network-interfaces");
for i in 0..definition.network_interface_count {
value.push(format!(
"DeleteOnTermination=true,AssociatePublicIpAddress=false,DeviceIndex={i},Groups={},SubnetId={},Description={i}",
&self.security_group_id,
&self.subnet_id
));
}
// lifetimes workaround
for value in &value {
command.push(value)
}
}

let result: RunInstancesResponse = run_command(&command).await.unwrap();
Expand Down
3 changes: 2 additions & 1 deletion aws-throwaway/src/backend/sdk/aws.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ impl Aws {
.unwrap();
tracing::info!("created security group");

let mut futures = FuturesUnordered::<Pin<Box<dyn Future<Output = ()>>>>::new();
let mut futures =
FuturesUnordered::<Pin<Box<dyn Future<Output = ()> + Send>>>::new();
futures.push(Box::pin(Aws::create_ingress_rule_internal(
client, tags, name,
)));
Expand Down
Loading