diff options
author | Alex Auvolat <alex@adnab.me> | 2023-04-04 18:48:52 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2023-04-04 18:48:52 +0200 |
commit | b3f76f272abab8695b4406c6f0addcb58253c89d (patch) | |
tree | d7a2dd93548d7c35bab47865c2508b252683f9d3 /src/consul.rs | |
parent | 2d39adcabb898686cb63c10713e9d9b63efc5601 (diff) | |
download | diplonat-b3f76f272abab8695b4406c6f0addcb58253c89d.tar.gz diplonat-b3f76f272abab8695b4406c6f0addcb58253c89d.zip |
Remove .rustfmt.toml and move to standard rustfmt format (4 spaces)
Diffstat (limited to 'src/consul.rs')
-rw-r--r-- | src/consul.rs | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/src/consul.rs b/src/consul.rs index e31033c..7f695b2 100644 --- a/src/consul.rs +++ b/src/consul.rs @@ -7,80 +7,80 @@ use crate::config::RuntimeConfigConsul; #[derive(Serialize, Deserialize, Debug)] pub struct ServiceEntry { - #[serde(rename = "Tags")] - pub tags: Vec<String>, + #[serde(rename = "Tags")] + pub tags: Vec<String>, } #[derive(Serialize, Deserialize, Debug, Default)] pub struct CatalogNode { - #[serde(rename = "Services")] - pub services: HashMap<String, ServiceEntry>, + #[serde(rename = "Services")] + pub services: HashMap<String, ServiceEntry>, } pub struct Consul { - client: reqwest::Client, - url: String, - idx: Option<u64>, + client: reqwest::Client, + url: String, + idx: Option<u64>, } impl Consul { - pub fn new(config: &RuntimeConfigConsul) -> Self { - let client = if let Some((ca, skip_verify, ident)) = config.tls.clone() { - if skip_verify { - reqwest::Client::builder() - .use_rustls_tls() - .danger_accept_invalid_certs(true) - .identity(ident) - .build() - .expect("Unable to build reqwest client") - } else if let Some(ca) = ca { - reqwest::Client::builder() - .use_rustls_tls() - .add_root_certificate(ca) - .identity(ident) - .build() - .expect("Unable to build reqwest client") - } else { - reqwest::Client::builder() - .use_rustls_tls() - .identity(ident) - .build() - .expect("Unable to build reqwest client") - } - } else { - reqwest::Client::new() - }; - return Self { - client, - url: config.url.clone(), - idx: None, - }; - } + pub fn new(config: &RuntimeConfigConsul) -> Self { + let client = if let Some((ca, skip_verify, ident)) = config.tls.clone() { + if skip_verify { + reqwest::Client::builder() + .use_rustls_tls() + .danger_accept_invalid_certs(true) + .identity(ident) + .build() + .expect("Unable to build reqwest client") + } else if let Some(ca) = ca { + reqwest::Client::builder() + .use_rustls_tls() + .add_root_certificate(ca) + .identity(ident) + .build() + .expect("Unable to build reqwest client") + } else { + reqwest::Client::builder() + .use_rustls_tls() + .identity(ident) + .build() + .expect("Unable to build reqwest client") + } + } else { + reqwest::Client::new() + }; + return Self { + client, + url: config.url.clone(), + idx: None, + }; + } - pub fn watch_node_reset(&mut self) -> () { - self.idx = None; - } + pub fn watch_node_reset(&mut self) -> () { + self.idx = None; + } - pub async fn watch_node(&mut self, host: &str) -> Result<CatalogNode> { - let url = match self.idx { - Some(i) => format!("{}/v1/catalog/node/{}?index={}", self.url, host, i), - None => format!("{}/v1/catalog/node/{}", self.url, host), - }; + pub async fn watch_node(&mut self, host: &str) -> Result<CatalogNode> { + let url = match self.idx { + Some(i) => format!("{}/v1/catalog/node/{}?index={}", self.url, host, i), + None => format!("{}/v1/catalog/node/{}", self.url, host), + }; - let http = self.client.get(&url).send().await?; - self.idx = match http.headers().get("X-Consul-Index") { - Some(v) => Some(v.to_str()?.parse::<u64>()?), - None => return Err(anyhow!("X-Consul-Index header not found")), - }; + let http = self.client.get(&url).send().await?; + self.idx = match http.headers().get("X-Consul-Index") { + Some(v) => Some(v.to_str()?.parse::<u64>()?), + None => return Err(anyhow!("X-Consul-Index header not found")), + }; - let resp: Option<CatalogNode> = http.json().await?; - return Ok(resp.unwrap_or_default()); - } + let resp: Option<CatalogNode> = http.json().await?; + return Ok(resp.unwrap_or_default()); + } - pub async fn kv_put(&self, key: &str, bytes: Vec<u8>) -> Result<()> { - let url = format!("{}/v1/kv/{}", self.url, key); - let http = self.client.put(&url).body(bytes).send().await?; - http.error_for_status()?; - Ok(()) - } + pub async fn kv_put(&self, key: &str, bytes: Vec<u8>) -> Result<()> { + let url = format!("{}/v1/kv/{}", self.url, key); + let http = self.client.put(&url).body(bytes).send().await?; + http.error_for_status()?; + Ok(()) + } } |