chido. change up secret handling to be more flexible

src/k8s_helpers.rs

@@ -1,10 +1,19 @@
 use {
     k8s_openapi::{api::core::v1::Secret, ByteString},
     kube::api::ObjectMeta,
-    std::{collections::BTreeMap, error::Error, path::PathBuf},
+    std::{
+        collections::{BTreeMap, HashMap},
+        error::Error,
+        path::PathBuf,
+    },
 };
 
-fn create_secret(name: &str, data: BTreeMap<String, ByteString>) -> Secret {
+pub enum SecretType {
+    Value { v: String },
+    File { path: PathBuf },
+}
+
+fn build_secret(name: &str, data: BTreeMap<String, ByteString>) -> Secret {
     Secret {
         metadata: ObjectMeta {
             name: Some(name.to_string()),
@@ -15,18 +24,24 @@ fn create_secret(name: &str, data: BTreeMap<String, ByteString>) -> Secret {
     }
 }
 
-pub fn create_secret_from_files(
+pub fn create_secret(
     secret_name: &str,
-    key_files: &[(PathBuf, &str)], //[pathbuf, key type]
+    secrets: HashMap<String, SecretType>,
 ) -> Result<Secret, Box<dyn Error>> {
-    let mut data = BTreeMap::new();
-    for (file_path, key_type) in key_files {
-        let file_content = std::fs::read(file_path)
-            .map_err(|err| format!("Failed to read file '{:?}': {}", file_path, err))?;
-        data.insert(format!("{key_type}.json"), ByteString(file_content));
+    let mut data: BTreeMap<String, ByteString> = BTreeMap::new();
+    for (label, value) in secrets {
+        match value {
+            SecretType::Value { v } => {
+                data.insert(label, ByteString(v.into_bytes()));
+            }
+            SecretType::File { path } => {
+                let file_content = std::fs::read(&path)
+                    .map_err(|err| format!("Failed to read file '{:?}': {}", path, err))?;
+                data.insert(label, ByteString(file_content));
+            }
+        }
     }
-
-    Ok(create_secret(secret_name, data))
+    Ok(build_secret(secret_name, data))
 }
 
 pub fn create_selector(key: &str, value: &str) -> BTreeMap<String, String> {

src/kubernetes.rs

@@ -1,11 +1,15 @@
 use {
-    crate::k8s_helpers,
+    crate::k8s_helpers::{self, SecretType},
     k8s_openapi::api::core::v1::{Namespace, Secret},
     kube::{
         api::{Api, ListParams, PostParams},
         Client,
     },
-    std::{collections::BTreeMap, error::Error, path::Path},
+    std::{
+        collections::{BTreeMap, HashMap},
+        error::Error,
+        path::Path,
+    },
 };
 
 pub struct Kubernetes {
@@ -43,14 +47,33 @@ impl Kubernetes {
         let vote_key_path = config_dir.join("bootstrap-validator/vote-account.json");
         let stake_key_path = config_dir.join("bootstrap-validator/stake-account.json");
 
-        let key_files = vec![
-            (faucet_key_path, "faucet"),
-            (identity_key_path, "identity"),
-            (vote_key_path, "vote"),
-            (stake_key_path, "stake"),
-        ];
+        let mut secrets = HashMap::new();
+        secrets.insert(
+            "faucet".to_string(),
+            SecretType::File {
+                path: faucet_key_path,
+            },
+        );
+        secrets.insert(
+            "identity".to_string(),
+            SecretType::File {
+                path: identity_key_path,
+            },
+        );
+        secrets.insert(
+            "vote".to_string(),
+            SecretType::File {
+                path: vote_key_path,
+            },
+        );
+        secrets.insert(
+            "stake".to_string(),
+            SecretType::File {
+                path: stake_key_path,
+            },
+        );
 
-        k8s_helpers::create_secret_from_files(secret_name, &key_files)
+        k8s_helpers::create_secret(secret_name, secrets)
     }
 
     pub async fn deploy_secret(&self, secret: &Secret) -> Result<Secret, kube::Error> {