Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Prg 160 add ssl grouping config (#67682)

Jakub Chodorowicz63be2939451d
diff --git a/modules/drivers/clickhouse/resources/metabase-plugin.yaml b/modules/drivers/clickhouse/resources/metabase-plugin.yaml
index bfcd579124b..4c2a7e2578e 100644
--- a/modules/drivers/clickhouse/resources/metabase-plugin.yaml
+++ b/modules/drivers/clickhouse/resources/metabase-plugin.yaml
@@ -36,9 +36,11 @@ driver:
placeholder: >-
database_1, database_2
helper-text: Optionally filter which databases are visible.
-
- - ssl
- - ssh-tunnel
+ - group:
+ container-style: ["component", "backdrop"]
+ fields:
+ - ssl
+ - ssh-tunnel
- advanced-options-start
- name: use-no-proxy
display-name: Disable system wide proxy settings
diff --git a/modules/drivers/druid-jdbc/resources/metabase-plugin.yaml b/modules/drivers/druid-jdbc/resources/metabase-plugin.yaml
index ce91d5c762d..5261ad750e2 100644
--- a/modules/drivers/druid-jdbc/resources/metabase-plugin.yaml
+++ b/modules/drivers/druid-jdbc/resources/metabase-plugin.yaml
@@ -19,7 +19,10 @@ driver:
- port
- display-name: Router node port
placeholder: 8888
- - ssh-tunnel
+ - group:
+ container-style: ["component", "backdrop"]
+ fields:
+ - ssh-tunnel
- advanced-options-start
- name: json-unfolding
display-name: Allow unfolding of JSON columns
diff --git a/modules/drivers/druid/resources/metabase-plugin.yaml b/modules/drivers/druid/resources/metabase-plugin.yaml
index cb28acb4204..dd892dcf94a 100644
--- a/modules/drivers/druid/resources/metabase-plugin.yaml
+++ b/modules/drivers/druid/resources/metabase-plugin.yaml
@@ -20,7 +20,10 @@ driver:
placeholder: 8082
required: true
- cloud-ip-address-info
- - ssh-tunnel
+ - group:
+ container-style: ["component", "backdrop"]
+ fields:
+ - ssh-tunnel
- advanced-options-start
- name: auth-enabled
display-name: Authentication header
diff --git a/modules/drivers/mongo/resources/metabase-plugin.yaml b/modules/drivers/mongo/resources/metabase-plugin.yaml
index 88268c44c51..a4c43e4a57d 100644
--- a/modules/drivers/mongo/resources/metabase-plugin.yaml
+++ b/modules/drivers/mongo/resources/metabase-plugin.yaml
@@ -50,33 +50,36 @@ driver:
visible-if:
use-conn-uri: false
- cloud-ip-address-info
- - merge:
- - ssl
- - visible-if:
- use-conn-uri: false
- - name: ssl-cert
- type: string
- display-name: Server SSL certificate chain (PEM)
- visible-if:
- ssl: true
- - name: ssl-use-client-auth
- display-name: Authenticate client certificate?
- type: boolean
- visible-if:
- ssl: true
- - name: client-ssl-cert
- display-name: Client SSL certificate chain (PEM)
- placeholder: Paste the contents of the client's SSL certificate chain here
- type: text
- visible-if:
- ssl-use-client-auth: true
- - name: client-ssl-key
- display-name: Client SSL private key (PEM)
- type: secret
- secret-kind: pem-cert
- visible-if:
- ssl-use-client-auth: true
- - ssh-tunnel
+ - group:
+ container-style: ["component", "backdrop"]
+ fields:
+ - merge:
+ - ssl
+ - visible-if:
+ use-conn-uri: false
+ - name: ssl-cert
+ type: string
+ display-name: Server SSL certificate chain (PEM)
+ visible-if:
+ ssl: true
+ - name: ssl-use-client-auth
+ display-name: Authenticate client certificate?
+ type: boolean
+ visible-if:
+ ssl: true
+ - name: client-ssl-cert
+ display-name: Client SSL certificate chain (PEM)
+ placeholder: Paste the contents of the client's SSL certificate chain here
+ type: text
+ visible-if:
+ ssl-use-client-auth: true
+ - name: client-ssl-key
+ display-name: Client SSL private key (PEM)
+ type: secret
+ secret-kind: pem-cert
+ visible-if:
+ ssl-use-client-auth: true
+ - ssh-tunnel
- advanced-options-start
- merge:
- additional-options
diff --git a/modules/drivers/mongo/src/metabase/driver/mongo/database.clj b/modules/drivers/mongo/src/metabase/driver/mongo/database.clj
index f12bccea6e6..b28ac309fd6 100644
--- a/modules/drivers/mongo/src/metabase/driver/mongo/database.clj
+++ b/modules/drivers/mongo/src/metabase/driver/mongo/database.clj
@@ -26,9 +26,12 @@
(defn- update-ssl-db-details
[db-details]
- (-> db-details
- (driver-api/clean-secret-properties-from-details :mongo)
- (assoc :client-ssl-key (driver-api/secret-value-as-string :mongo db-details "client-ssl-key"))))
+ ;; Must capture secret value BEFORE cleaning, as clean-secret-properties-from-details
+ ;; will remove the secret properties (client-ssl-key-value or client-ssl-key-id)
+ (let [client-ssl-key (driver-api/secret-value-as-string :mongo db-details "client-ssl-key")]
+ (-> db-details
+ (driver-api/clean-secret-properties-from-details :mongo)
+ (assoc :client-ssl-key client-ssl-key))))
(defn details-normalized
"Gets db-details for `database`. Details are then validated and ssl related keys are updated."
diff --git a/modules/drivers/presto-jdbc/resources/metabase-plugin.yaml b/modules/drivers/presto-jdbc/resources/metabase-plugin.yaml
index 5b495b9bbbb..29d3374f37a 100644
--- a/modules/drivers/presto-jdbc/resources/metabase-plugin.yaml
+++ b/modules/drivers/presto-jdbc/resources/metabase-plugin.yaml
@@ -36,45 +36,48 @@ driver:
- password
- required: false
- cloud-ip-address-info
- - ssl
- - name: ssl-use-keystore
- display-name: Use SSL server certificate?
- type: boolean
- visible-if:
- ssl: true
- - name: ssl-keystore
- display-name: Keystore
- type: secret
- secret-kind: keystore
- placeholder: /path/to/keystore.jks
- visible-if:
- ssl-use-keystore: true
- - name: ssl-keystore-password
- display-name: Keystore password
- type: secret
- secret-kind: password
- required: false
- visible-if:
- ssl-use-keystore: true
- - name: ssl-use-truststore
- display-name: Use SSL truststore?
- type: boolean
- visible-if:
- ssl: true
- - name: ssl-truststore
- display-name: Truststore
- type: secret
- secret-kind: keystore
- placeholder: /path/to/truststore.jks
- visible-if:
- ssl-use-truststore: true
- - name: ssl-truststore-password
- display-name: Truststore password
- type: secret
- secret-kind: password
- required: false
- visible-if:
- ssl-use-truststore: true
+ - group:
+ container-style: ["component", "backdrop"]
+ fields:
+ - ssl
+ - name: ssl-use-keystore
+ display-name: Use SSL server certificate?
+ type: boolean
+ visible-if:
+ ssl: true
+ - name: ssl-keystore
+ display-name: Keystore
+ type: secret
+ secret-kind: keystore
+ placeholder: /path/to/keystore.jks
+ visible-if:
+ ssl-use-keystore: true
+ - name: ssl-keystore-password
+ display-name: Keystore password
+ type: secret
+ secret-kind: password
+ required: false
+ visible-if:
+ ssl-use-keystore: true
+ - name: ssl-use-truststore
+ display-name: Use SSL truststore?
+ type: boolean
+ visible-if:
+ ssl: true
+ - name: ssl-truststore
+ display-name: Truststore
+ type: secret
+ secret-kind: keystore
+ placeholder: /path/to/truststore.jks
+ visible-if:
+ ssl-use-truststore: true
+ - name: ssl-truststore-password
+ display-name: Truststore password
+ type: secret
+ secret-kind: password
+ required: false
+ visible-if:
+ ssl-use-truststore: true
- advanced-options-start
- name: kerberos
type: boolean
diff --git a/modules/drivers/redshift/resources/metabase-plugin.yaml b/modules/drivers/redshift/resources/metabase-plugin.yaml
index f68af74a150..c29cd9d5bce 100644
--- a/modules/drivers/redshift/resources/metabase-plugin.yaml
+++ b/modules/drivers/redshift/resources/metabase-plugin.yaml
@@ -28,7 +28,10 @@ driver:
- user
- password
- cloud-ip-address-info
- - ssh-tunnel
+ - group:
+ container-style: ["component", "backdrop"]
+ fields:
+ - ssh-tunnel
- advanced-options-start
- merge:
- additional-options
diff --git a/modules/drivers/snowflake/resources/metabase-plugin.yaml b/modules/drivers/snowflake/resources/metabase-plugin.yaml
index 408b7cd72ac..9a7ea1a0c0d 100644
--- a/modules/drivers/snowflake/resources/metabase-plugin.yaml
+++ b/modules/drivers/snowflake/resources/metabase-plugin.yaml
@@ -58,7 +58,10 @@ driver:
helper-text: Specify a role to override the database user’s default role.
placeholder: user
- cloud-ip-address-info
- - ssh-tunnel
+ - group:
+ container-style: ["component", "backdrop"]
+ fields:
+ - ssh-tunnel
- advanced-options-start
- merge:
- additional-options
diff --git a/modules/drivers/sparksql/resources/metabase-plugin.yaml b/modules/drivers/sparksql/resources/metabase-plugin.yaml
index 233dd3d36a4..66eed3e1e88 100644
--- a/modules/drivers/sparksql/resources/metabase-plugin.yaml
+++ b/modules/drivers/sparksql/resources/metabase-plugin.yaml
@@ -25,7 +25,10 @@ driver:
- user
- password
- cloud-ip-address-info
- - ssh-tunnel
+ - group:
+ container-style: ["component", "backdrop"]
+ fields:
+ - ssh-tunnel
- advanced-options-start
- merge:
- additional-options
diff --git a/modules/drivers/sqlserver/resources/metabase-plugin.yaml b/modules/drivers/sqlserver/resources/metabase-plugin.yaml
index 24bce0fd902..7678e26ab7b 100644
--- a/modules/drivers/sqlserver/resources/metabase-plugin.yaml
+++ b/modules/drivers/sqlserver/resources/metabase-plugin.yaml
@@ -29,8 +29,11 @@ driver:
helper-text: User used to run system queries, required if the connection's user cannot be impersonated, such as the 'sa' user.
placeholder: user
- cloud-ip-address-info
- - ssl
- - ssh-tunnel
+ - group:
+ container-style: ["component", "backdrop"]
+ fields:
+ - ssl
+ - ssh-tunnel
- advanced-options-start
- merge:
- additional-options
diff --git a/modules/drivers/starburst/resources/metabase-plugin.yaml b/modules/drivers/starburst/resources/metabase-plugin.yaml
index 5d98f590e06..3a6e912fab9 100644
--- a/modules/drivers/starburst/resources/metabase-plugin.yaml
+++ b/modules/drivers/starburst/resources/metabase-plugin.yaml
@@ -32,7 +32,11 @@ driver:
- merge:
- password
- required: false
- - ssl
+ - group:
+ container-style: ["component", "backdrop"]
+ fields:
+ - ssl
+ - ssh-tunnel
- name: roles
display-name: Role (optional)
required: false
@@ -43,7 +47,6 @@ driver:
required: false
default: false
description: Requires Starburst Galaxy, Starburst Enterprise (version 420-e or higher), or Trino (version 418 or higher)
- - ssh-tunnel
- advanced-options-start
- merge:
- additional-options
diff --git a/src/metabase/driver/mysql.clj b/src/metabase/driver/mysql.clj
index 35ad1769ec1..59f9a900049 100644
--- a/src/metabase/driver/mysql.clj
+++ b/src/metabase/driver/mysql.clj
@@ -243,9 +243,11 @@
:visible-if {"use-auth-provider" false})
driver.common/default-role-details
driver.common/cloud-ip-address-info
- driver.common/default-ssl-details
- default-ssl-cert-details
- driver.common/ssh-tunnel-preferences
+ {:type :group
+ :container-style ["component" "backdrop"]
+ :fields [driver.common/default-ssl-details
+ default-ssl-cert-details
+ driver.common/ssh-tunnel-preferences]}
driver.common/advanced-options-start
driver.common/json-unfolding
(assoc driver.common/additional-options
diff --git a/src/metabase/driver/postgres.clj b/src/metabase/driver/postgres.clj
index 1d25842eae7..961f4e5ca4d 100644
--- a/src/metabase/driver/postgres.clj
+++ b/src/metabase/driver/postgres.clj
@@ -172,50 +172,52 @@
:type :schema-filters
:display-name "Schemas"
:visible-if {"destination-database" false}}
- driver.common/default-ssl-details
- {:name "ssl-mode"
- :display-name (trs "SSL Mode")
- :type :select
- :options [{:name "allow"
- :value "allow"}
- {:name "prefer"
- :value "prefer"}
- {:name "require"
- :value "require"}
- {:name "verify-ca"
- :value "verify-ca"}
- {:name "verify-full"
- :value "verify-full"}]
- :default "require"
- :visible-if {"ssl" true}}
- {:name "ssl-root-cert"
- :display-name (trs "SSL Root Certificate (PEM)")
- :type :secret
- :secret-kind :pem-cert
- ;; only need to specify the root CA if we are doing one of the verify modes
- :visible-if {"ssl-mode" ["verify-ca" "verify-full"]}}
- {:name "ssl-use-client-auth"
- :display-name (trs "Authenticate client certificate?")
- :type :boolean
- ;; TODO: does this somehow depend on any of the ssl-mode vals? it seems not (and is in fact orthogonal)
- :visible-if {"ssl" true}}
- {:name "ssl-client-cert"
- :display-name (trs "SSL Client Certificate (PEM)")
- :type :secret
- :secret-kind :pem-cert
- :visible-if {"ssl-use-client-auth" true}}
- {:name "ssl-key"
- :display-name (trs "SSL Client Key (PKCS-8/DER)")
- :type :secret
- ;; since this can be either PKCS-8 or PKCS-12, we can't model it as a :keystore
- :secret-kind :binary-blob
- :visible-if {"ssl-use-client-auth" true}}
- {:name "ssl-key-password"
- :display-name (trs "SSL Client Key Password")
- :type :secret
- :secret-kind :password
- :visible-if {"ssl-use-client-auth" true}}
- driver.common/ssh-tunnel-preferences
+ {:type :group
+ :container-style ["component" "backdrop"]
+ :fields [driver.common/default-ssl-details
+ {:name "ssl-mode"
+ :display-name (trs "SSL Mode")
+ :type :select
+ :options [{:name "allow"
+ :value "allow"}
+ {:name "prefer"
+ :value "prefer"}
+ {:name "require"
+ :value "require"}
+ {:name "verify-ca"
+ :value "verify-ca"}
+ {:name "verify-full"
+ :value "verify-full"}]
+ :default "require"
+ :visible-if {"ssl" true}}
+ {:name "ssl-root-cert"
+ :display-name (trs "SSL Root Certificate (PEM)")
+ :type :secret
+ :secret-kind :pem-cert
+ ;; only need to specify the root CA if we are doing one of the verify modes
+ :visible-if {"ssl-mode" ["verify-ca" "verify-full"]}}
+ {:name "ssl-use-client-auth"
+ :display-name (trs "Authenticate client certificate?")
+ :type :boolean
+ ;; TODO: does this somehow depend on any of the ssl-mode vals? it seems not (and is in fact orthogonal)
+ :visible-if {"ssl" true}}
+ {:name "ssl-client-cert"
+ :display-name (trs "SSL Client Certificate (PEM)")
+ :type :secret
+ :secret-kind :pem-cert
+ :visible-if {"ssl-use-client-auth" true}}
+ {:name "ssl-key"
+ :display-name (trs "SSL Client Key (PKCS-8/DER)")
+ :type :secret
+ ;; since this can be either PKCS-8 or PKCS-12, we can't model it as a :keystore
+ :secret-kind :binary-blob
+ :visible-if {"ssl-use-client-auth" true}}
+ {:name "ssl-key-password"
+ :display-name (trs "SSL Client Key Password")
+ :type :secret
+ :secret-kind :password
+ :visible-if {"ssl-use-client-auth" true}}
+ driver.common/ssh-tunnel-preferences]}
driver.common/advanced-options-start
driver.common/json-unfolding
diff --git a/src/metabase/driver/util.clj b/src/metabase/driver/util.clj
index 6242873ab00..4d77d6d74e5 100644
--- a/src/metabase/driver/util.clj
+++ b/src/metabase/driver/util.clj
@@ -429,6 +429,124 @@
(= :schema-filters (keyword (:type conn-prop))))
(driver/connection-properties driver))))
+(defn collect-all-props-by-name
+ "Recursively collect all properties into a flat map by name, including nested group fields.
+ This creates a complete lookup map keyed by property name.
+
+ Groups have :type :group and contain a :fields array with nested properties. This function
+ flattens the structure to make all properties available for lookups and filtering.
+
+ Properties without a :name are skipped."
+ [props]
+ (reduce (fn [acc prop]
+ (cond
+ ;; Group with nested fields - recursively collect from nested fields
+ (= :group (:type prop))
+ (merge acc (collect-all-props-by-name (:fields prop)))
+
+ ;; Regular fields
+ (:name prop)
+ (assoc acc (:name prop) prop)
+
+ ;; This should not happen but let's leave it as a fallback
+ :else
+ acc))
+ {}
+ props))
+
+(defn- resolve-transitive-visible-if
+ "Resolves transitive visible-if dependencies for a property.
+
+ If property x depends on y having a value, but y itself depends on z having a value,
+ then x should be hidden if y is. This function computes the full transitive closure
+ of visible-if dependencies.
+
+ Throws an exception if a cycle is detected in the dependency graph."
+ [prop props-by-name driver]
+ (let [v-ifs*
+ (loop [props* [prop]
+ acc {}]
+ (if (seq props*)
+ (let [all-visible-ifs (reduce
+ #(reduce-kv (fn [acc prop-name v]
+ (if (or (contains? props-by-name (->str prop-name))
+ ;; If v is false then this depended on a removed :checked-section
+ ;; and the dependency should be dropped.
+ (not (false? v)))
+ (assoc acc prop-name v)
+ acc))
+ %1 (:visible-if %2))
+ {} props*)
+ visible-keys (keys all-visible-ifs)
+ transitive-props (perf/mapv (comp (partial get props-by-name) ->str) visible-keys)
+ next-acc (into acc all-visible-ifs)]
+ (if-not (perf/some #(contains? acc %) visible-keys)
+ (recur transitive-props next-acc)
+ (let [cyclic-props (set/intersection (set visible-keys)
+ (set (keys acc)))]
+ (-> (trs "Cycle detected resolving dependent visible-if properties for driver {0}: {1}"
+ driver cyclic-props)
+ (ex-info {:type qp.error-type/driver
+ :driver driver
+ :cyclic-visible-ifs cyclic-props})
+ throw))))
+ acc))]
+ (cond-> prop
+ (seq v-ifs*) (assoc :visible-if v-ifs*)
+ (empty? v-ifs*) (dissoc :visible-if))))
+
+(defn- resolve-transitive-visible-if-recursive
+ "Recursively resolve transitive visible-if for properties, including nested groups.
+
+ Groups are processed recursively to maintain their structure while resolving dependencies
+ for all nested fields. This allows dependencies to cross group boundaries - top-level fields
+ can depend on nested fields and vice versa."
+ [prop props-by-name driver]
+ (cond
+ ;; If it's a group, recursively process its nested fields while preserving group structure
+ (= :group (:type prop))
+ (update prop :fields
+ (fn [fields]
+ (mapv #(resolve-transitive-visible-if-recursive % props-by-name driver)
+ fields)))
+
+ ;; Regular property - resolve its transitive visible-if dependencies
+ :else
+ (resolve-transitive-visible-if prop props-by-name driver)))
+
+(defn- process-connection-prop
+ "Recursively processes a single connection property, handling special types like :secret, :info, :group, etc.
+
+ For :group types, this function:
+ - Flattens any vectors in the :fields array (e.g., ssh-tunnel-preferences)
+ - Recursively processes each nested field
+
+ Returns a vector of processed properties (most types return a single property, some like :secret may expand to multiple)."
+ [conn-prop]
+ (case (keyword (:type conn-prop))
+ :secret
+ (expand-secret-conn-prop conn-prop)
+
+ :info
+ (if-let [conn-prop' (resolve-info-conn-prop conn-prop)]
+ [conn-prop']
+ [])
+
+ :checked-section
+ (resolve-checked-section-conn-prop conn-prop)
+
+ :schema-filters
+ (expand-schema-filters-prop conn-prop)
+
+ :group
+ (let [processed-fields (into []
+ (comp (mapcat u/one-or-many)
+ (mapcat process-connection-prop))
+ (:fields conn-prop))]
+ [(assoc conn-prop :fields processed-fields)])
+
+ [conn-prop]))
+
(defn connection-props-server->client
"Transforms `conn-props` for the given `driver` from their server side definition into a client side definition.
@@ -440,66 +558,13 @@
if one was provided."
{:added "0.42.0"}
[driver conn-props]
- (let [final-props
- (persistent!
- (reduce (fn [acc conn-prop]
- ;; TODO: change this to expanded- and use that as the basis for all calcs below (not conn-prop)
- (let [expanded-props (case (keyword (:type conn-prop))
- :secret
- (expand-secret-conn-prop conn-prop)
-
- :info
- (if-let [conn-prop' (resolve-info-conn-prop conn-prop)]
- [conn-prop']
- [])
-
- :checked-section
- (resolve-checked-section-conn-prop conn-prop)
-
- :schema-filters
- (expand-schema-filters-prop conn-prop)
-
- [conn-prop])]
- (reduce conj! acc expanded-props)))
- (transient [])
- conn-props))
- props-by-name (reduce #(assoc %1 (:name %2) %2) {} final-props)]
+ (let [final-props (into [] (mapcat process-connection-prop) conn-props)
+ ;; Build complete props-by-name map including nested fields from groups
+ props-by-name (collect-all-props-by-name final-props)]
;; now, traverse the visible-if-edges and update all visible-if entries with their full set of "transitive"
;; dependencies (if property x depends on y having a value, but y itself depends on z having a value, then x
- ;; should be hidden if y is)
- (mapv (fn [prop]
- (let [v-ifs*
- (loop [props* [prop]
- acc {}]
- (if (seq props*)
- (let [all-visible-ifs (reduce
- #(reduce-kv (fn [acc prop-name v]
- (if (or (contains? props-by-name (->str prop-name))
- ;; If v is false then this depended on a removed :checked-section
- ;; and the dependency should be dropped.
- (not (false? v)))
- (assoc acc prop-name v)
- acc))
- %1 (:visible-if %2))
- {} props*)
- visible-keys (keys all-visible-ifs)
- transitive-props (perf/mapv (comp (partial get props-by-name) ->str) visible-keys)
- next-acc (into acc all-visible-ifs)]
- (if-not (perf/some #(contains? acc %) visible-keys)
- (recur transitive-props next-acc)
- (let [cyclic-props (set/intersection (set visible-keys)
- (set (keys acc)))]
- (-> (trs "Cycle detected resolving dependent visible-if properties for driver {0}: {1}"
- driver cyclic-props)
- (ex-info {:type qp.error-type/driver
- :driver driver
- :cyclic-visible-ifs cyclic-props})
- throw))))
- acc))]
- (cond-> prop
- (seq v-ifs*) (assoc :visible-if v-ifs*)
- (empty? v-ifs*) (dissoc :visible-if))))
- final-props)))
+ ;; should be hidden if y is). This works recursively to handle nested groups.
+ (mapv #(resolve-transitive-visible-if-recursive % props-by-name driver) final-props)))
(def data-url-pattern
"A regex to match data-URL-encoded files uploaded via the frontend"
diff --git a/src/metabase/secrets/models/secret.clj b/src/metabase/secrets/models/secret.clj
index d1dad720314..89fcdf2bc29 100644
--- a/src/metabase/secrets/models/secret.clj
+++ b/src/metabase/secrets/models/secret.clj
@@ -94,12 +94,15 @@
"**MetabasePass**")
(defn secret-conn-props-by-name
- "For the driver return a map of all `:type` `:secret` properties, keyed by property name."
+ "For the driver return a map of all `:type` `:secret` properties, keyed by property name.
+ Handles both top-level and grouped (nested) connection properties."
[driver]
(let [conn-props-fn (get-method driver/connection-properties driver)]
(when (fn? conn-props-fn)
- (->> (filter #(= :secret (keyword (:type %))) (conn-props-fn driver))
- (reduce (fn [acc prop] (assoc acc (:name prop) prop)) {})
+ (->> (conn-props-fn driver)
+ driver.u/collect-all-props-by-name
+ (filter (fn [[_name prop]] (= :secret (keyword (:type prop)))))
+ (into {})
not-empty))))
(defn- reduce-over-details-secret-values
diff --git a/src/metabase/warehouses_rest/api.clj b/src/metabase/warehouses_rest/api.clj
index 34f74c6b728..a57a2f3e5e5 100644
--- a/src/metabase/warehouses_rest/api.clj
+++ b/src/metabase/warehouses_rest/api.clj
@@ -880,8 +880,7 @@
"Does the given `engine` have an `:ssl` setting?"
[driver]
{:pre [(driver/available? driver)]}
- (let [driver-props (set (for [field (driver/connection-properties driver)]
- (:name field)))]
+ (let [driver-props (driver.u/collect-all-props-by-name (driver/connection-properties driver))]
(contains? driver-props "ssl")))
(mu/defn test-connection-details :- :map
diff --git a/test/metabase/driver/util_test.clj b/test/metabase/driver/util_test.clj
index 8ceb64acd54..d23a9a5daac 100644
--- a/test/metabase/driver/util_test.clj
+++ b/test/metabase/driver/util_test.clj
@@ -215,11 +215,206 @@
:display-name "Schemas"}
{:name "last-prop"}])))))
+(deftest ^:parallel resolve-transitive-visible-if-test
+ (testing "resolve-transitive-visible-if resolves transitive dependencies"
+ (let [a {:name "prop-a"}, b {:name "prop-b" :visible-if {:prop-a true}}, c {:name "prop-c" :visible-if {:prop-b true}}, props-by-name {"prop-a" a, "prop-b" b, "prop-c" c}]
+ (testing "property with no visible-if remains unchanged"
+ (is (= a
+ (#'driver.u/resolve-transitive-visible-if
+ a
+ props-by-name
+ :test-driver))))
+
+ (testing "property with single-level visible-if is preserved"
+ (is (= b
+ (#'driver.u/resolve-transitive-visible-if
+ b
+ props-by-name
+ :test-driver))))
+
+ (testing "property with transitive visible-if includes all dependencies"
+ (is (= {:name "prop-c" :visible-if {:prop-b true
+ :prop-a true}}
+ (#'driver.u/resolve-transitive-visible-if
+ c
+ props-by-name
+ :test-driver))))))
+
+ (testing "empty visible-if is removed"
+ (is (= {:name "prop-x"}
+ (#'driver.u/resolve-transitive-visible-if
+ {:name "prop-x" :visible-if {}}
+ {}
+ :test-driver))))
+
+ (testing "dependencies on non-existent properties are kept (not filtered)"
+ (let [props-by-name {"prop-a" {:name "prop-a"}}]
+ (is (= {:name "prop-b" :visible-if {:non-existent-prop true}}
+ (#'driver.u/resolve-transitive-visible-if
+ {:name "prop-b" :visible-if {:non-existent-prop true}}
+ props-by-name
+ :test-driver)))))
+
+ (testing "false dependencies (from removed :checked-section) are filtered out"
+ (let [props-by-name {"prop-a" {:name "prop-a"}}]
+ (is (= {:name "prop-b" :visible-if {:prop-a true}}
+ (#'driver.u/resolve-transitive-visible-if
+ {:name "prop-b" :visible-if {:prop-a true
+ :removed-section false}}
+ props-by-name
+ :test-driver)))))
+
+ (testing "multi-level transitive dependencies are fully resolved"
+ (let [props-by-name {"prop-a" {:name "prop-a"}
+ "prop-b" {:name "prop-b" :visible-if {:prop-a true}}
+ "prop-c" {:name "prop-c" :visible-if {:prop-b true}}
+ "prop-d" {:name "prop-d" :visible-if {:prop-c true}}}]
+ (is (= {:name "prop-d" :visible-if {:prop-c true
+ :prop-b true
+ :prop-a true}}
+ (#'driver.u/resolve-transitive-visible-if
+ {:name "prop-d" :visible-if {:prop-c true}}
+ props-by-name
+ :test-driver)))))
+
+ (testing "cycle detection throws exception with appropriate error data"
+ (let [props-by-name {"prop-a" {:name "prop-a" :visible-if {:prop-c true}}
+ "prop-b" {:name "prop-b" :visible-if {:prop-a true}}
+ "prop-c" {:name "prop-c" :visible-if {:prop-b true}}}]
+ (try
+ (#'driver.u/resolve-transitive-visible-if
+ {:name "prop-a" :visible-if {:prop-c true}}
+ props-by-name
+ :test-driver)
+ (is false "Should have thrown an exception")
+ (catch clojure.lang.ExceptionInfo e
+ (is (str/includes? (ex-message e) "Cycle detected"))
+ (is (= :test-driver (:driver (ex-data e))))
+ (is (= :driver (:type (ex-data e))))
+ (is (set? (:cyclic-visible-ifs (ex-data e)))))))))
+
+(deftest ^:parallel collect-all-props-by-name-test
+ (testing "collect-all-props-by-name flattens nested groups"
+ (testing "flat properties without groups"
+ (let [props [{:name "prop-a"} {:name "prop-b"}]]
+ (is (= {"prop-a" {:name "prop-a"}
+ "prop-b" {:name "prop-b"}}
+ (#'driver.u/collect-all-props-by-name props)))))
+
+ (testing "single group with nested fields"
+ (let [props [{:name "top-level"}
+ {:type :group
+ :container-style ["grid" "1fr 1fr"]
+ :fields [{:name "nested-1"}
+ {:name "nested-2"}]}]]
+ (is (= {"top-level" {:name "top-level"}
+ "nested-1" {:name "nested-1"}
+ "nested-2" {:name "nested-2"}}
+ (#'driver.u/collect-all-props-by-name props)))))
+
+ (testing "deeply nested groups"
+ (let [props [{:name "top"}
+ {:type :group
+ :fields [{:name "level-1"}
+ {:type :group
+ :fields [{:name "level-2"}
+ {:name "level-2-b"}]}]}]]
+ (is (= {"top" {:name "top"}
+ "level-1" {:name "level-1"}
+ "level-2" {:name "level-2"}
+ "level-2-b" {:name "level-2-b"}}
+ (#'driver.u/collect-all-props-by-name props)))))
+
+ (testing "properties without names are skipped"
+ (let [props [{:name "has-name"}
+ {:type :info :placeholder "no name"}]]
+ (is (= {"has-name" {:name "has-name"}}
+ (#'driver.u/collect-all-props-by-name props)))))))
+
+(deftest ^:parallel resolve-transitive-visible-if-recursive-test
+ (testing "resolve-transitive-visible-if-recursive handles groups"
+ (testing "simple group structure is preserved"
+ (let [props-by-name {"field-a" {:name "field-a"}}
+ group {:type :group
+ :container-style ["grid" "1fr"]
+ :fields [{:name "nested-field"}]}]
+ (is (= {:type :group
+ :container-style ["grid" "1fr"]
+ :fields [{:name "nested-field"}]}
+ (#'driver.u/resolve-transitive-visible-if-recursive
+ group
+ props-by-name
+ :test-driver)))))
+
+ (testing "nested field with transitive dependency"
+ (let [props-by-name {"field-a" {:name "field-a"}
+ "field-b" {:name "field-b" :visible-if {:field-a true}}
+ "nested" {:name "nested" :visible-if {:field-b true}}}
+ group {:type :group
+ :fields [{:name "nested" :visible-if {:field-b true}}]}]
+ (is (= {:type :group
+ :fields [{:name "nested" :visible-if {:field-b true
+ :field-a true}}]}
+ (#'driver.u/resolve-transitive-visible-if-recursive
+ group
+ props-by-name
+ :test-driver)))))
+
+ (testing "top-level field depending on nested field"
+ (let [props-by-name {"nested-a" {:name "nested-a"}
+ "nested-b" {:name "nested-b" :visible-if {:nested-a true}}}
+ prop {:name "top-level" :visible-if {:nested-b true}}]
+ (is (= {:name "top-level" :visible-if {:nested-b true
+ :nested-a true}}
+ (#'driver.u/resolve-transitive-visible-if-recursive
+ prop
+ props-by-name
+ :test-driver)))))))
+
+(deftest ^:parallel connection-props-server->client-with-groups-test
+ (testing "connection-props-server->client handles transitive dependencies across group boundaries"
+ (testing "top-level field depends on nested field"
+ (let [props [{:type :group
+ :fields [{:name "nested-field"}]}
+ {:name "top-field" :visible-if {:nested-field true}}]
+ result (driver.u/connection-props-server->client :test-driver props)]
+ (is (= 2 (count result)))
+ (is (= :group (:type (first result))))
+ (is (= {:name "top-field" :visible-if {:nested-field true}}
+ (second result)))))
+
+ (testing "nested field depends on top-level field with transitive chain"
+ (let [props [{:name "field-a"}
+ {:name "field-b" :visible-if {:field-a true}}
+ {:type :group
+ :container-style ["grid" "1fr"]
+ :fields [{:name "nested" :visible-if {:field-b true}}]}]
+ result (driver.u/connection-props-server->client :test-driver props)]
+ (is (= 3 (count result)))
+ ;; Check that the nested field has transitive dependencies resolved
+ (let [group (nth result 2)
+ nested-field (first (:fields group))]
+ (is (= {:field-b true :field-a true}
+ (:visible-if nested-field))))))
+
+ (testing "deeply nested groups with cross-boundary dependencies"
+ (let [props [{:name "root-field"}
+ {:type :group
+ :fields [{:name "level-1" :visible-if {:root-field true}}
+ {:type :group
+ :fields [{:name "level-2" :visible-if {:level-1 true}}]}]}]
+ result (driver.u/connection-props-server->client :test-driver props)
+ outer-group (second result)
+ inner-group (second (:fields outer-group))
+ level-2-field (first (:fields inner-group))]
+ (is (= {:level-1 true :root-field true}
+ (:visible-if level-2-field)))))))
+
(deftest ^:parallel connection-props-server->client-detect-cycles-test
(testing "connection-props-server->client detects cycles in visible-if dependencies"
- (let [fake-props [{:name "prop-a", :visible-if {:prop-c "something"}}
- {:name "prop-b", :visible-if {:prop-a "something else"}}
- {:name "prop-c", :visible-if {:prop-b "something else entirely"}}]]
+ (let [fake-props [{:name "prop-a", :visible-if {:prop-c true}}
+ {:name "prop-b", :visible-if {:prop-a true}}
+ {:name "prop-c", :visible-if {:prop-b true}}]]
(is (thrown-with-msg?
clojure.lang.ExceptionInfo
#"Cycle detected"
@@ -302,3 +497,119 @@
(mt/with-premium-features #{:hosting}
(testing "does not include sqlite in hosted environment"
(is (not (contains? (driver.u/available-drivers) :sqlite)))))))
+
+(deftest ^:parallel process-connection-prop-test
+ (testing "process-connection-prop handles different property types"
+ (testing ":info type with getter function"
+ (let [info-prop {:name "test-info"
+ :type :info
+ :getter (constantly "Test message")}
+ result (#'driver.u/process-connection-prop info-prop)]
+ (is (= 1 (count result)))
+ (is (= "Test message" (:placeholder (first result))))
+ (is (nil? (:getter (first result))) "Getter should be removed after processing")))
+
+ (testing ":info type with nil getter returns empty vector"
+ (let [info-prop {:name "test-info"
+ :type :info
+ :getter (constantly nil)}
+ result (#'driver.u/process-connection-prop info-prop)]
+ (is (= [] result) "Should return empty vector when getter returns nil")))
+
+ (testing "regular property passes through unchanged"
+ (let [regular-prop {:name "host"
+ :type :string
+ :display-name "Host"}
+ result (#'driver.u/process-connection-prop regular-prop)]
+ (is (= [regular-prop] result))))
+
+ (testing ":group type with simple fields"
+ (let [group-prop {:type :group
+ :container-style ["grid"]
+ :fields [{:name "field1" :type :string}
+ {:name "field2" :type :integer}]}
+ result (#'driver.u/process-connection-prop group-prop)]
+ (is (= 1 (count result)))
+ (is (= :group (:type (first result))))
+ (is (= 2 (count (:fields (first result)))))))
+
+ (testing ":group type flattens vectors in :fields array"
+ (let [vector-of-props [{:name "tunnel-host" :type :string}
+ {:name "tunnel-port" :type :integer}]
+ group-prop {:type :group
+ :container-style ["backdrop"]
+ :fields [{:name "ssl" :type :boolean}
+ vector-of-props]}
+ result (#'driver.u/process-connection-prop group-prop)]
+ (is (= 1 (count result)))
+ (let [processed-group (first result)
+ fields (:fields processed-group)]
+ (is (= 3 (count fields)) "Vector should be flattened into 3 separate fields")
+ (is (= ["ssl" "tunnel-host" "tunnel-port"] (map :name fields))))))
+
+ (testing ":group type recursively processes :info fields"
+ (let [group-prop {:type :group
+ :fields [{:name "regular" :type :string}
+ {:name "info-field"
+ :type :info
+ :getter (constantly "Info message")}]}
+ result (#'driver.u/process-connection-prop group-prop)]
+ (is (= 1 (count result)))
+ (let [fields (:fields (first result))]
+ (is (= 2 (count fields)))
+ (is (= "Info message" (:placeholder (second fields))))
+ (is (nil? (:getter (second fields))) "Getter should be removed"))))
+
+ (testing ":group type handles nested groups"
+ (let [nested-group {:type :group
+ :fields [{:name "inner1" :type :string}
+ {:name "inner-info"
+ :type :info
+ :getter (constantly "Nested info")}]}
+ outer-group {:type :group
+ :fields [{:name "outer" :type :string}
+ nested-group]}
+ result (#'driver.u/process-connection-prop outer-group)]
+ (is (= 1 (count result)))
+ (let [outer-fields (:fields (first result))
+ inner-group (second outer-fields)
+ inner-fields (:fields inner-group)]
+ (is (= 2 (count outer-fields)))
+ (is (= :group (:type inner-group)))
+ (is (= 2 (count inner-fields)))
+ (is (= "Nested info" (:placeholder (second inner-fields)))))))))
+
+(deftest connection-props-server->client-processes-nested-groups-test
+ (testing "connection-props-server->client processes groups with nested fields and vectors correctly"
+ (let [mock-driver :test-driver
+ props [{:name "regular" :type :string}
+ {:name "top-level-info"
+ :type :info
+ :getter (constantly "Top level message")}
+ {:type :group
+ :container-style ["backdrop"]
+ :fields [{:name "ssl" :type :boolean}
+ [{:name "tunnel-host" :type :string}
+ {:name "tunnel-port" :type :integer}]
+ {:name "group-info"
+ :type :info
+ :getter (constantly "Group info message")}]}]
+ result (driver.u/connection-props-server->client mock-driver props)]
+
+ (testing "top-level :info property is processed"
+ (let [top-info (first (filter #(= "top-level-info" (:name %)) result))]
+ (is (some? top-info))
+ (is (= "Top level message" (:placeholder top-info)))))
+
+ (testing "group contains flattened fields"
+ (let [group (first (filter #(= :group (:type %)) result))
+ fields (:fields group)]
+ (is (= 4 (count fields)) "Should have 4 fields: ssl, tunnel-host, tunnel-port, group-info")
+ (is (= ["ssl" "tunnel-host" "tunnel-port" "group-info"] (map :name fields)))))
+
+ (testing ":info property inside group is processed"
+ (let [group (first (filter #(= :group (:type %)) result))
+ group-info (first (filter #(= "group-info" (:name %)) (:fields group)))]
+ (is (some? group-info))
+ (is (= "Group info message" (:placeholder group-info)))
+ (is (nil? (:getter group-info)) "Getter should be removed"))))))
diff --git a/test/metabase/driver_test.clj b/test/metabase/driver_test.clj
index 94e0cbe1c12..0b8bdb9afee 100644
--- a/test/metabase/driver_test.clj
+++ b/test/metabase/driver_test.clj
@@ -8,6 +8,7 @@
[metabase.driver.ddl.interface :as ddl.i]
[metabase.driver.impl :as driver.impl]
[metabase.driver.settings :as driver.settings]
+ [metabase.driver.util :as driver.u]
[metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.sync.task.sync-databases :as task.sync-databases]
@@ -49,19 +50,6 @@
(is (driver/available? "metabase.driver-test/test-driver")
"`driver/available?` should work for if `driver` is a string -- see #10135")))
-(defn- flatten-connection-properties
- "Recursively flatten connection properties, extracting all properties from groups.
- Groups have :type :group and contain a :fields array with nested properties."
- [props]
- (mapcat (fn [prop]
- (if (and (= (:type prop) :group)
- (seq (:fields prop)))
- ;; If it's a group, recursively flatten its fields
- (flatten-connection-properties (:fields prop))
- ;; Otherwise, return the property as-is
- [prop]))
- props))
-
(deftest ^:parallel unique-connection-property-test
;; abnormal usage here; we are not using the regular mt/test-driver or mt/test-drivers, because those involve
;; initializing the driver and test data namespaces, which don't necessarily exist for all drivers (ex:
@@ -69,17 +57,30 @@
;; so instead, just iterate through all drivers currently set to test by the environment, and check their
;; connection-properties; between all the different CI driver runs, this should cover everything
- (doseq [d (tx.env/test-drivers)]
- (testing (str d " has entirely unique connection property names")
- (let [props (driver/connection-properties d)
- flattened-props (flatten-connection-properties props)
- props-by-name (group-by :name flattened-props)]
- (is (= (count flattened-props) (count props-by-name))
- (format "Property(s) with duplicate name: %s" (-> (filter (fn [[_ props]]
- (> (count props) 1))
- props-by-name)
- vec
- pr-str)))))))
+ (letfn [(count-named-props [props]
+ ;; Recursively count all properties with :name, including within groups
+ (reduce (fn [acc prop]
+ (cond
+ (= :group (:type prop))
+ (+ acc (count-named-props (:fields prop)))
+
+ (:name prop)
+ (inc acc)
+
+ :else
+ acc))
+ 0
+ props))]
+ (doseq [d (tx.env/test-drivers)]
+ (testing (str d " has entirely unique connection property names")
+ (let [props (driver/connection-properties d)
+ props-by-name (driver.u/collect-all-props-by-name props)
+ total-props (count-named-props props)]
+ ;; If there are duplicate names, some will be overwritten in the map,
+ ;; so the map size will be less than the total count of named properties
+ (is (= total-props (count props-by-name))
+ (format "Property(s) with duplicate name: %d total properties but only %d unique names in %s"
+ total-props (count props-by-name) d)))))))
(deftest supports-schemas-matches-describe-database-test
(mt/test-drivers (mt/normal-drivers)