spiretf/dispenser
1
0
Fork 0
mirror of https://codeberg.org/spire/dispenser.git synced 2026-06-03 18:14:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

ignore key name when comparing

Browse source
This commit is contained in:
Robin Appelman 2023-03-09 23:12:17 +01:00
commit 9e9d8a364f
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/cloud/digitalocean.rs
View file

@ -1,4 +1,6 @@
use crate::cloud::{Cloud, CloudError, Created, NetworkError, ResponseError, Result, Server}; use crate::cloud::{
key_cmp, Cloud, CloudError, Created, NetworkError, ResponseError, Result, Server,
};
use crate::CreatedAuth; use crate::CreatedAuth;
use async_trait::async_trait; use async_trait::async_trait;
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
@ -13,6 +15,7 @@ use std::time::Duration;
use thrussh_keys::key::KeyPair; use thrussh_keys::key::KeyPair;
use thrussh_keys::PublicKeyBase64; use thrussh_keys::PublicKeyBase64;
use tokio::time::sleep; use tokio::time::sleep;
use tracing::{debug, info, instrument};
pub struct DigitalOcean { pub struct DigitalOcean {
region: String, region: String,
@ -55,6 +58,7 @@ impl Cloud for DigitalOcean {
.collect()) .collect())
} }
#[instrument(skip(self, ssh_keys))]
async fn spawn(&self, ssh_keys: &[String]) -> Result<Created> { async fn spawn(&self, ssh_keys: &[String]) -> Result<Created> {
let startup_key = Arc::new(KeyPair::generate_ed25519().unwrap()); let startup_key = Arc::new(KeyPair::generate_ed25519().unwrap());
let startup_key_id = self let startup_key_id = self
@ -151,6 +155,7 @@ impl DigitalOcean {
Ok(response.droplet) Ok(response.droplet)
} }
#[instrument(skip(self))]
async fn get_ssh_key_id(&self, ssh_key: &str) -> Result<u32> { async fn get_ssh_key_id(&self, ssh_key: &str) -> Result<u32> {
let response = self let response = self
.client .client
@ -172,14 +177,17 @@ impl DigitalOcean {
if let Some(key) = response if let Some(key) = response
.ssh_keys .ssh_keys
.into_iter() .into_iter()
.find(|key| key.public_key == ssh_key) .find(|key| key_cmp(&key.public_key, ssh_key))
{ {
debug!(id = key.id, "key found");
Ok(key.id) Ok(key.id)
} else { } else {
info!("key doesn't exist, creating");
self.create_key("Dispenser Key", ssh_key).await self.create_key("Dispenser Key", ssh_key).await
} }
} }
#[instrument(skip(self))]
async fn create_key(&self, name: &str, ssh_key: &str) -> Result<u32> { async fn create_key(&self, name: &str, ssh_key: &str) -> Result<u32> {
let response = self let response = self
.client .client
@ -200,6 +208,7 @@ impl DigitalOcean {
Ok(response.ssh_key.id) Ok(response.ssh_key.id)
} }
#[instrument(skip(self))]
async fn remove_key(&self, key_id: u32) -> Result<()> { async fn remove_key(&self, key_id: u32) -> Result<()> {
let response = self let response = self
.client .client

8
src/cloud/mod.rs
View file

@ -102,3 +102,11 @@ impl Display for CreatedAuth {
} }
} }
} }
fn key_cmp(a: &str, b: &str) -> bool {
let mut a_parts = a.split(' ');
let mut b_parts = b.split(' ');
// compare the first 2 space-seperated parts
a_parts.next() == b_parts.next() && a_parts.next() == b_parts.next()
}

4
src/cloud/vultr.rs
View file

@ -1,5 +1,5 @@
use crate::cloud::{ use crate::cloud::{
Cloud, CloudError, Created, CreatedAuth, NetworkError, ResponseError, Result, Server, key_cmp, Cloud, CloudError, Created, CreatedAuth, NetworkError, ResponseError, Result, Server,
}; };
use async_trait::async_trait; use async_trait::async_trait;
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
@ -164,7 +164,7 @@ impl Vultr {
if let Some(key) = response if let Some(key) = response
.ssh_keys .ssh_keys
.into_iter() .into_iter()
.find(|key| key.ssh_key == ssh_key) .find(|key| key_cmp(&key.ssh_key, ssh_key))
{ {
Ok(key.id) Ok(key.id)
} else { } else {