Skip to content

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

Replace snowflake test password auth with key pair auth (#65522)

Riley Thompsondded0d225a01
diff --git a/.github/workflows/drivers.yml b/.github/workflows/drivers.yml
index f4d29700768..78179cb7690 100644
--- a/.github/workflows/drivers.yml
+++ b/.github/workflows/drivers.yml
@@ -1031,75 +1031,73 @@ jobs:
upload-logs: ${{ steps.test-driver.outcome == 'failure' }}
logs-artifact-suffix: ${{ matrix.job.name }} ${{ matrix.version.name }}
- # dan sutton 2025-10-23: disable snowflake because of account
- # issues. https://linear.app/metabase/issue/DEV-997/reenable-snowflake-in-ci. Note that the transforms tests were
- # disabled previously
- # be-tests-snowflake-ee:
- # if: ${{ !inputs.skip }}
- # runs-on: ubuntu-22.04
- # timeout-minutes: 60
- # strategy:
- # fail-fast: false
- # matrix:
- # job:
- # - name: Driver Tests
- # test-args: >-
- # :only-tags [:mb/driver-tests]
- # :exclude-tags [:mb/transforms-python-test]
+ be-tests-snowflake-ee:
+ if: ${{ !inputs.skip }}
+ runs-on: ubuntu-22.04
+ timeout-minutes: 60
+ strategy:
+ fail-fast: false
+ matrix:
+ job:
+ - name: Driver Tests
+ test-args: >-
+ :only-tags [:mb/driver-tests]
+ :exclude-tags [:mb/transforms-python-test]
# DS 2025-09-26 temporarily disabled while we diagnose flakes
# - name: Transforms Python Tests
# test-args: >-
# :only-tags [:mb/transforms-python-test]
# needs-python-runner: true
- # env:
- # CI: 'true'
- # DRIVERS: snowflake
- # MB_SNOWFLAKE_TEST_USER: METABASE CI
- # MB_SNOWFLAKE_TEST_ACCOUNT: ${{ secrets.MB_SNOWFLAKE_TEST_ACCOUNT }}
- # MB_SNOWFLAKE_TEST_PASSWORD: ${{ secrets.MB_SNOWFLAKE_TEST_PASSWORD }}
- # MB_SNOWFLAKE_TEST_WAREHOUSE: ${{ secrets.MB_SNOWFLAKE_TEST_WAREHOUSE }}
- # MB_SNOWFLAKE_TEST_PK_USER: METABASE PK
- # MB_SNOWFLAKE_TEST_PK_PRIVATE_KEY: ${{ secrets.MB_SNOWFLAKE_TEST_PK_PRIVATE_KEY }}
- # MB_SNOWFLAKE_TEST_PK_PRIVATE_KEY_2: ${{ secrets.MB_SNOWFLAKE_TEST_PK_PRIVATE_KEY_2 }}
- # MB_SNOWFLAKE_TEST_PK_PUBLIC_KEY: ${{ secrets.MB_SNOWFLAKE_TEST_PK_PUBLIC_KEY }}
- # MB_SNOWFLAKE_TEST_PK_PUBLIC_KEY_2: ${{ secrets.MB_SNOWFLAKE_TEST_PK_PUBLIC_KEY_2 }}
+ env:
+ CI: 'true'
+ DRIVERS: snowflake
+ MB_SNOWFLAKE_TEST_USER: METABASE CI
+ MB_SNOWFLAKE_TEST_ACCOUNT: ${{ secrets.MB_SNOWFLAKE_TEST_ACCOUNT }}
+ MB_SNOWFLAKE_TEST_PASSWORD: ${{ secrets.MB_SNOWFLAKE_TEST_PASSWORD }}
+ MB_SNOWFLAKE_TEST_PRIVATE_KEY: ${{ secrets.MB_SNOWFLAKE_TEST_PRIVATE_KEY }}
+ MB_SNOWFLAKE_TEST_WAREHOUSE: ${{ secrets.MB_SNOWFLAKE_TEST_WAREHOUSE }}
+ MB_SNOWFLAKE_TEST_PK_USER: METABASE PK
+ MB_SNOWFLAKE_TEST_PK_PRIVATE_KEY: ${{ secrets.MB_SNOWFLAKE_TEST_PK_PRIVATE_KEY }}
+ MB_SNOWFLAKE_TEST_PK_PRIVATE_KEY_2: ${{ secrets.MB_SNOWFLAKE_TEST_PK_PRIVATE_KEY_2 }}
+ MB_SNOWFLAKE_TEST_PK_PUBLIC_KEY: ${{ secrets.MB_SNOWFLAKE_TEST_PK_PUBLIC_KEY }}
+ MB_SNOWFLAKE_TEST_PK_PUBLIC_KEY_2: ${{ secrets.MB_SNOWFLAKE_TEST_PK_PUBLIC_KEY_2 }}
- # # RSA Role testing:
- # MB_SNOWFLAKE_TEST_RSA_ROLE_TEST_DEFAULT_USER: RSA_ROLE_TEST_DEFAULT_USER
- # MB_SNOWFLAKE_TEST_RSA_ROLE_TEST_CUSTOM_USER: RSA_ROLE_TEST_CUSTOM_USER
- # MB_SNOWFLAKE_TEST_RSA_ROLE_TEST_ROLE: RSA_ROLE_TEST_ROLE
- # MB_SNOWFLAKE_TEST_RSA_ROLE_TEST_DB: RSA_ROLE_TEST_DB
- # name: Snowflake ${{ matrix.job.name }}
- # steps:
- # - uses: actions/checkout@v4
- # - name: Setup python-runner
- # if: ${{ matrix.job.needs-python-runner == true }}
- # uses: ./.github/actions/setup-python-runner
- # with:
- # metabase-automation-token: ${{ secrets.METABASE_AUTOMATION_USER_TOKEN }}
- # - name: Test Snowflake driver
- # id: test-driver
- # uses: ./.github/actions/test-driver
- # with:
- # junit-name: 'be-tests-snowflake-ee'
- # test-args: ${{ matrix.job.test-args }}
- # - name: Upload Test Results
- # uses: ./.github/actions/upload-test-results
- # if: always()
- # with:
- # input-path: ./target/junit/
- # output-name: ${{ github.job }}
- # bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
- # aws-access-key-id: ${{ secrets.AWS_TEST_RESULTS_ACCESS_KEY_ID }}
- # aws-secret-access-key: ${{ secrets.AWS_TEST_RESULTS_SECRET_ACCESS_KEY }}
- # aws-region: ${{ vars.AWS_REGION }}
- # trunk-api-token: ${{ secrets.TRUNK_API_TOKEN }}
- # - name: Cleanup python-runner
- # if: ${{ always() && matrix.job.needs-python-runner == true }}
- # uses: ./.github/actions/cleanup-python-runner
- # with:
- # upload-logs: ${{ steps.test-driver.outcome == 'failure' }}
- # logs-artifact-suffix: ${{ matrix.job.name }} ${{ matrix.version.name }}
+ # RSA Role testing:
+ MB_SNOWFLAKE_TEST_RSA_ROLE_TEST_DEFAULT_USER: RSA_ROLE_TEST_DEFAULT_USER
+ MB_SNOWFLAKE_TEST_RSA_ROLE_TEST_CUSTOM_USER: RSA_ROLE_TEST_CUSTOM_USER
+ MB_SNOWFLAKE_TEST_RSA_ROLE_TEST_ROLE: RSA_ROLE_TEST_ROLE
+ MB_SNOWFLAKE_TEST_RSA_ROLE_TEST_DB: RSA_ROLE_TEST_DB
+ name: Snowflake ${{ matrix.job.name }}
+ steps:
+ - uses: actions/checkout@v4
+ - name: Setup python-runner
+ if: ${{ matrix.job.needs-python-runner == true }}
+ uses: ./.github/actions/setup-python-runner
+ with:
+ metabase-automation-token: ${{ secrets.METABASE_AUTOMATION_USER_TOKEN }}
+ - name: Test Snowflake driver
+ id: test-driver
+ uses: ./.github/actions/test-driver
+ with:
+ junit-name: 'be-tests-snowflake-ee'
+ test-args: ${{ matrix.job.test-args }}
+ - name: Upload Test Results
+ uses: ./.github/actions/upload-test-results
+ if: always()
+ with:
+ input-path: ./target/junit/
+ output-name: ${{ github.job }}
+ bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
+ aws-access-key-id: ${{ secrets.AWS_TEST_RESULTS_ACCESS_KEY_ID }}
+ aws-secret-access-key: ${{ secrets.AWS_TEST_RESULTS_SECRET_ACCESS_KEY }}
+ aws-region: ${{ vars.AWS_REGION }}
+ trunk-api-token: ${{ secrets.TRUNK_API_TOKEN }}
+ - name: Cleanup python-runner
+ if: ${{ always() && matrix.job.needs-python-runner == true }}
+ uses: ./.github/actions/cleanup-python-runner
+ with:
+ upload-logs: ${{ steps.test-driver.outcome == 'failure' }}
+ logs-artifact-suffix: ${{ matrix.job.name }} ${{ matrix.version.name }}
be-tests-sparksql-ee:
needs: determine-driver-skips
@@ -1363,8 +1361,7 @@ jobs:
- be-tests-postgres
- be-tests-presto-jdbc-ee
- be-tests-redshift-ee
- # dan: disabled for account reasons. https://linear.app/metabase/issue/DEV-997/reenable-snowflake-in-ci
- # - be-tests-snowflake-ee
+ - be-tests-snowflake-ee
- be-tests-sparksql-ee
- be-tests-sqlite-ee
- be-tests-sqlserver
diff --git a/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj b/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj
index ff0e7896e99..9201a928168 100644
--- a/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/impersonation/driver_test.clj
@@ -210,10 +210,17 @@
[driver {:keys [details]}]
(assoc details :role (impersonation-default-user driver)))
-(doseq [driver [:postgres :snowflake]]
- (defmethod impersonation-details driver
- [_driver {:keys [details]}]
- details))
+(defmethod impersonation-details :snowflake
+ [driver {:keys [details]}]
+ (let [priv-key (tx/db-test-env-var-or-throw driver :private-key)]
+ (merge (dissoc details :private-key-id)
+ {:private-key-options "uploaded"
+ :private-key-value (mt/priv-key->base64-uri priv-key)
+ :use-password false})))
+
+(defmethod impersonation-details :postgres
+ [_driver {:keys [details]}]
+ details)
(deftest conn-impersonation-simple-test
(mt/test-drivers (mt/normal-drivers-with-feature :connection-impersonation)
diff --git a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj b/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
index 30a04e18dc1..5c8101f66b9 100644
--- a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
+++ b/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
@@ -108,8 +108,10 @@
(format "jdbc:snowflake:%s" sub))
(format "jdbc:snowflake://%s.snowflakecomputing.com" account))
opts-str (sql-jdbc.common/additional-opts->string :url
- {:user (codec/url-encode user)
- :private_key_file (codec/url-encode (.getCanonicalPath ^File private-key-file))})
+ (cond-> {:user (codec/url-encode user)
+ :private_key_file (codec/url-encode (.getCanonicalPath ^File private-key-file))}
+ (:db details)
+ (assoc :db (codec/url-encode (:db details)))))
new-conn-uri (sql-jdbc.common/conn-str-with-additional-opts existing-conn-uri :url opts-str)]
(-> details
(assoc :connection-uri new-conn-uri)
diff --git a/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj b/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj
index 93466c12350..ba1f79fd42b 100644
--- a/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj
+++ b/modules/drivers/snowflake/test/metabase/driver/snowflake_test.clj
@@ -80,7 +80,7 @@
(mt/run-mbql-query attempts
{:aggregation [[:count]]})))))))
-(deftest ^:parallel describe-fields-test
+(deftest ^:sequential describe-fields-test
(mt/test-driver
:snowflake
(is (=? [{:name "id"
@@ -239,7 +239,7 @@
(is (= ["SELECT TRUE AS \"_\" FROM \"PUBLIC\".\"table\" WHERE 1 <> 1 LIMIT 0"]
(sql-jdbc.describe-database/simple-select-probe-query :snowflake "PUBLIC" "table")))))))
-(deftest ^:parallel have-select-privilege?-test
+(deftest ^:sequential have-select-privilege?-test
(mt/test-driver :snowflake
(qp.store/with-metadata-provider (mt/id)
(sql-jdbc.execute/do-with-connection-with-options
@@ -249,13 +249,17 @@
(fn [^java.sql.Connection conn]
(is (sql-jdbc.sync/have-select-privilege? :snowflake conn "PUBLIC" "venues")))))))
-(deftest ^:parallel can-set-schema-in-additional-options
+(deftest ^:sequential can-set-schema-in-additional-options
(mt/test-driver :snowflake
(qp.store/with-metadata-provider (mt/id)
(let [schema "INFORMATION_SCHEMA"
- details (-> (mt/db)
- (assoc-in [:details :additional-options] (format "schema=%s" schema))
- :details)]
+ db-details (:details (mt/db))
+ details (-> db-details
+ (assoc :additional-options (format "schema=%s" schema))
+ (dissoc :private-key-id)
+ (assoc :private-key-options "uploaded")
+ (assoc :private-key-value (mt/priv-key->base64-uri (tx/db-test-env-var-or-throw :snowflake :private-key)))
+ (assoc :use-password false))]
(sql-jdbc.conn/with-connection-spec-for-testing-connection [spec [:snowflake details]]
(is (= [{:s schema}] (jdbc/query spec ["select CURRENT_SCHEMA() s"])))
(is (= 1 (count (jdbc/query spec ["select * from \"TABLES\" limit 1"])))))))))
@@ -435,7 +439,7 @@
#_{:clj-kondo/ignore [:deprecated-var]}
(is (= #{} (driver/describe-table-fks :snowflake (mt/db) dynamic-table)))))))))))
-(deftest ^:parallel describe-table-test
+(deftest ^:sequential describe-table-test
(mt/test-driver :snowflake
(testing "make sure describe-table uses the NAME FROM DETAILS too"
(is (= {:name "categories"
@@ -459,7 +463,7 @@
:json-unfolding false}}}
(driver/describe-table :snowflake (assoc (mt/db) :name "ABC") (t2/select-one :model/Table :id (mt/id :categories))))))))
-(deftest ^:parallel describe-table-fks-test
+(deftest ^:sequential describe-table-fks-test
(mt/test-driver :snowflake
(testing "make sure describe-table-fks uses the NAME FROM DETAILS too"
(is (= #{{:fk-column-name "category_id"
@@ -468,11 +472,6 @@
#_{:clj-kondo/ignore [:deprecated-var]}
(driver/describe-table-fks :snowflake (assoc (mt/db) :name "ABC") (t2/select-one :model/Table :id (mt/id :venues))))))))
-(defn- format-env-key ^String [env-key]
- (let [[_ header body footer]
- (re-find #"(?s)(-----BEGIN (?:\p{Alnum}+ )?PRIVATE KEY-----)(.*)(-----END (?:\p{Alnum}+ )?PRIVATE KEY-----)" env-key)]
- (str header (str/replace body #"\s+|\\n" "\n") footer)))
-
(deftest can-change-from-password-test
(mt/test-driver
:snowflake
@@ -501,7 +500,7 @@
(sql-jdbc.conn/connection-details->spec :snowflake (assoc details :use-password false :private-key-value pk-key)))))))
(deftest can-connect-test
- (let [pk-key (format-env-key (tx/db-test-env-var-or-throw :snowflake :pk-private-key))
+ (let [pk-key (mt/format-env-key (tx/db-test-env-var-or-throw :snowflake :pk-private-key))
pk-user (tx/db-test-env-var :snowflake :pk-user)
pk-db (tx/db-test-env-var :snowflake :pk-db "SNOWFLAKE_SAMPLE_DATA")]
(mt/test-driver :snowflake
@@ -570,7 +569,7 @@
(deftest maybe-test-and-migrate-details!-test
;; We create very ambiguous database details and loop over which version should succeed on connect.
- (let [pk-key (format-env-key (tx/db-test-env-var-or-throw :snowflake :pk-private-key))
+ (let [pk-key (mt/format-env-key (tx/db-test-env-var-or-throw :snowflake :pk-private-key))
pk-user (tx/db-test-env-var-or-throw :snowflake :pk-user)
pk-db (tx/db-test-env-var-or-throw :snowflake :pk-db "SNOWFLAKE_SAMPLE_DATA")]
(mt/test-driver
@@ -606,7 +605,7 @@
(with-redefs [driver/can-connect? (fn [_ d] (= d (assoc details-to-succeed :engine :snowflake)))]
(testing (format "use-password: %s private-key-options: %s uses-secret? %s" use-password options uses-secret?)
(spit pk-path pk-key)
- (is (= 4 (count all-possible-details)))
+ (is (= 3 (count all-possible-details)))
(t2/update! (t2/table-name :model/Database) (mt/id) {:details (json/encode details)})
(testing "Connection succeeds and migration occurs"
(log/with-no-logs
@@ -619,7 +618,7 @@
migrating-to (edn/read-string (str/replace (:message (second msgs)) success-re "$1"))
success-keys (set (keys details-to-succeed))
[_ keys-removed _] (data/diff success-keys (set (keys details)))]
- (is (=? [{:level :info, :message "Attempting to connect to 4 possible legacy details"}
+ (is (=? [{:level :info, :message "Attempting to connect to 3 possible legacy details"}
{:level :info, :message success-re}]
msgs))
(is (= {:keys success-keys
@@ -652,7 +651,7 @@
warehouse (tx/db-test-env-var-or-throw :snowflake :warehouse)
;; User with default role PULIC. To access the db custom role has to be used.
user (tx/db-test-env-var-or-throw :snowflake :rsa-role-test-custom-user)
- private-key-value (format-env-key (tx/db-test-env-var-or-throw :snowflake :pk-private-key))
+ private-key-value (mt/format-env-key (tx/db-test-env-var-or-throw :snowflake :pk-private-key))
db (tx/db-test-env-var-or-throw :snowflake :rsa-role-test-db)
database {:name "Snowflake RSA test DB custom"
:engine :snowflake
@@ -711,7 +710,7 @@
warehouse (tx/db-test-env-var-or-throw :snowflake :warehouse)
;; User with default role PULIC. To access the db custom role has to be used.
user (tx/db-test-env-var-or-throw :snowflake :rsa-role-test-default-user)
- private-key-value (format-env-key (tx/db-test-env-var-or-throw :snowflake :pk-private-key))
+ private-key-value (mt/format-env-key (tx/db-test-env-var-or-throw :snowflake :pk-private-key))
db (tx/db-test-env-var-or-throw :snowflake :rsa-role-test-db)
database {:name "Snowflake RSA test DB default"
:engine :snowflake
@@ -850,7 +849,7 @@
#t "2024-04-25T14:44:00-07:00"
"2024-04-25T14:44:00-07:00")))
-(deftest ^:parallel zoned-date-time-parameter-test
+(deftest ^:sequential zoned-date-time-parameter-test
(test-temporal-instance
#t "2024-04-25T14:44:00-07:00[US/Pacific]"
"2024-04-25T21:44:00Z"))
@@ -1035,7 +1034,7 @@
(is (not (contains? params "ROLE")))
(is (contains? params "ASDFROLE")))))
-(deftest ^:parallel filter-on-variant-column-test
+(deftest ^:sequential filter-on-variant-column-test
(testing "We should still let you do various filter types on VARIANT (anything) columns (#45206)"
(mt/test-driver :snowflake
(let [variant-base-type (sql-jdbc.sync/database-type->base-type :snowflake :VARIANT)
@@ -1246,24 +1245,19 @@
(is (true? (sql-jdbc.sync.interface/have-select-privilege?
driver/*driver* conn schema table-name))))))))))))
-(defn- priv-key->base64 [priv-key-var]
- (-> (tx/db-test-env-var-or-throw :snowflake priv-key-var)
- format-env-key
- u/string-to-bytes
- mt/bytes->base64-data-uri))
-
(defn- get-db-priv-key [db]
(-> (:details db)
(#'driver.snowflake/resolve-private-key)
:private_key_file
slurp))
-(defn- get-priv-key-details [details pk-user priv-key]
- (merge (dissoc details :password)
- {:user pk-user
- :private-key-options "uploaded"
- :private-key-value (priv-key->base64 priv-key)
- :use-password false}))
+(defn- get-priv-key-details [details pk-user priv-key-var]
+ (let [priv-key (tx/db-test-env-var-or-throw :snowflake priv-key-var)]
+ (merge (dissoc details :password)
+ {:user pk-user
+ :private-key-options "uploaded"
+ :private-key-value (mt/priv-key->base64-uri priv-key)
+ :use-password false})))
(deftest private-key-file-updated-test
(mt/test-driver :snowflake
diff --git a/modules/drivers/snowflake/test/metabase/test/data/snowflake.clj b/modules/drivers/snowflake/test/metabase/test/data/snowflake.clj
index e8e164de5af..5c482b59305 100644
--- a/modules/drivers/snowflake/test/metabase/test/data/snowflake.clj
+++ b/modules/drivers/snowflake/test/metabase/test/data/snowflake.clj
@@ -5,6 +5,7 @@
[metabase.driver :as driver]
[metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
[metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
+ [metabase.test :as mt]
[metabase.test.data.impl :as data.impl]
[metabase.test.data.interface :as tx]
[metabase.test.data.sql :as sql.tx]
@@ -52,7 +53,9 @@
(merge
{:account (tx/db-test-env-var-or-throw :snowflake :account)
:user (tx/db-test-env-var-or-throw :snowflake :user)
- :password (tx/db-test-env-var-or-throw :snowflake :password)
+ :private-key-options "uploaded"
+ :private-key-value (mt/priv-key->base64-uri (tx/db-test-env-var-or-throw :snowflake :private-key))
+ :use-password false
:additional-options (tx/db-test-env-var :snowflake :additional-options)
;; this lowercasing this value is part of testing the fix for
;; https://github.com/metabase/metabase/issues/9511
diff --git a/test/metabase/driver/sql_jdbc/sync/describe_database_test.clj b/test/metabase/driver/sql_jdbc/sync/describe_database_test.clj
index bb8ce4c9087..7880a075626 100644
--- a/test/metabase/driver/sql_jdbc/sync/describe_database_test.clj
+++ b/test/metabase/driver/sql_jdbc/sync/describe_database_test.clj
@@ -16,6 +16,7 @@
^{:clj-kondo/ignore [:deprecated-namespace]} [metabase.query-processor.store :as qp.store]
[metabase.sync.core :as sync]
[metabase.test :as mt]
+ [metabase.test.data.interface :as tx]
[metabase.test.data.one-off-dbs :as one-off-dbs]
[metabase.test.fixtures :as fixtures]
[metabase.util :as u]
@@ -174,6 +175,30 @@
[_driver _feature _database]
false))
+(defmulti filtered-db-details
+ "Returns database details for the filtered database tests."
+ {:arglists '([driver filter-type-prop filter-type patterns-type-prop pattern])}
+ tx/dispatch-on-driver-with-test-extensions
+ :hierarchy #'driver/hierarchy)
+
+(defmethod filtered-db-details :default
+ [_driver filter-type-prop filter-type patterns-type-prop pattern]
+ (-> (mt/db)
+ :details
+ (assoc filter-type-prop filter-type
+ patterns-type-prop pattern)))
+
+(defmethod filtered-db-details :snowflake
+ [_driver filter-type-prop filter-type patterns-type-prop pattern]
+ (-> (mt/db)
+ :details
+ (assoc filter-type-prop filter-type
+ patterns-type-prop pattern)
+ (dissoc :private-key-id)
+ (assoc :private-key-options "uploaded"
+ :private-key-value (mt/priv-key->base64-uri (tx/db-test-env-var-or-throw :snowflake :private-key))
+ :use-password false)))
+
(deftest database-schema-filtering-test
(mt/test-drivers (set/intersection (schema-filtering-drivers)
(mt/normal-drivers-with-feature ::database-schema-filtering-test))
@@ -186,10 +211,8 @@
(sync-and-assert-filtered-tables
{:name (format "Test %s DB with dataset inclusion filters" driver)
:engine driver
- :details (-> (mt/db)
- :details
- (assoc filter-type-prop "inclusion"
- patterns-type-prop "s*,v*,2*"))}
+ :details (filtered-db-details driver filter-type-prop "inclusion"
+ patterns-type-prop "public.s*,public.v*,public.2*")}
(fn [{schema-name :schema}]
(testing (format "schema name = %s" (pr-str schema-name))
(is (contains? #{\s \v \2} (first schema-name)))))))
@@ -197,10 +220,8 @@
(sync-and-assert-filtered-tables
{:name (format "Test %s DB with dataset exclusion filters" driver)
:engine driver
- :details (-> (mt/db)
- :details
- (assoc filter-type-prop "exclusion"
- patterns-type-prop "v*"))}
+ :details (filtered-db-details driver filter-type-prop "exclusion"
+ patterns-type-prop "v*")}
(fn [{schema-name :schema}]
(testing (format "schema name = %s" (pr-str schema-name))
(is (not= \v (first schema-name)))))))))))
diff --git a/test/metabase/test.clj b/test/metabase/test.clj
index cd6a2a4f034..1bf82d7b794 100644
--- a/test/metabase/test.clj
+++ b/test/metabase/test.clj
@@ -264,6 +264,8 @@
file->bytes
file-path->bytes
bytes->base64-data-uri
+ format-env-key
+ priv-key->base64-uri
latest-audit-log-entry
let-url
metric-value
diff --git a/test/metabase/test/util.clj b/test/metabase/test/util.clj
index e1a0cb0fb2d..00f7bc2028f 100644
--- a/test/metabase/test/util.clj
+++ b/test/metabase/test/util.clj
@@ -1552,6 +1552,16 @@
[^bytes bs]
(str "data:application/octet-stream;base64," (u/encode-base64-bytes bs)))
+(defn format-env-key ^String [env-key]
+ (let [[_ header body footer]
+ (re-find #"(?s)(-----BEGIN (?:\p{Alnum}+ )?PRIVATE KEY-----)(.*)(-----END (?:\p{Alnum}+ )?PRIVATE KEY-----)" env-key)]
+ (str header (str/replace body #"\s+|\\n" "\n") footer)))
+
+(defn priv-key->base64-uri [priv-key]
+ (-> (format-env-key priv-key)
+ u/string-to-bytes
+ bytes->base64-data-uri))
+
(defn works-after
"Returns a function which works as `f` except that on the first `n` calls an
exception is thrown instead.