Update toml dependency and refactor Extension struct (#902)

tembo-io · Aug 12, 2024 · 387d724 · 387d724
1 parent cf5de86
commit 387d724
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/tembo-cli/Cargo.lock b/tembo-cli/Cargo.lock
diff --git a/tembo-cli/Cargo.toml b/tembo-cli/Cargo.toml
@@ -37,7 +37,7 @@ serde_yaml = "0.9.17"
 home = "0.5.5"
 semver = "1.0.18"
 mockall = "0.11.4"
-toml = "0.7.6"
+toml = "0.8.19"
 chrono = { version = "0.4.29", features = ["serde"] }
 simplelog = { version = "^0.12.1", features = ["paris"] }
 clerk-rs = "0.1.7"

diff --git a/tembo-cli/src/cli/tembo_config.rs b/tembo-cli/src/cli/tembo_config.rs
@@ -103,15 +103,10 @@ fn default_extensions() -> Option<HashMap<String, Extension>> {
     Some(HashMap::new())
 }
 
-fn default_as_true() -> bool {
-    true
-}
-
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 pub struct Extension {
     pub version: Option<String>,
-    #[serde(default = "default_as_true")]
-    pub enabled: bool,
+    pub enabled: Option<bool>,
     pub trunk_project: Option<String>,
     pub trunk_project_version: Option<String>,
 }

diff --git a/tembo-cli/src/cmd/apply.rs b/tembo-cli/src/cmd/apply.rs
@@ -945,7 +945,7 @@ fn get_extensions(
                     database: Some("postgres".to_string()),
                     schema: None,
                     version: version,
-                    enabled: extension.enabled,
+                    enabled: extension.enabled.unwrap_or(false),
                 }];
 
             vec_extensions.push(Extension {
@@ -971,7 +971,7 @@ fn get_extensions_controller(
                 database: String::new(),
                 schema: None,
                 version: None,
-                enabled: extension.enabled,
+                enabled: extension.enabled.unwrap_or(false),
             });
 
             vec_extensions.push(ControllerExtension {