Assume trunk project is extension name if not set in Tembo.toml (#462)

Author: sjmiller609

tembo-cli/Cargo.lock

@@ -1,7 +1,7 @@
 workspace = { members = ["temboclient", "tembodataclient"] }
 [package]
 name = "tembo-cli"
-version = "0.13.3"
+version = "0.13.4"
 edition = "2021"
 authors = ["Tembo.io"]
 description = "The CLI for Tembo"

tembo-cli/Cargo.toml

@@ -1,4 +1,4 @@
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize};
 use std::collections::HashMap;
 use toml::Value;
 
@@ -24,11 +24,35 @@ pub struct InstanceSettings {
     #[serde(default = "default_stack_type")]
     pub stack_type: String,
     pub postgres_configurations: Option<HashMap<String, Value>>,
-    #[serde(default = "default_extensions")]
+    #[serde(
+        deserialize_with = "deserialize_extensions",
+        default = "default_extensions"
+    )]
     pub extensions: Option<HashMap<String, Extension>>,
     pub extra_domains_rw: Option<Vec<String>>,
 }
 
+// If a trunk project name is not specified, then assume
+// it's the same name as the extension.
+fn deserialize_extensions<'de, D>(
+    deserializer: D,
+) -> Result<Option<HashMap<String, Extension>>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let map = Option::<HashMap<String, Extension>>::deserialize(deserializer)?;
+
+    map.map(|mut m| {
+        m.iter_mut().for_each(|(key, ext)| {
+            if ext.trunk_project.is_none() {
+                ext.trunk_project = Some(key.clone());
+            }
+        });
+        m
+    })
+    .map_or(Ok(None), |m| Ok(Some(m)))
+}
+
 fn default_cpu() -> String {
     "0.25".to_string()
 }

tembo-cli/src/cli/tembo_config.rs

@@ -97,10 +97,9 @@ async fn data_warehouse() -> Result<(), Box<dyn Error>> {
 
     // check extensions includes postgres_fdw in the output
     // connecting to postgres and running the command
-    let result = get_output_from_sql(
-        "SELECT * FROM pg_extension WHERE extname = 'postgres_fdw'".to_string(),
-    );
-    assert!(result.await?.contains("postgres_fdw"));
+    let result =
+        get_output_from_sql("SELECT * FROM pg_extension WHERE extname = 'clerk_fdw'".to_string());
+    assert!(result.await?.contains("clerk_fdw"));
 
     // tembo delete
     let mut cmd = Command::cargo_bin(CARGO_BIN)?;

tembo-cli/tests/integration_tests.rs

@@ -5,3 +5,7 @@ cpu = "2"
 memory = "8Gi"
 storage = "50Gi"
 stack_type = "DataWarehouse"
+
+[data-warehouse.extensions.clerk_fdw]
+enabled = true
+version = "0.2.4"