Skip to content

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

Fix order-dependent transform permissions in tests (#81404)

Ben Grabowb7d74aab6df6
diff --git a/test/metabase/permissions/test_util.clj b/test/metabase/permissions/test_util.clj
index bf714d29518..4d71abe9295 100644
--- a/test/metabase/permissions/test_util.clj
+++ b/test/metabase/permissions/test_util.clj
@@ -171,6 +171,21 @@
[group-or-id db-id perm-type value & body]
`(do-with-db-perm-for-group! ~group-or-id ~db-id ~perm-type ~value (fn [] ~@body)))
+(defn do-with-db-perms-for-group!
+ "Implementation of `with-db-perms-for-group!`. Sets several data permissions for the given database to the given
+ values for the given permission group for the duration of the test."
+ [group-or-id db-id perm-type->value thunk]
+ (with-restored-data-perms-for-group! (u/the-id group-or-id)
+ (doseq [[perm-type value] perm-type->value]
+ (data-perms/set-database-permission! group-or-id db-id perm-type value))
+ (thunk)))
+
+(defmacro with-db-perms-for-group!
+ "Runs `body`, and sets several data permissions for the given database to the given values for the given permission
+ group for the duration of the test."
+ [group-or-id db-id perm-type->value & body]
+ `(do-with-db-perms-for-group! ~group-or-id ~db-id ~perm-type->value (fn [] ~@body)))
+
(defn do-with-data-analyst-role!
"Implementation of `with-data-analyst-role!`. Sets the `is_data_analyst` column to true for the given user
for the duration of the test, then restores the original value."
diff --git a/test/metabase/test.clj b/test/metabase/test.clj
index a220a397af4..e023c9a1827 100644
--- a/test/metabase/test.clj
+++ b/test/metabase/test.clj
@@ -187,6 +187,7 @@
with-no-data-perms-for-all-users!
with-full-data-perms-for-all-users!
with-db-perm-for-group!
+ with-db-perms-for-group!
with-perm-for-group!
with-perm-for-group-and-table!
with-data-analyst-role!]
diff --git a/test/metabase/transforms_rest/api/transform_test.clj b/test/metabase/transforms_rest/api/transform_test.clj
index bb49240bfec..48520a59140 100644
--- a/test/metabase/transforms_rest/api/transform_test.clj
+++ b/test/metabase/transforms_rest/api/transform_test.clj
@@ -159,7 +159,8 @@
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (mt/with-db-perms-for-group! (perms-group/all-users) (mt/id) {:perms/transforms :yes
+ :perms/create-queries :query-builder-and-native}
(with-transform-cleanup! [table-name "gadget_products"]
(testing "Can create a transform with a param"
(let [query (lib/native-query (mt/metadata-provider) "select * from foo [[where {{id}} = id]]")
@@ -179,7 +180,8 @@
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (mt/with-db-perms-for-group! (perms-group/all-users) (mt/id) {:perms/transforms :yes
+ :perms/create-queries :query-builder-and-native}
(with-transform-cleanup! [table-name "gadget_products"]
(testing "Cannot create a transform with a required param"
(let [base-query (lib/native-query (mt/metadata-provider) "select * from foo where {{id}} = id")
@@ -205,7 +207,8 @@
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (mt/with-db-perms-for-group! (perms-group/all-users) (mt/id) {:perms/transforms :yes
+ :perms/create-queries :query-builder-and-native}
(with-transform-cleanup! [table-name "gadget_products"]
(testing "Cannot create a transform with a param that is necessary but not marked as required"
(let [query (lib/native-query (mt/metadata-provider) "select * from foo where {{id}} = id")
@@ -392,7 +395,8 @@
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (mt/with-db-perms-for-group! (perms-group/all-users) (mt/id) {:perms/transforms :yes
+ :perms/create-queries :query-builder-and-native}
(testing "MBQL query transforms are detected as :mbql"
(with-transform-cleanup! [table-name "mbql_transform"]
(let [mbql-query (mt/mbql-query transforms_products)
@@ -423,7 +427,8 @@
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
(mt/with-data-analyst-role! (mt/user->id :lucky)
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (mt/with-db-perms-for-group! (perms-group/all-users) (mt/id) {:perms/transforms :yes
+ :perms/create-queries :query-builder-and-native}
(with-transform-cleanup! [table-name "type_update_transform"]
(let [native-query (lib/native-query (mt/metadata-provider) "SELECT 1")
mbql-query (mt/mbql-query transforms_products)
@@ -2103,7 +2108,8 @@
(mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (mt/with-db-perms-for-group! (perms-group/all-users) (mt/id) {:perms/transforms :yes
+ :perms/create-queries :query-builder-and-native}
(mt/with-data-analyst-role! (mt/user->id :lucky)
(with-transform-cleanup! [table-name "field_filter_default_output"]
(let [mp (mt/metadata-provider)
@@ -2136,7 +2142,8 @@
(mt/with-premium-features #{:transforms-basic :hosting}
(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)
(mt/dataset transforms-dataset/transforms-test
- (mt/with-db-perm-for-group! (perms-group/all-users) (mt/id) :perms/transforms :yes
+ (mt/with-db-perms-for-group! (perms-group/all-users) (mt/id) {:perms/transforms :yes
+ :perms/create-queries :query-builder-and-native}
(mt/with-data-analyst-role! (mt/user->id :lucky)
(with-transform-cleanup! [table-name "table_tag_output"]
(let [source-table-id (mt/id :transforms_products)