flake reorg

This commit is contained in:
Robin Appelman 2024-12-14 19:26:31 +01:00
commit 9b6e80d522
11 changed files with 125 additions and 231 deletions

View file

@ -1,14 +1,14 @@
use color_eyre::{eyre::WrapErr, Result};
use serde::{Deserialize, Deserializer};
use std::fs::read_to_string;
use tokio::time::Duration;
use std::collections::HashMap;
use std::convert::{TryFrom, TryInto};
use std::path::Path;
use reqwest::header::{HeaderValue, InvalidHeaderValue};
use secretfile::{load, SecretError};
use serde::de::Error;
use serde::{Deserialize, Deserializer};
use serde_json::Value;
use std::collections::HashMap;
use std::convert::{TryFrom, TryInto};
use std::fs::read_to_string;
use std::path::Path;
use tokio::time::Duration;
#[derive(Debug, Deserialize)]
pub struct Config {
@ -42,7 +42,10 @@ impl Config {
pub struct HeaderVal(String);
impl<'de> Deserialize<'de> for HeaderVal {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
let raw = String::deserialize(deserializer)?;
let str = load_secret(raw).map_err(D::Error::custom)?;
Ok(HeaderVal(str))
@ -64,4 +67,4 @@ fn load_secret(raw: String) -> Result<String, SecretError> {
} else {
Ok(raw)
}
}
}