Skip to content

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

Decouple foundation modules from cyclic cluster (#83441)

Chris Truterca08e86675b4
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 208fd6a560c..44c8ac6d299 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -106,6 +106,7 @@
model-persistence
models
parameters
+ parameters.schema
permissions
public-sharing
queries
@@ -268,7 +269,7 @@
lib.schema
models
premium-features
- request
+ request.schema
settings
util
util.config}
@@ -448,7 +449,7 @@
:api #{metabase.batch-processing.core
metabase.batch-processing.init}
:uses #{app-db
- parameters
+ parameters.schema
query-processor.cache-backend
settings
util}
@@ -769,6 +770,7 @@
lib.schema
models
parameters
+ parameters.schema
permissions
public-sharing
pulse
@@ -816,6 +818,7 @@
lib.schema
models
parameters
+ parameters.schema
permissions
public-sharing
pulse
@@ -884,6 +887,7 @@
lib.schema
models
parameters
+ parameters.schema
public-sharing
queries
query-permissions
@@ -981,6 +985,7 @@
models
notification
parameters
+ parameters.schema
public-sharing.rest
queries
query-processor
@@ -1470,6 +1475,7 @@
native-query-snippets
notification
parameters
+ parameters.schema
permissions
premium-features
pulse
@@ -1477,6 +1483,7 @@
query-permissions
query-processor
request
+ request.schema
search
search.entity-retrieval
server
@@ -1682,7 +1689,7 @@
lib.legacy-mbql
lib.metadata
lib.schema
- parameters
+ parameters.schema
util
util.classloader
warehouse-schema-overlay}
@@ -1781,6 +1788,7 @@
lib.schema
models
parameters
+ parameters.schema
permissions
premium-features
queries
@@ -1829,6 +1837,7 @@
;; TODO -- too many API namespaces
parameters
{:team "Graphy"
+ :module-exports #{parameters.schema}
:api #{metabase.parameters.chain-filter
metabase.parameters.core
metabase.parameters.custom-values
@@ -1838,7 +1847,6 @@
metabase.parameters.init
metabase.parameters.mapping-targets
metabase.parameters.params
- metabase.parameters.schema
metabase.parameters.shared}
:uses #{api
app-db
@@ -1848,6 +1856,7 @@
lib.metadata
lib.schema
models
+ parameters.schema
query-processor
util
util.classloader
@@ -1859,6 +1868,14 @@
:model/FieldValues
:model/Table}}
+ parameters.schema
+ {:team "Graphy"
+ :api #{metabase.parameters.schema}
+ :uses #{lib
+ lib.schema
+ models
+ util}}
+
permissions
{:team "UX West"
:api #{metabase.permissions.core
@@ -1929,16 +1946,12 @@
premium-features
{:team "UX West"
- :api #{metabase.premium-features.api
- metabase.premium-features.core
- metabase.premium-features.defenterprise
- metabase.premium-features.init}
+ :module-exports #{premium-features.api}
+ :api #{metabase.premium-features.core metabase.premium-features.defenterprise metabase.premium-features.init}
:uses #{analytics.interface
analytics.internal-stats
- api
app-db
events
- metabot.llm
settings
startup
task
@@ -1948,6 +1961,15 @@
util.config}
:model-imports #{:model/User}}
+ premium-features.api
+ {:team "UX West"
+ :api #{metabase.premium-features.api}
+ :uses #{api
+ metabot.llm
+ premium-features
+ settings
+ util}}
+
product-feedback
{:team "UX West"
:api #{metabase.product-feedback.api
@@ -1995,6 +2017,7 @@
lib.schema
models
parameters
+ parameters.schema
public-sharing
queries
query-processor
@@ -2024,7 +2047,7 @@
lib.schema
models
notification
- parameters
+ parameters.schema
permissions
premium-features
query-processor
@@ -2078,6 +2101,7 @@
metrics
models
parameters
+ parameters.schema
permissions
premium-features
public-sharing
@@ -2132,6 +2156,7 @@
lib.schema
models
parameters
+ parameters.schema
permissions
public-sharing
queries
@@ -2229,6 +2254,7 @@
model-persistence
models
parameters
+ parameters.schema
permissions
premium-features
queries
@@ -2309,10 +2335,10 @@
request
{:team "UX West"
+ :module-exports #{request.schema}
:api #{metabase.request.core
metabase.request.current
metabase.request.init
- metabase.request.schema
metabase.request.user-agent}
:uses #{analytics.interface
api
@@ -2320,7 +2346,7 @@
lib.schema
permissions
premium-features
- server
+ request.schema
session
settings
users
@@ -2328,6 +2354,11 @@
util.config}
:model-imports #{:model/User}}
+ request.schema
+ {:team "UX West"
+ :api #{metabase.request.schema}
+ :uses #{util}}
+
revisions
{:team "UX West"
:api #{metabase.revisions.api
@@ -2513,6 +2544,7 @@
premium-features
query-processor
request
+ request.schema
session
settings
system
@@ -2575,8 +2607,7 @@
models
premium-features
util
- util.config
- enterprise/permissions}
+ util.config}
:model-exports #{:model/Setting}
:model-imports #{:model/User}}
@@ -2677,6 +2708,7 @@
notification
premium-features
request
+ request.schema
session.login-history
users
util}
@@ -2832,7 +2864,7 @@
lib.be
lib.legacy-mbql
lib.schema
- parameters
+ parameters.schema
premium-features
query-processor
settings
@@ -3288,7 +3320,7 @@
lib.metadata
lib.schema
models
- parameters
+ parameters.schema
permissions
premium-features
query-processor
@@ -3789,7 +3821,7 @@
measures
model-persistence
models
- parameters
+ parameters.schema
queries
segments
task
diff --git a/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.clj b/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.clj
index 74e3db5e3a3..3ded2245670 100644
--- a/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.clj
+++ b/enterprise/backend/src/metabase_enterprise/advanced_permissions/common.clj
@@ -88,6 +88,12 @@
(or api/*is-superuser?*
(perms/set-has-application-permission-of-type? @api/*current-user-permissions-set* perm-type)))
+(defenterprise has-advanced-setting-access?
+ "Check if `*current-user*` has permissions to edit settings."
+ :feature :advanced-permissions
+ []
+ (current-user-has-application-permissions? :setting))
+
(defn current-user-is-manager-of-group?
"Return true if current-user is a manager of `group-or-id`."
[group-or-id]
diff --git a/mage/src/mage/modules.clj b/mage/src/mage/modules.clj
index 1f9dfe1ba78..6467cad9266 100644
--- a/mage/src/mage/modules.clj
+++ b/mage/src/mage/modules.clj
@@ -183,6 +183,7 @@
pulse
remote-sync
request
+ request.schema
sample-data
search
warehouses.secrets
diff --git a/mage/test/mage/modules_test.clj b/mage/test/mage/modules_test.clj
index 8c2a6dba39c..5b0ddb61e75 100644
--- a/mage/test/mage/modules_test.clj
+++ b/mage/test/mage/modules_test.clj
@@ -312,7 +312,8 @@
;; 2026-06-24 Bumped to 44 for indexes + indexes-rest (Index manager #75848)
;; 2026-09-11 Bumped to 47: lib.schema, lib.metadata and query-processor.cache-backend are carved out of
;; lib and query-processor, which already trigger driver tests
- max-allowed-count 47]
+ ;; 2026-10-01 Bumped to 48: parameters.schema is carved out of parameters, which already triggers driver tests
+ max-allowed-count 48]
(is (<= (count modules-triggering-drivers) max-allowed-count)
(format "Too many modules trigger driver tests! Expected <= %d, got %d.
Modules triggering driver tests: %s
diff --git a/src/metabase/api/macros.clj b/src/metabase/api/macros.clj
index f75e9b70194..24353ee13c5 100644
--- a/src/metabase/api/macros.clj
+++ b/src/metabase/api/macros.clj
@@ -192,6 +192,25 @@
(mr/def ::request ::request.schema/request)
+;; `StreamingResponse` lives in `server`, which depends on this module, so match it by the interface behind its own
+;; [[metabase.api.common.internal/EndpointResponse]] impl rather than by its class.
+(mr/def ::response
+ "What an endpoint handler can return: JSON-shaped data, a full Ring response map, or a file/stream for downloads."
+ [:or
+ ms/RingResponseBody
+ [:map {:closed true} [:id :string]]
+ [:map {:closed true} [:success :boolean] [:session_id :string]]
+ [:map {:closed true}
+ [:status {:optional true} :int]
+ [:headers {:optional true} [:map-of :string :string]]
+ [:cookies {:optional true} [:map-of :string ::request.schema/cookie-attrs]]
+ [:body {:optional true} [:maybe [:or ms/RingResponseBody
+ (ms/InstanceOfClass java.io.File)
+ (ms/InstanceOfClass java.io.InputStream)]]]]
+ (ms/InstanceOfClass java.io.File)
+ (ms/InstanceOfClass java.io.InputStream)
+ (ms/InstanceOfClass metabase.api.common.internal.EndpointResponse)])
+
(mr/def ::respond-fn
[:=> [:cat any?] any?])
@@ -435,7 +454,7 @@
(mu/defn validate-and-encode-response :- any?
"Impl for [[endpoint-core-fn]]; validate the endpoint response against `schema` "
[schema :- ::schema-form-or-instance
- response :- ::request.schema/response]
+ response :- ::response]
(when *enable-response-validation*
(when-not (mr/validate schema response)
(throw (ex-info "Invalid response" ; TODO -- better error message?
diff --git a/src/metabase/request/cookies.clj b/src/metabase/request/cookies.clj
index 3ed25386928..8031ba10464 100644
--- a/src/metabase/request/cookies.clj
+++ b/src/metabase/request/cookies.clj
@@ -2,6 +2,7 @@
"Code and constants related to getting and setting cookies in Ring requests and responses."
(:require
[java-time.api :as t]
+ [metabase.api.macros :as api.macros]
[metabase.config.core :as config]
[metabase.request.schema :as request.schema]
[metabase.request.settings :as request.settings]
@@ -139,7 +140,7 @@
(mu/defn set-session-cookies
"Add the appropriate cookies to the `response` for the Session."
[request :- ::request.schema/request
- response :- ::request.schema/response
+ response :- ::api.macros/response
{session-key :key
session-type :type
anti-csrf-token :anti_csrf_token
diff --git a/src/metabase/request/schema.clj b/src/metabase/request/schema.clj
index f7a3758ccaf..ad69f30ecfe 100644
--- a/src/metabase/request/schema.clj
+++ b/src/metabase/request/schema.clj
@@ -1,12 +1,7 @@
(ns metabase.request.schema
(:require
- [metabase.server.streaming-response]
[metabase.util.malli.registry :as mr]
- [metabase.util.malli.schema :as ms])
- (:import
- (metabase.server.streaming_response StreamingResponse)))
-
-(comment metabase.server.streaming-response/keep-me)
+ [metabase.util.malli.schema :as ms]))
;;; TODO (Cam 8/13/25) -- should this map be closed, that way we can make sure all the keys we might be using are
;;; enumerated here?
@@ -121,20 +116,3 @@
[:scp {:optional true} [:sequential :string]]
[:unr {:optional true} :boolean]
[:token-scopes {:optional true} [:maybe [:set [:or :string :keyword]]]]]]]])
-
-(mr/def ::response
- "What an endpoint handler can return: JSON-shaped data, a full Ring response map, or a file/stream for downloads."
- [:or
- ms/RingResponseBody
- [:map {:closed true} [:id :string]]
- [:map {:closed true} [:success :boolean] [:session_id :string]]
- [:map {:closed true}
- [:status {:optional true} :int]
- [:headers {:optional true} [:map-of :string :string]]
- [:cookies {:optional true} [:map-of :string ::cookie-attrs]]
- [:body {:optional true} [:maybe [:or ms/RingResponseBody
- (ms/InstanceOfClass java.io.File)
- (ms/InstanceOfClass java.io.InputStream)]]]]
- (ms/InstanceOfClass java.io.File)
- (ms/InstanceOfClass java.io.InputStream)
- (ms/InstanceOfClass StreamingResponse)])
diff --git a/src/metabase/server/middleware/browser_cookie.clj b/src/metabase/server/middleware/browser_cookie.clj
index fa9162836e4..4bb34ed8345 100644
--- a/src/metabase/server/middleware/browser_cookie.clj
+++ b/src/metabase/server/middleware/browser_cookie.clj
@@ -5,6 +5,7 @@
they log in."
(:require
[java-time.api :as t]
+ [metabase.api.macros :as api.macros]
[metabase.request.core :as request]
[metabase.request.schema :as request.schema]
[metabase.util.malli :as mu]
@@ -33,7 +34,7 @@
(mu/defn- add-browser-id-cookie
[request :- ::request.schema/request
- response :- ::request.schema/response
+ response :- ::api.macros/response
browser-id :- ms/NonBlankString]
(response/set-cookie response browser-id-cookie-name browser-id (cookie-options request)))
diff --git a/src/metabase/settings/models/setting.clj b/src/metabase/settings/models/setting.clj
index 1a389d4e22e..9ad210d73d9 100644
--- a/src/metabase/settings/models/setting.clj
+++ b/src/metabase/settings/models/setting.clj
@@ -15,6 +15,7 @@
[metabase.config.core :as config]
[metabase.events.core :as events]
[metabase.models.serialization :as serdes]
+ [metabase.premium-features.defenterprise :refer [defenterprise]]
[metabase.settings.db :as settings.db]
[metabase.settings.models.setting.cache :as setting.cache]
[metabase.util :as u]
@@ -424,16 +425,12 @@
[feature]
((requiring-resolve 'metabase.premium-features.core/has-feature?) feature))
-(defn has-advanced-setting-access?
+(defenterprise has-advanced-setting-access?
"If `advanced-permissions` is enabled, check if current user has permissions to edit `setting`.
Return `false` for all non-admins when `advanced-permissions` is disabled. Return `true` for all admins."
+ metabase-enterprise.advanced-permissions.common
[]
- (or api/*is-superuser?*
- (when (and config/ee-available?
- (has-feature? :advanced-permissions))
- ((requiring-resolve 'metabase-enterprise.advanced-permissions.common/current-user-has-application-permissions?)
- :setting))
- false))
+ (boolean api/*is-superuser?*))
(defn- current-user-can-access-setting?
"This checks whether the current user should have the ability to read or write the provided setting.