Add metadata to cluster

infinyon · Oct 30, 2023 · 54f89c2 · 54f89c2
1 parent 9dd4ec3
commit 54f89c2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/fluvio/src/config/cluster.rs b/crates/fluvio/src/config/cluster.rs
@@ -3,8 +3,6 @@
 //!
 //! Stores configuration parameter retrieved from the default or custom profile file.
 //!
-use std::collections::HashMap;
-
 use serde::{Serialize, Deserialize};
 
 use crate::{config::TlsPolicy, FluvioError};
@@ -13,7 +11,7 @@ use super::ConfigFile;
 
 /// Fluvio Cluster Target Configuration
 /// This is part of profile
-#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[non_exhaustive]
 pub struct FluvioConfig {
     /// The address to connect to the Fluvio cluster
@@ -31,9 +29,8 @@ pub struct FluvioConfig {
     #[serde(default)]
     pub tls: TlsPolicy,
 
-    /// Custom annotations attached to clusters
-    #[serde(default)]
-    pub annotations: HashMap<String, String>,
+    /// Cluster custom metadata
+    pub metadata: Option<toml::Value>,
 
     /// This is not part of profile and doesn't persist.
     /// It is purely to override client id when creating ClientConfig
@@ -55,7 +52,7 @@ impl FluvioConfig {
             endpoint: addr.into(),
             use_spu_local_address: false,
             tls: TlsPolicy::Disabled,
-            annotations: HashMap::new(),
+            metadata: None,
             client_id: None,
         }
     }

diff --git a/crates/fluvio/src/config/config.rs b/crates/fluvio/src/config/config.rs
@@ -191,7 +191,7 @@ impl ConfigFile {
 pub const LOCAL_PROFILE: &str = "local";
 const CONFIG_VERSION: &str = "2.0";
 
-#[derive(Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 pub struct Config {
     version: String,
     current_profile: Option<String>,
@@ -570,6 +570,8 @@ pub mod test {
 
     #[test]
     fn test_profile_with_metadata() {
+        use std::collections::BTreeMap;
+
         let config_file = ConfigFile::load(Some("test-data/profiles/config.toml".to_owned()))
             .expect("could not parse config file");
         let config = config_file.config();

diff --git a/crates/fluvio/test-data/profiles/config.toml b/crates/fluvio/test-data/profiles/config.toml
@@ -41,12 +41,12 @@ isolation = "read_committed"
 [topic.test4.2]
 isolation = "uncommitted"
 
-# cluster annotations
-[cluster.with_annotations]
+# cluster metadata
+[cluster.extra]
 endpoint = "127.0.0.1:9003"
 
-[cluster.with_annotations.annotations]
-custom = "annotation"
+[cluster.extra.metadata.deep.nesting.example]
+key = "custom field"
 
-[cluster.no_annotations]
-endpoint = "127.0.0.1:9003"
+[cluster.extra.metadata.installation]
+type = "local"