dls::File + variants for TLS

src/dls.rs

@@ -5,6 +5,7 @@ use reqwest::Method;
 use std::collections::BTreeMap as Map;
 use std::fmt::Display;
 use std::net::IpAddr;
+use std::time::Duration;
 
 pub struct Client {
     base_url: String,
@@ -159,30 +160,6 @@ impl<'t> Host<'t> {
     }
 }
 
-#[derive(Default, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct Config {
-    #[serde(default, deserialize_with = "deserialize_null_as_default")]
-    pub clusters: Vec<ClusterConfig>,
-    #[serde(default, deserialize_with = "deserialize_null_as_default")]
-    pub hosts: Vec<HostConfig>,
-    #[serde(default, deserialize_with = "deserialize_null_as_default")]
-    pub host_templates: Vec<HostConfig>,
-    #[serde(default, rename = "SSLConfig")]
-    pub ssl_config: String,
-}
-
-// compensate for go's encoder pitfalls
-use serde::{Deserialize, Deserializer};
-fn deserialize_null_as_default<'de, D, T>(deserializer: D) -> std::result::Result<T, D::Error>
-where
-    T: Default + Deserialize<'de>,
-    D: Deserializer<'de>,
-{
-    let opt = Option::deserialize(deserializer)?;
-    Ok(opt.unwrap_or_default())
-}
-
 #[derive(serde::Deserialize, serde::Serialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct ClusterConfig {
@@ -195,15 +172,15 @@ pub struct ClusterConfig {
 #[serde(rename_all = "PascalCase")]
 pub struct HostConfig {
     pub name: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub cluster_name: Option<String>,
 
     #[serde(rename = "IPs")]
     pub ips: Vec<IpAddr>,
 
-    #[serde(default, skip_serializing_if = "Map::is_empty")]
+    #[serde(skip_serializing_if = "Map::is_empty")]
     pub labels: Map<String, String>,
-    #[serde(default, skip_serializing_if = "Map::is_empty")]
+    #[serde(skip_serializing_if = "Map::is_empty")]
     pub annotations: Map<String, String>,
 
     #[serde(rename = "IPXE", skip_serializing_if = "Option::is_none")]
@@ -213,13 +190,10 @@ pub struct HostConfig {
     pub kernel: String,
     pub versions: Map<String, String>,
 
-    /// initrd config template
     pub bootstrap_config: String,
-    /// files to add to the final initrd config, with rendering
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub initrd_files: Vec<crate::File>,
 
-    /// system config template
     pub config: String,
 }
 
@@ -332,3 +306,50 @@ pub enum Error {
     #[error("response parsing failed: {0}")]
     Parse(serde_json::Error),
 }
+
+#[derive(serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum File {
+    Static(crate::File),
+    Gen { path: String, from: ContentGen },
+}
+
+#[derive(serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ContentGen {
+    CaCrt(CaRef),
+    TlsKey(TlsRef),
+    TlsCrt {
+        key: TlsRef,
+        ca: CaRef,
+        profile: CertProfile,
+    },
+}
+
+#[derive(serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum CaRef {
+    Global(String),
+    Cluster(String, String),
+}
+
+#[derive(serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum TlsRef {
+    Cluster(String, String),
+    Host(String, String),
+}
+
+#[derive(serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum CertProfile {
+    Client,
+    Server,
+    /// basicaly Client+Server
+    Peer,
+    Kube {
+        user: String,
+        group: String,
+        duration: Duration,
+    },
+}

src/lib.rs

@@ -52,7 +52,7 @@ pub struct User {
     pub gid: Option<u32>,
 }
 
-#[derive(Debug, PartialEq, Eq, serde::Deserialize, serde::Serialize)]
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
 pub struct File {
     pub path: String,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -61,21 +61,10 @@ pub struct File {
     pub kind: FileKind,
 }
 
-#[derive(Debug, PartialEq, Eq, serde::Deserialize, serde::Serialize)]
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
 #[serde(rename_all = "snake_case")]
 pub enum FileKind {
     Content(String),
     Symlink(String),
     Dir(bool),
 }
-
-// ------------------------------------------------------------------------
-
-impl Config {
-    pub fn has_file(&self, path: &str) -> bool {
-        self.files.iter().any(|f| f.path == path)
-    }
-    pub fn file(&self, path: &str) -> Option<&File> {
-        self.files.iter().find(|f| f.path == path)
-    }
-}