Retrieve let's encrypt certificates

1 files changed, 34 insertions, 3 deletions

diff --git a/src/consul.rs b/src/consul.rs
index 0f7d7c1..5ef96c5 100644
--- a/src/consul.rs
+++ b/src/consul.rs
@@ -1,10 +1,10 @@
 use std::collections::HashMap;
 
 use anyhow::Result;
-use log::*;
-use serde::{Deserialize, Serialize};
 use bytes::Bytes;
+use log::*;
 use reqwest::StatusCode;
+use serde::{Deserialize, Serialize};
 
 // ---- Watch and retrieve Consul catalog ----
 
@@ -65,22 +65,53 @@ impl Consul {
 	}
 
 	pub async fn kv_get(&self, key: &str) -> Result<Option<Bytes>> {
+		debug!("kv_get {}", key);
+
 		let url = format!("{}/v1/kv/{}{}?raw", self.url, self.kv_prefix, key);
 		let http = self.client.get(&url).send().await?;
 		match http.status() {
 			StatusCode::OK => Ok(Some(http.bytes().await?)),
 			StatusCode::NOT_FOUND => Ok(None),
-			_ => Err(anyhow!("Consul request failed: {:?}", http.error_for_status())),
+			_ => Err(anyhow!(
+				"Consul request failed: {:?}",
+				http.error_for_status()
+			)),
+		}
+	}
+
+	pub async fn kv_get_json<T: for<'de> Deserialize<'de>>(&self, key: &str) -> Result<Option<T>> {
+		debug!("kv_get_json {}", key);
+
+		let url = format!("{}/v1/kv/{}{}?raw", self.url, self.kv_prefix, key);
+		let http = self.client.get(&url).send().await?;
+		match http.status() {
+			StatusCode::OK => Ok(Some(http.json().await?)),
+			StatusCode::NOT_FOUND => Ok(None),
+			_ => Err(anyhow!(
+				"Consul request failed: {:?}",
+				http.error_for_status()
+			)),
 		}
 	}
 
 	pub async fn kv_put(&self, key: &str, bytes: Bytes) -> Result<()> {
+		debug!("kv_put {}", key);
+
 		let url = format!("{}/v1/kv/{}{}", self.url, self.kv_prefix, key);
 		let http = self.client.put(&url).body(bytes).send().await?;
 		http.error_for_status()?;
 		Ok(())
 	}
 
+	pub async fn kv_put_json<T: Serialize>(&self, key: &str, value: &T) -> Result<()> {
+		debug!("kv_put_json {}", key);
+
+		let url = format!("{}/v1/kv/{}{}", self.url, self.kv_prefix, key);
+		let http = self.client.put(&url).json(value).send().await?;
+		http.error_for_status()?;
+		Ok(())
+	}
+
 	pub async fn kv_delete(&self, key: &str) -> Result<()> {
 		let url = format!("{}/v1/kv/{}{}", self.url, self.kv_prefix, key);
 		let http = self.client.delete(&url).send().await?;