Skip to content

Commit 2c0e18c

Browse files
committed
run cargo fmt
1 parent b563d45 commit 2c0e18c

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

src/cloud/cloud_init.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,7 @@ fn test_generate_cloud_init_config() {
3939
let config = generate_cloud_init_config(password, 9090);
4040
println!("{}", config);
4141
assert!(config.contains("AUTH=chisel:test"));
42-
assert!(config.contains("ExecStart=/usr/local/bin/chisel server --port=9090 --reverse --auth chisel:test"));
42+
assert!(config.contains(
43+
"ExecStart=/usr/local/bin/chisel server --port=9090 --reverse --auth chisel:test"
44+
));
4345
}

src/cloud/digitalocean.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ impl Provisioner for DigitalOceanProvisioner {
6363
exit_node: ExitNode,
6464
node_password: String,
6565
) -> color_eyre::Result<ExitNodeStatus> {
66-
6766
let config = generate_cloud_init_config(&node_password, exit_node.spec.port);
6867

6968
// TODO: Secret reference, not plaintext

src/cloud/linode.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ impl Provisioner for LinodeProvisioner {
8383
);
8484

8585
// Since we now directly pass in the chisel auth string with the `chisel:` prefix, let's remove the prefix
86-
let root_password = chisel_auth_string.strip_prefix("chisel:").unwrap_or(&chisel_auth_string);
86+
let root_password = chisel_auth_string
87+
.strip_prefix("chisel:")
88+
.unwrap_or(&chisel_auth_string);
8789

8890
let mut instance = api
8991
.create_instance(&self.region, &self.size)
@@ -179,7 +181,9 @@ impl Provisioner for LinodeProvisioner {
179181
Ok(status)
180182
} else {
181183
warn!("No instance status found, creating new instance");
182-
return self.create_exit_node(auth.clone(), exit_node, node_password).await;
184+
return self
185+
.create_exit_node(auth.clone(), exit_node, node_password)
186+
.await;
183187
}
184188
}
185189
}

src/daemon.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,12 +633,20 @@ async fn reconcile_nodes(obj: Arc<ExitNode>, ctx: Arc<Context>) -> Result<Action
633633
let cloud_resource = if let Some(_status) = node.status.as_ref() {
634634
info!("Updating cloud resource for {}", node.name_any());
635635
provisioner_api
636-
.update_exit_node(api_key_secret.clone(), (*node).clone(), node_password)
636+
.update_exit_node(
637+
api_key_secret.clone(),
638+
(*node).clone(),
639+
node_password,
640+
)
637641
.await?
638642
} else {
639643
info!("Creating cloud resource for {}", node.name_any());
640644
provisioner_api
641-
.create_exit_node(api_key_secret.clone(), (*node).clone(), node_password)
645+
.create_exit_node(
646+
api_key_secret.clone(),
647+
(*node).clone(),
648+
node_password,
649+
)
642650
.await?
643651
};
644652

0 commit comments

Comments
 (0)