Skip to content

Commit 594aea6

Browse files
committed
fix: apply clippy suggestions
1 parent da8c2be commit 594aea6

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/cloud/digitalocean.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ impl Provisioner for DigitalOceanProvisioner {
159159
)
160160
})?;
161161

162-
let droplet = api.get_droplet_async(&droplet_id).await?;
162+
let droplet = api.get_droplet_async(droplet_id).await?;
163163

164164
let mut status = status.clone();
165165

src/cloud/linode.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl Provisioner for LinodeProvisioner {
103103

104104
debug!("Instance status: {:?}", instance.status);
105105

106-
if instance.ipv4.len() > 0 {
106+
if !instance.ipv4.is_empty() {
107107
break instance.ipv4[0].clone();
108108
} else {
109109
warn!("Waiting for instance to get IP address");
@@ -171,7 +171,7 @@ impl Provisioner for LinodeProvisioner {
171171
Ok(status)
172172
} else {
173173
warn!("No instance status found, creating new instance");
174-
return Ok(self.create_exit_node(auth.clone(), exit_node).await?);
174+
return self.create_exit_node(auth.clone(), exit_node).await;
175175
}
176176
}
177177
}

src/daemon.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ async fn reconcile_nodes(obj: Arc<ExitNode>, ctx: Arc<Context>) -> Result<Action
560560
let secret = old_provisioner
561561
.find_secret()
562562
.await
563-
.or_else(|_| Err(crate::error::ReconcileError::CloudProvisionerSecretNotFound))?
563+
.map_err(|_| crate::error::ReconcileError::CloudProvisionerSecretNotFound)?
564564
.ok_or(ReconcileError::CloudProvisionerSecretNotFound)?;
565565

566566
old_provisioner_api
@@ -602,7 +602,7 @@ async fn reconcile_nodes(obj: Arc<ExitNode>, ctx: Arc<Context>) -> Result<Action
602602
let secret = provisioner
603603
.find_secret()
604604
.await
605-
.or_else(|_| Err(crate::error::ReconcileError::CloudProvisionerSecretNotFound))?
605+
.map_err(|_| crate::error::ReconcileError::CloudProvisionerSecretNotFound)?
606606
.ok_or(ReconcileError::CloudProvisionerSecretNotFound)?;
607607
finalizer::finalizer(
608608
&exit_nodes.clone(),

src/deployment.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,11 @@ pub fn generate_tunnel_args(svc: &Service) -> Result<Vec<String>, ReconcileError
114114
.iter()
115115
.map(|p| {
116116
format!(
117-
"{}:{}:{}:{}",
117+
"{}:{}:{}.{}:{}",
118118
target_ip,
119-
p.port.to_string(),
120-
format!("{}.{}", service_name, service_namespace),
119+
p.port,
120+
service_name,
121+
service_namespace,
121122
convert_service_port(p.clone())
122123
)
123124
})
@@ -223,7 +224,6 @@ pub async fn create_pod_template(
223224
}],
224225
..Default::default()
225226
}),
226-
..Default::default()
227227
})
228228
}
229229

0 commit comments

Comments
 (0)