The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
add starburst ssh (#66568)
Riley Thompson88a6c07b9ca8
diff --git a/modules/drivers/starburst/resources/metabase-plugin.yaml b/modules/drivers/starburst/resources/metabase-plugin.yamlindex 302f43b0394..0a7dc9748fc 100644--- a/modules/drivers/starburst/resources/metabase-plugin.yaml+++ b/modules/drivers/starburst/resources/metabase-plugin.yaml@@ -40,6 +40,7 @@ driver:required: falsedefault: falsedescription: Requires Starburst Galaxy, Starburst Enterprise (version 420-e or higher), or Trino (version 418 or higher)+ - ssh-tunnel- advanced-options-start- merge:- additional-optionsdiff --git a/modules/drivers/starburst/src/metabase/driver/starburst.clj b/modules/drivers/starburst/src/metabase/driver/starburst.cljindex ec9a9c25f1a..9bc5095df72 100644--- a/modules/drivers/starburst/src/metabase/driver/starburst.clj+++ b/modules/drivers/starburst/src/metabase/driver/starburst.clj@@ -907,7 +907,7 @@(defn- jdbc-spec"Creates a spec for `clojure.java.jdbc` to use for connecting to starburst via JDBC, from the given `opts`."[{:keys [host port catalog schema]- :or {host "localhost", port 5432, catalog ""}+ :or {host "localhost", port 8080, catalog ""}:as details}](-> details(merge {:classname "io.trino.jdbc.TrinoDriver"diff --git a/modules/drivers/starburst/test/metabase/test/data/starburst.clj b/modules/drivers/starburst/test/metabase/test/data/starburst.cljindex c51d83be5ab..3e03a8b101e 100644--- a/modules/drivers/starburst/test/metabase/test/data/starburst.clj+++ b/modules/drivers/starburst/test/metabase/test/data/starburst.clj@@ -49,7 +49,7 @@(defmethod tx/dbdef->connection-details :starburst[_ _ {:keys [database-name]}]{:host (tx/db-test-env-var-or-throw :starburst :host "localhost")- :port (tx/db-test-env-var :starburst :port "8080")+ :port (tx/db-test-env-var :starburst :port 8080):user (tx/db-test-env-var-or-throw :starburst :user "metabase"):additional-options (tx/db-test-env-var :starburst :additional-options nil):prepared-optimized (tx/db-test-env-var :starburst :prepared-optimized (not= (System/getProperty "explicitPrepare" "true") "true"))diff --git a/src/metabase/driver/sql_jdbc/connection/ssh_tunnel.clj b/src/metabase/driver/sql_jdbc/connection/ssh_tunnel.cljindex eb023e98cae..16f78c68cd1 100644--- a/src/metabase/driver/sql_jdbc/connection/ssh_tunnel.clj+++ b/src/metabase/driver/sql_jdbc/connection/ssh_tunnel.clj@@ -100,10 +100,11 @@[details](if (use-ssh-tunnel? details)(let [[_ proto host] (re-find #"(.*://)?(.*)" (:host details))- [session ^PortForwardingTracker tracker] (start-ssh-tunnel! (assoc details :host host))+ orig-port (let [p (:port details)]+ (if (string? p) (Integer/parseInt p) p))+ [session ^PortForwardingTracker tracker] (start-ssh-tunnel! (assoc details :host host :port orig-port))tunnel-entrance-port (.. tracker getBoundAddress getPort)tunnel-entrance-host (.. tracker getBoundAddress getHostName)- orig-port (:port details)details-with-tunnel (assoc details:port tunnel-entrance-port ;; This parameter is set dynamically when the connection is established:host (str proto "localhost") ;; SSH tunnel will always be through localhost