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
Fix: Support Google Cloud Universe Domain in BigQuery driver (#68607)
Merlin-S3NSe433af3f9014
diff --git a/modules/drivers/bigquery-cloud-sdk/resources/metabase/bigquery-cloud-sdk/metabase-plugin.yaml b/modules/drivers/bigquery-cloud-sdk/resources/metabase/bigquery-cloud-sdk/metabase-plugin.yamlindex dea2822647d..039748659d3 100644--- a/modules/drivers/bigquery-cloud-sdk/resources/metabase/bigquery-cloud-sdk/metabase-plugin.yaml+++ b/modules/drivers/bigquery-cloud-sdk/resources/metabase/bigquery-cloud-sdk/metabase-plugin.yaml@@ -42,6 +42,14 @@ driver:type: stringvisible-if:advanced-options: true+ - name: universe-domain+ display-name: Universe Domain+ helper-text: The Google Cloud Universe Domain to use (e.g. googleapis.com or s3nsapis.fr).+ placeholder: googleapis.com+ required: false+ type: string+ visible-if:+ advanced-options: true- default-advanced-optionsextra:db-routing-info:diff --git a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.cljindex 0ab1b61027b..a4873d72c51 100644--- a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj+++ b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj@@ -117,6 +117,9 @@user-agent (format "Metabase/%s (GPN:Metabase; %s)" mb-version run-mode)header-provider (FixedHeaderProvider/create(ImmutableMap/of "user-agent" user-agent))+ universe-domain (or (:universe-domain details)+ (System/getenv "GOOGLE_CLOUD_UNIVERSE_DOMAIN")+ (System/getProperty "google.cloud.universe_domain"))read-timeout-ms driver.settings/*query-timeout-ms*transport-options (-> (HttpTransportOptions/newBuilder)(.setReadTimeout read-timeout-ms)@@ -125,6 +128,8 @@(.setCredentials creds)(.setHeaderProvider header-provider)(.setTransportOptions transport-options))]+ (when universe-domain+ (.setUniverseDomain bq-bldr universe-domain))(when-let [host (not-empty (:host details))](.setHost bq-bldr host))(.. bq-bldr build getService)))