Skip to content

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

Keep top-level feature modules out of the module cycle (#83453)

Chris Truter06b78789e315
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 158d539e120..46a8384e461 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -517,8 +517,7 @@
;; TODO -- way too many API namespaces.
channel
{:team "Gadget"
- :api #{metabase.channel.api
- metabase.channel.core
+ :api #{metabase.channel.core
metabase.channel.email
metabase.channel.email.messages
metabase.channel.init
@@ -534,7 +533,6 @@
api
app-db
appearance
- bug-reporting
collections
dashboards
driver
@@ -545,7 +543,6 @@
lib.be
lib.schema
lib.types
- metabot.slackbot
models
notification
parameters
@@ -570,6 +567,22 @@
:model/PulseChannel
:model/User}}
+ channel.rest
+ {:team "Gadget"
+ :api #{metabase.channel.rest.api}
+ :uses #{analytics.interface
+ api
+ bug-reporting
+ channel
+ events
+ metabot.slackbot
+ models
+ permissions
+ settings
+ system
+ util
+ util.config}}
+
cloud-migration
{:team "UX West"
:api #{metabase.cloud-migration.api
@@ -617,10 +630,10 @@
queries
remote-sync
request
- revisions
+ revisions.schema
search
tracing
- transforms
+ transforms.feature-gating
upload
util
util.config
@@ -892,7 +905,6 @@
queries
query-permissions
query-processor
- revisions
search
util
warehouse-schema-overlay}
@@ -1524,13 +1536,13 @@
metabot.agent-api
{:team "Metabot"
+ :module-exports #{metabot.agent-api.usage}
:ns-prefix "metabase.agent-api"
:api #{metabase.agent-api.api
metabase.agent-api.init
metabase.agent-api.query-guards
metabase.agent-api.schema
- metabase.agent-api.settings
- metabase.agent-api.usage}
+ metabase.agent-api.settings}
:uses #{ai-tracing
api
channel
@@ -1542,7 +1554,6 @@
lib.schema
metabot
metabot.llm
- premium-features
queries
query-permissions
query-processor
@@ -1561,6 +1572,14 @@
:model/User}
:model-exports #{:model/AgentApiCallLog}}
+ metabot.agent-api.usage
+ {:team "Metabot"
+ :api #{metabase.metabot.agent-api.usage}
+ :uses #{api
+ premium-features
+ request
+ util}}
+
metabot.llm
{:team "Metabot"
:ns-prefix "metabase.llm"
@@ -1947,7 +1966,6 @@
premium-features
{:team "UX West"
- :module-exports #{premium-features.api}
:api #{metabase.premium-features.core metabase.premium-features.defenterprise metabase.premium-features.init}
:uses #{analytics.interface
analytics.internal-stats
@@ -1962,9 +1980,9 @@
util.config}
:model-imports #{:model/User}}
- premium-features.api
+ premium-features.rest
{:team "UX West"
- :api #{metabase.premium-features.api}
+ :api #{metabase.premium-features.rest.api}
:uses #{api
metabot.llm
premium-features
@@ -2362,6 +2380,7 @@
revisions
{:team "UX West"
+ :module-exports #{revisions.schema}
:api #{metabase.revisions.api
metabase.revisions.core
metabase.revisions.init
@@ -2379,6 +2398,7 @@
parameters
queries
query-permissions
+ revisions.schema
segments
transforms
util
@@ -2398,6 +2418,11 @@
:model/Transform
:model/TransformTest}}
+ revisions.schema
+ {:team "UX West"
+ :api #{metabase.revisions.schema}
+ :uses #{lib.schema util}}
+
run-tracking
{:team "Gadget"
:api #{metabase.run-tracking.core}
@@ -2458,7 +2483,7 @@
startup
task
tracing
- transforms
+ transforms.feature-gating
util
util.config
warehouse-schema-overlay}
@@ -2541,7 +2566,7 @@
embedding
lib.be
lib.schema
- metabot.agent-api
+ metabot.agent-api.usage
premium-features
query-processor
request
@@ -2674,9 +2699,9 @@
sso
{:team "UX West"
- :module-exports #{sso.auth-identity}
+ :module-exports #{sso.auth-identity
+ sso.auth-wrapper}
:api #{metabase.sso.api
- metabase.sso.auth-wrapper
metabase.sso.core
metabase.sso.init
metabase.sso.settings}
@@ -2691,8 +2716,7 @@
startup
system
util
- util.config
- enterprise/sso}
+ util.config}
:model-imports #{:model/AuthIdentity :model/PermissionsGroupMembership}}
sso.auth-identity
@@ -2716,6 +2740,14 @@
:model-exports #{:model/AuthIdentity}
:model-imports #{:model/Session :model/User}}
+ sso.auth-wrapper
+ {:team "UX West"
+ :api #{metabase.sso.auth-wrapper}
+ :uses #{api
+ sso
+ util.config
+ enterprise/sso}}
+
staleness
{:team "UX West"
:api #{metabase.staleness.core}
@@ -2902,10 +2934,10 @@
transforms
{:team "Graphy"
:module-exports #{transforms.base
+ transforms.feature-gating
transforms.indexes
transforms.inspector}
:api #{metabase.transforms.core
- metabase.transforms.feature-gating
metabase.transforms.init
metabase.transforms.instrumentation
metabase.transforms.interface
@@ -2936,6 +2968,7 @@
task.history
tracing
transforms.base
+ transforms.feature-gating
transforms.indexes
util
warehouse-schema-overlay}
@@ -2985,6 +3018,11 @@
util
warehouse-schema-overlay}}
+ transforms.feature-gating
+ {:team "Graphy"
+ :api #{metabase.transforms.feature-gating}
+ :uses #{api premium-features}}
+
transforms.indexes
{:team "Gadget"
:ns-prefix "metabase.indexes"
@@ -3943,6 +3981,7 @@
:uses #{analytics
metabot
metabot.agent-api
+ metabot.agent-api.usage
premium-features
task
util}
diff --git a/.github/file-paths.yaml b/.github/file-paths.yaml
index 346d6ce3aa9..3e34bc3d704 100644
--- a/.github/file-paths.yaml
+++ b/.github/file-paths.yaml
@@ -359,9 +359,10 @@ openapi:
- "src/metabase/api/**"
- "src/metabase/api_routes/**"
- "src/metabase/*_rest/api.clj"
- - "src/metabase/*/rest/api.clj"
- - "src/metabase/*/api.clj"
- - "src/metabase/*/api/*.clj"
+ - "src/metabase/**/rest/api.clj"
+ - "src/metabase/**/rest/api/*.clj"
+ - "src/metabase/**/api.clj"
+ - "src/metabase/**/api/*.clj"
- "enterprise/backend/src/metabase_enterprise/**/api.clj"
- "enterprise/backend/src/metabase_enterprise/**/api/*.clj"
- "resources/openapi/**"
diff --git a/enterprise/backend/src/metabase_enterprise/agent_api/usage.clj b/enterprise/backend/src/metabase_enterprise/agent_api/usage.clj
index f98a0c98624..0964c2f847b 100644
--- a/enterprise/backend/src/metabase_enterprise/agent_api/usage.clj
+++ b/enterprise/backend/src/metabase_enterprise/agent_api/usage.clj
@@ -8,9 +8,9 @@
logging never fails the Agent API request and adds negligible latency."
(:require
[metabase-enterprise.agent-api.db :as agent-api.db]
- [metabase.agent-api.usage :as agent-api.usage]
[metabase.analytics.core :as analytics]
[metabase.analytics.settings :as analytics.settings]
+ [metabase.metabot.agent-api.usage :as agent-api.usage]
[metabase.premium-features.core :refer [defenterprise]]
[metabase.util :as u]
[metabase.util.log :as log]))
diff --git a/enterprise/backend/test/metabase_enterprise/agent_api/api_test.clj b/enterprise/backend/test/metabase_enterprise/agent_api/api_test.clj
index 676ff96ed2c..36bd1e68e3a 100644
--- a/enterprise/backend/test/metabase_enterprise/agent_api/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/agent_api/api_test.clj
@@ -1,13 +1,13 @@
(ns metabase-enterprise.agent-api.api-test
"Integration tests for CLI usage recording via the `wrap-record-cli-usage` middleware in
- `metabase.agent-api.usage`. Drives the middleware directly so recording fires on the same
+ `metabase.metabot.agent-api.usage`. Drives the middleware directly so recording fires on the same
synchronous thread, where identity, status, duration, and PII are all in scope. Recording
runs on every EE instance (`:feature :none`); PII is gated by `analytics-pii-retention-enabled`
(itself `:audit-app`-gated)."
(:require
[clojure.test :refer [deftest is testing use-fixtures]]
- [metabase.agent-api.usage :as agent-api.usage]
[metabase.api.common :as api]
+ [metabase.metabot.agent-api.usage :as agent-api.usage]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/test/metabase_enterprise/agent_api/usage_test.clj b/enterprise/backend/test/metabase_enterprise/agent_api/usage_test.clj
index 3dd52b8e8c3..3df97727490 100644
--- a/enterprise/backend/test/metabase_enterprise/agent_api/usage_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/agent_api/usage_test.clj
@@ -1,12 +1,12 @@
(ns metabase-enterprise.agent-api.usage-test
"Tests for the Agent API (CLI) usage write point — one lean `agent_api_call_log` row per direct
Agent API HTTP call. Exercises the `defenterprise` dispatch via the OSS entry point in
- `metabase.agent-api.usage`. Collection runs on every EE instance (`:feature :none`); PII is gated
+ `metabase.metabot.agent-api.usage`. Collection runs on every EE instance (`:feature :none`); PII is gated
by `analytics-pii-retention-enabled` (itself `:audit-app`-gated). The end-to-end path through the
real `routes` wrapper is covered in `metabase-enterprise.agent-api.api-test`."
(:require
[clojure.test :refer [deftest is testing use-fixtures]]
- [metabase.agent-api.usage :as usage]
+ [metabase.metabot.agent-api.usage :as usage]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
[toucan2.core :as t2]))
diff --git a/mage/src/mage/modules.clj b/mage/src/mage/modules.clj
index 6467cad9266..efcd77c26b3 100644
--- a/mage/src/mage/modules.clj
+++ b/mage/src/mage/modules.clj
@@ -130,6 +130,7 @@
(def driver-affecting-overrides
"These modules affect drivers when computing, but we want to override and not consider them to affect drivers."
'#{metabot.agent-api
+ metabot.agent-api.usage
analytics
analytics.interface
api
@@ -203,6 +204,7 @@
tiles
timeline
tracing
+ transforms.feature-gating
lib.types
users
util
diff --git a/resources/migrations/instance_analytics_views/agent_api_calls/v1/h2-agent_api_calls.sql b/resources/migrations/instance_analytics_views/agent_api_calls/v1/h2-agent_api_calls.sql
index 8bf1db0ea3b..183cc9c5773 100644
--- a/resources/migrations/instance_analytics_views/agent_api_calls/v1/h2-agent_api_calls.sql
+++ b/resources/migrations/instance_analytics_views/agent_api_calls/v1/h2-agent_api_calls.sql
@@ -19,7 +19,7 @@ SELECT
LIMIT 1) AS group_name,
t.client_name AS client_name,
-- NOTE: keep these CASE branches in sync with `supported-client-keys` /
- -- `detect-client` in src/metabase/agent_api/usage.clj (the enum-<->-CASE sync footgun).
+ -- `detect-client` in src/metabase/metabot/agent_api/usage.clj (the enum-<->-CASE sync footgun).
CASE t.client_name
WHEN 'metabase-cli' THEN 'Metabase CLI'
WHEN 'other' THEN 'Other'
diff --git a/resources/migrations/instance_analytics_views/agent_api_calls/v1/mysql-agent_api_calls.sql b/resources/migrations/instance_analytics_views/agent_api_calls/v1/mysql-agent_api_calls.sql
index 802bdbc5906..178435da0e9 100644
--- a/resources/migrations/instance_analytics_views/agent_api_calls/v1/mysql-agent_api_calls.sql
+++ b/resources/migrations/instance_analytics_views/agent_api_calls/v1/mysql-agent_api_calls.sql
@@ -19,7 +19,7 @@ SELECT
LIMIT 1) AS group_name,
t.client_name AS client_name,
-- NOTE: keep these CASE branches in sync with `supported-client-keys` /
- -- `detect-client` in src/metabase/agent_api/usage.clj (the enum-<->-CASE sync footgun).
+ -- `detect-client` in src/metabase/metabot/agent_api/usage.clj (the enum-<->-CASE sync footgun).
CASE t.client_name
WHEN 'metabase-cli' THEN 'Metabase CLI'
WHEN 'other' THEN 'Other'
diff --git a/resources/migrations/instance_analytics_views/agent_api_calls/v1/postgres-agent_api_calls.sql b/resources/migrations/instance_analytics_views/agent_api_calls/v1/postgres-agent_api_calls.sql
index 8bf1db0ea3b..183cc9c5773 100644
--- a/resources/migrations/instance_analytics_views/agent_api_calls/v1/postgres-agent_api_calls.sql
+++ b/resources/migrations/instance_analytics_views/agent_api_calls/v1/postgres-agent_api_calls.sql
@@ -19,7 +19,7 @@ SELECT
LIMIT 1) AS group_name,
t.client_name AS client_name,
-- NOTE: keep these CASE branches in sync with `supported-client-keys` /
- -- `detect-client` in src/metabase/agent_api/usage.clj (the enum-<->-CASE sync footgun).
+ -- `detect-client` in src/metabase/metabot/agent_api/usage.clj (the enum-<->-CASE sync footgun).
CASE t.client_name
WHEN 'metabase-cli' THEN 'Metabase CLI'
WHEN 'other' THEN 'Other'
diff --git a/src/metabase/api_routes/routes.clj b/src/metabase/api_routes/routes.clj
index a07ac5d399b..b27d7894ae9 100644
--- a/src/metabase/api_routes/routes.clj
+++ b/src/metabase/api_routes/routes.clj
@@ -18,7 +18,7 @@
[metabase.bookmarks.api]
[metabase.bug-reporting.api]
[metabase.cache.api]
- [metabase.channel.api]
+ [metabase.channel.rest.api]
[metabase.cloud-migration.api]
[metabase.collections-rest.api]
[metabase.comments.api]
@@ -49,7 +49,7 @@
[metabase.oauth-server.api.admin]
[metabase.osi.ai-context.api]
[metabase.permissions-rest.api]
- [metabase.premium-features.api]
+ [metabase.premium-features.rest.api]
[metabase.product-feedback.api]
[metabase.public-sharing-rest.api]
[metabase.pulse.api]
@@ -183,7 +183,7 @@
"/cache" (+auth 'metabase.cache.api)
"/card" (+auth metabase.queries-rest.api/card-routes)
"/cards" (+auth metabase.queries-rest.api/cards-routes)
- "/channel" (+auth metabase.channel.api/channel-routes)
+ "/channel" (+auth metabase.channel.rest.api/channel-routes)
"/cloud-migration" (+auth 'metabase.cloud-migration.api)
"/collection" (+auth 'metabase.collections-rest.api)
"/comment" (+auth metabase.comments.api/routes)
@@ -203,7 +203,7 @@
"/docs" (metabase.api.docs/make-routes #'routes)
"/document" (+auth metabase.documents.api/routes)
"/eid-translation" (+auth 'metabase.eid-translation.api)
- "/email" (+auth metabase.channel.api/email-routes)
+ "/email" (+auth metabase.channel.rest.api/email-routes)
"/embed" (+message-only-exceptions metabase.embedding-rest.api/embedding-routes)
"/embed-mcp" (+auth metabase.mcp.callback-api/routes)
"/embed-theme" (+auth metabase.embedding-rest.api/theme-routes)
@@ -235,7 +235,7 @@
"/osi" {"/ai-context" (+auth 'metabase.osi.ai-context.api)}
"/permissions" (+auth 'metabase.permissions-rest.api)
"/persist" (+auth 'metabase.model-persistence.api)
- "/premium-features" (+auth metabase.premium-features.api/routes)
+ "/premium-features" (+auth metabase.premium-features.rest.api/routes)
"/preview_embed" (+auth metabase.embedding-rest.api/preview-embedding-routes)
"/product-feedback" 'metabase.product-feedback.api
"/public" (+public-exceptions metabase.public-sharing-rest.api/routes)
@@ -246,7 +246,7 @@
"/session" metabase.session.api/routes
"/setting" (+auth 'metabase.settings-rest.api)
"/setup" 'metabase.setup-rest.api
- "/slack" (+auth metabase.channel.api/slack-routes)
+ "/slack" (+auth metabase.channel.rest.api/slack-routes)
"/table" (+auth metabase.warehouse-schema-rest.api/table-routes)
"/task" (+auth 'metabase.task-history.api)
"/testing" (if metabase.testing-api.core/enable-testing-routes? 'metabase.testing-api.api pass-thru-handler)
diff --git a/src/metabase/channel/api.clj b/src/metabase/channel/api.clj
deleted file mode 100644
index d11968b07c5..00000000000
--- a/src/metabase/channel/api.clj
+++ /dev/null
@@ -1,22 +0,0 @@
-(ns metabase.channel.api
- (:require
- [metabase.api.macros :as api.macros]
- [metabase.channel.api.channel]
- [metabase.channel.api.email]
- [metabase.channel.api.slack]))
-
-(comment metabase.channel.api.channel/keep-me
- metabase.channel.api.email/keep-me
- metabase.channel.api.slack/keep-me)
-
-(def ^{:arglists '([request respond raise])} channel-routes
- "/api/channel routes"
- (api.macros/ns-handler 'metabase.channel.api.channel))
-
-(def ^{:arglists '([request respond raise])} email-routes
- "/api/email routes"
- (api.macros/ns-handler 'metabase.channel.api.email))
-
-(def ^{:arglists '([request respond raise])} slack-routes
- "/api/slack routes"
- (api.macros/ns-handler 'metabase.channel.api.slack))
diff --git a/src/metabase/channel/rest/api.clj b/src/metabase/channel/rest/api.clj
new file mode 100644
index 00000000000..9ea810fa797
--- /dev/null
+++ b/src/metabase/channel/rest/api.clj
@@ -0,0 +1,22 @@
+(ns metabase.channel.rest.api
+ (:require
+ [metabase.api.macros :as api.macros]
+ [metabase.channel.rest.api.channel]
+ [metabase.channel.rest.api.email]
+ [metabase.channel.rest.api.slack]))
+
+(comment metabase.channel.rest.api.channel/keep-me
+ metabase.channel.rest.api.email/keep-me
+ metabase.channel.rest.api.slack/keep-me)
+
+(def ^{:arglists '([request respond raise])} channel-routes
+ "/api/channel routes"
+ (api.macros/ns-handler 'metabase.channel.rest.api.channel))
+
+(def ^{:arglists '([request respond raise])} email-routes
+ "/api/email routes"
+ (api.macros/ns-handler 'metabase.channel.rest.api.email))
+
+(def ^{:arglists '([request respond raise])} slack-routes
+ "/api/slack routes"
+ (api.macros/ns-handler 'metabase.channel.rest.api.slack))
diff --git a/src/metabase/channel/api/channel.clj b/src/metabase/channel/rest/api/channel.clj
similarity index 99%
rename from src/metabase/channel/api/channel.clj
rename to src/metabase/channel/rest/api/channel.clj
index c5c04fba546..0e3be6114f4 100644
--- a/src/metabase/channel/api/channel.clj
+++ b/src/metabase/channel/rest/api/channel.clj
@@ -1,4 +1,4 @@
-(ns ^{:added "0.51.0"} metabase.channel.api.channel
+(ns ^{:added "0.51.0"} metabase.channel.rest.api.channel
"/api/channel endpoints.
Currently only used for http channels."
diff --git a/src/metabase/channel/api/email.clj b/src/metabase/channel/rest/api/email.clj
similarity index 98%
rename from src/metabase/channel/api/email.clj
rename to src/metabase/channel/rest/api/email.clj
index 71374d27956..2ca93a3d132 100644
--- a/src/metabase/channel/api/email.clj
+++ b/src/metabase/channel/rest/api/email.clj
@@ -1,4 +1,4 @@
-(ns metabase.channel.api.email
+(ns metabase.channel.rest.api.email
"/api/email endpoints"
(:require
[metabase.api.common :as api]
diff --git a/src/metabase/channel/api/slack.clj b/src/metabase/channel/rest/api/slack.clj
similarity index 99%
rename from src/metabase/channel/api/slack.clj
rename to src/metabase/channel/rest/api/slack.clj
index 769f0560e88..2911bb31801 100644
--- a/src/metabase/channel/api/slack.clj
+++ b/src/metabase/channel/rest/api/slack.clj
@@ -1,4 +1,4 @@
-(ns metabase.channel.api.slack
+(ns metabase.channel.rest.api.slack
"/api/slack endpoints"
(:require
[clojure.set :as set]
diff --git a/src/metabase/collections/children.clj b/src/metabase/collections/children.clj
index 5b41e58af35..b8ae4db9d48 100644
--- a/src/metabase/collections/children.clj
+++ b/src/metabase/collections/children.clj
@@ -29,10 +29,9 @@
[metabase.premium-features.core :as premium-features :refer [defenterprise]]
[metabase.queries.core :as queries]
[metabase.request.core :as request]
- [metabase.revisions.core :as revisions]
+ [metabase.revisions.schema :as revisions.schema]
[metabase.tracing.core :as tracing]
[metabase.transforms.feature-gating :as transforms.gating]
- [metabase.transforms.util :as transforms.u]
[metabase.upload.core :as upload]
[metabase.util :as u]
[metabase.util.honey-sql-2 :as h2x]
@@ -475,7 +474,7 @@
(defmethod collection-children-query :transform
[_model collection {:keys [pinned-state]}]
- (let [enabled-types (transforms.u/enabled-source-types-for-user)]
+ (let [enabled-types (transforms.gating/enabled-source-types-for-user)]
{:select [:id :collection_id :name [(h2x/literal "transform") :model] :description :entity_id]
:from [[:transform :transform]]
:where [:and
@@ -890,7 +889,7 @@
:last_edit_timestamp :timestamp})
;;; TODO -- consider whether this function belongs here or in [[metabase.revisions.models.revision.last-edit]]
-(mu/defn- coalesce-edit-info :- revisions/MaybeAnnotated
+(mu/defn- coalesce-edit-info :- ::revisions.schema/maybe-annotated
"Hoist all of the last edit information into a map under the key :last-edit-info. Considers this information present
if `:last_edit_user` is not nil."
[row :- [:map {:closed true}
diff --git a/src/metabase/documents/init.clj b/src/metabase/documents/init.clj
index cfe8e761aa0..c9a51b4b455 100644
--- a/src/metabase/documents/init.clj
+++ b/src/metabase/documents/init.clj
@@ -1,5 +1,4 @@
(ns metabase.documents.init
(:require
[metabase.documents.recent-views]
- [metabase.documents.revisions.impl]
[metabase.documents.view-log]))
diff --git a/src/metabase/agent_api/usage.clj b/src/metabase/metabot/agent_api/usage.clj
similarity index 99%
rename from src/metabase/agent_api/usage.clj
rename to src/metabase/metabot/agent_api/usage.clj
index fb1d940926d..bfff447db0a 100644
--- a/src/metabase/agent_api/usage.clj
+++ b/src/metabase/metabot/agent_api/usage.clj
@@ -1,4 +1,4 @@
-(ns metabase.agent-api.usage
+(ns metabase.metabot.agent-api.usage
"Agent API (CLI) usage logging.
[[wrap-record-cli-usage]] is the single write point: a Ring middleware in the main handler
diff --git a/src/metabase/premium_features/api.clj b/src/metabase/premium_features/rest/api.clj
similarity index 98%
rename from src/metabase/premium_features/api.clj
rename to src/metabase/premium_features/rest/api.clj
index bade11e8062..53d6a2e03db 100644
--- a/src/metabase/premium_features/api.clj
+++ b/src/metabase/premium_features/rest/api.clj
@@ -1,4 +1,4 @@
-(ns metabase.premium-features.api
+(ns metabase.premium-features.rest.api
(:require
[clj-http.client :as http]
[clojure.string :as str]
diff --git a/src/metabase/revisions/core.clj b/src/metabase/revisions/core.clj
index ab5a218be14..080ca7572b3 100644
--- a/src/metabase/revisions/core.clj
+++ b/src/metabase/revisions/core.clj
@@ -14,7 +14,6 @@
revert-to-revision!
revisions]
[metabase.revisions.models.revision.last-edit
- MaybeAnnotated
edit-information-for-user
fetch-last-edited-info
with-last-edit-info])
diff --git a/src/metabase/documents/revisions/impl.clj b/src/metabase/revisions/impl/document.clj
similarity index 79%
rename from src/metabase/documents/revisions/impl.clj
rename to src/metabase/revisions/impl/document.clj
index ca9a062230a..c323e865632 100644
--- a/src/metabase/documents/revisions/impl.clj
+++ b/src/metabase/revisions/impl/document.clj
@@ -1,10 +1,10 @@
-(ns metabase.documents.revisions.impl
+(ns metabase.revisions.impl.document
"Document revision serialization implementation.
Implements Document revision serialization following the Card exclusion pattern,
excluding metadata columns while preserving content, name, and other Document-specific fields."
(:require
- [metabase.revisions.core :as revisions]))
+ [metabase.revisions.models.revision :as revision]))
(def ^:private excluded-columns-for-document-revision
"Columns to exclude from Document revision serialization.
@@ -25,11 +25,11 @@
:public_uuid_prefix
:made_public_by_id})
-(defmethod revisions/serialize-instance :model/Document
+(defmethod revision/serialize-instance :model/Document
[_model _id instance]
(apply dissoc instance excluded-columns-for-document-revision))
-(defmethod revisions/revert-to-revision! :model/Document
+(defmethod revision/revert-to-revision! :model/Document
[model id user-id serialized-document]
- ((get-method revisions/revert-to-revision! :default)
+ ((get-method revision/revert-to-revision! :default)
model id user-id (apply dissoc serialized-document excluded-columns-for-document-revision)))
diff --git a/src/metabase/revisions/init.clj b/src/metabase/revisions/init.clj
index 2102ee8598d..06cbacff436 100644
--- a/src/metabase/revisions/init.clj
+++ b/src/metabase/revisions/init.clj
@@ -6,6 +6,7 @@
;; https://linear.app/metabase/issue/DEV-326
[metabase.revisions.impl.card]
[metabase.revisions.impl.dashboard]
+ [metabase.revisions.impl.document]
[metabase.revisions.impl.exploration]
[metabase.revisions.impl.measure]
[metabase.revisions.impl.segment]
diff --git a/src/metabase/revisions/models/revision/last_edit.clj b/src/metabase/revisions/models/revision/last_edit.clj
index 732c3aa930d..2822af6922d 100644
--- a/src/metabase/revisions/models/revision/last_edit.clj
+++ b/src/metabase/revisions/models/revision/last_edit.clj
@@ -13,6 +13,7 @@
[medley.core :as m]
[metabase.dashboards.schema]
[metabase.revisions.db :as revisions.db]
+ [metabase.revisions.schema :as revisions.schema]
[metabase.util.malli :as mu]
[metabase.util.malli.schema :as ms]
[steffan-westcott.clj-otel.api.trace.span :as span]
@@ -20,23 +21,7 @@
(def ^:private model->db-model {:card "Card" :dashboard "Dashboard"})
-;; these are all maybes as sometimes revisions don't exist, or users might be missing the names, etc
-(def ^:private LastEditInfo
- "Schema of the `:last-edit-info` map. A subset of a user with a timestamp indicating when the last edit was."
- [:map
- [:timestamp [:maybe :any]]
- [:id [:maybe ms/PositiveInt]]
- [:first_name [:maybe :string]]
- [:last_name [:maybe :string]]
- [:email [:maybe :string]]])
-
-(def MaybeAnnotated
- "Spec for an item annotated with last-edit-info. Items are cards or dashboards. Optional because we may not always
- have revision history for all cards/dashboards."
- [:map
- [:last-edit-info {:optional true} LastEditInfo]])
-
-(mu/defn with-last-edit-info :- [:maybe [:sequential MaybeAnnotated]]
+(mu/defn with-last-edit-info :- [:maybe [:sequential ::revisions.schema/maybe-annotated]]
"Add the last edited information to a card. Will add a key `:last-edit-info`. Model should be one of `:dashboard` or
`:card`. Gets the last edited information from the revisions table. If you need this information from a put route,
use `@api/*current-user*` and a current timestamp since revisions are events and asynchronous."
@@ -60,7 +45,7 @@
(m/assoc-some item :last-edit-info (-> item :id id->updated-info)))
items))))))
-(mu/defn edit-information-for-user :- LastEditInfo
+(mu/defn edit-information-for-user :- ::revisions.schema/last-edit-info
"Construct the `:last-edit-info` map given a user. Useful for editing routes. Most edit info information comes from
the revisions table. But this table is populated from events asynchronously so when editing and wanting
last-edit-info, you must construct it from `@api/*current-user*` and the current timestamp rather than checking the
@@ -71,10 +56,10 @@
(def ^:private CollectionLastEditInfo
"Schema for the map of bulk last-item-info. A map of two keys, `:card` and `:dashboard`, each of which is a map from
- id to a LastEditInfo.:Schema"
+ id to a `::revisions.schema/last-edit-info`."
[:map
- [:card {:optional true} [:map-of :int LastEditInfo]]
- [:dashboard {:optional true} [:map-of :int LastEditInfo]]])
+ [:card {:optional true} [:map-of :int ::revisions.schema/last-edit-info]]
+ [:dashboard {:optional true} [:map-of :int ::revisions.schema/last-edit-info]]])
(def ^:private FetchLastEditedInfoArgs
[:map {:closed true}
diff --git a/src/metabase/revisions/schema.clj b/src/metabase/revisions/schema.clj
index dd18db09dff..7e43468945c 100644
--- a/src/metabase/revisions/schema.clj
+++ b/src/metabase/revisions/schema.clj
@@ -29,3 +29,19 @@
[:message {:optional true} [:maybe :string]]
[:most_recent {:optional true} [:maybe :boolean]]
[:metabase_version {:optional true} [:maybe :string]]])
+
+;; these are all maybes as sometimes revisions don't exist, or users might be missing the names, etc
+(mr/def ::last-edit-info
+ "Schema of the `:last-edit-info` map. A subset of a user with a timestamp indicating when the last edit was."
+ [:map
+ [:timestamp [:maybe :any]]
+ [:id [:maybe ms/PositiveInt]]
+ [:first_name [:maybe :string]]
+ [:last_name [:maybe :string]]
+ [:email [:maybe :string]]])
+
+(mr/def ::maybe-annotated
+ "Spec for an item annotated with last-edit-info. Items are cards or dashboards. Optional because we may not always
+ have revision history for all cards/dashboards."
+ [:map
+ [:last-edit-info {:optional true} ::last-edit-info]])
diff --git a/src/metabase/server/handler.clj b/src/metabase/server/handler.clj
index d3004fea603..3b0780c2eb1 100644
--- a/src/metabase/server/handler.clj
+++ b/src/metabase/server/handler.clj
@@ -1,10 +1,10 @@
(ns metabase.server.handler
"Top-level Metabase Ring handler."
(:require
- [metabase.agent-api.usage :as agent-api.usage]
[metabase.analytics.core :as analytics]
[metabase.api.macros :as api.macros]
[metabase.config.core :as config]
+ [metabase.metabot.agent-api.usage :as agent-api.usage]
[metabase.server.middleware.auth :as mw.auth]
[metabase.server.middleware.body-limit :as mw.body-limit]
[metabase.server.middleware.browser-cookie :as mw.browser-cookie]
diff --git a/src/metabase/transforms/crud.clj b/src/metabase/transforms/crud.clj
index 2b46cb8590e..65ccf70876f 100644
--- a/src/metabase/transforms/crud.clj
+++ b/src/metabase/transforms/crud.clj
@@ -15,6 +15,7 @@
[metabase.transforms-base.ordering :as transforms-base.ordering]
[metabase.transforms-base.util :as transforms-base.u]
[metabase.transforms.db :as transforms.db]
+ [metabase.transforms.feature-gating :as transforms.gating]
[metabase.transforms.models.transform :as transform.model]
[metabase.transforms.util :as transforms.u]
[metabase.util :as u]
@@ -116,7 +117,7 @@
(defn get-transforms
"Get a list of transforms."
[& {:keys [last-run-start-time last-run-statuses tag-ids database-id]}]
- (let [enabled-types (transforms.u/enabled-source-types-for-user)]
+ (let [enabled-types (transforms.gating/enabled-source-types-for-user)]
(api/check-403 (seq enabled-types))
(let [transforms (transforms.db/transforms-of-source-types enabled-types database-id)]
(->> (t2/hydrate transforms :last_run :transform_tag_ids :creator :owner :can_read :can_write :can_execute)
diff --git a/src/metabase/transforms/feature_gating.clj b/src/metabase/transforms/feature_gating.clj
index b2d3fce5f3d..647a543d537 100644
--- a/src/metabase/transforms/feature_gating.clj
+++ b/src/metabase/transforms/feature_gating.clj
@@ -1,5 +1,6 @@
(ns metabase.transforms.feature-gating
(:require
+ [metabase.api.common :as api]
[metabase.premium-features.core :as premium-features]))
(defn enabled-source-types
@@ -8,3 +9,9 @@
(cond-> #{}
(premium-features/query-transforms-enabled?) (into ["native" "mbql"])
(premium-features/python-transforms-enabled?) (conj "python")))
+
+(defn enabled-source-types-for-user
+ "Returns set of enabled source types for WHERE clause filtering."
+ []
+ (when (api/entitled-data-analyst?)
+ (enabled-source-types)))
diff --git a/src/metabase/transforms/util.clj b/src/metabase/transforms/util.clj
index 043e56331c4..f700612a6ca 100644
--- a/src/metabase/transforms/util.clj
+++ b/src/metabase/transforms/util.clj
@@ -24,7 +24,6 @@
[metabase.transforms-base.util :as transforms-base.u]
[metabase.transforms.canceling :as canceling]
[metabase.transforms.db :as transforms.db]
- [metabase.transforms.feature-gating :as transforms.gating]
[metabase.transforms.instrumentation :as transforms.instrumentation]
[metabase.transforms.models.transform-run :as transform-run]
[metabase.transforms.settings :as transforms.settings]
@@ -45,12 +44,6 @@
(transforms-base.u/python-transform? transform) (premium-features/python-transforms-enabled?)
:else false))
-(defn enabled-source-types-for-user
- "Returns set of enabled source types for WHERE clause filtering."
- []
- (when (api/entitled-data-analyst?)
- (transforms.gating/enabled-source-types)))
-
(defn- source-query-permissions-ok?
"Whether the current user may run a query transform's source `query`, per the query processor's own permission
check. The query is preprocessed first so references that only appear after expansion (cards, snippets) are
diff --git a/test/metabase/channel/email_test.clj b/test/metabase/channel/email_test.clj
index 0d1e1ebf52c..49840ce7db5 100644
--- a/test/metabase/channel/email_test.clj
+++ b/test/metabase/channel/email_test.clj
@@ -6,8 +6,8 @@
[clojure.test :refer :all]
[medley.core :as m]
[metabase.audit-app.events.audit-log]
- [metabase.channel.api.email :as api.email]
[metabase.channel.email :as email]
+ [metabase.channel.rest.api.email :as api.email]
[metabase.channel.settings :as channel.settings]
[metabase.config.core :as config]
[metabase.notification.send :as notification.send]
diff --git a/test/metabase/channel/api/channel_test.clj b/test/metabase/channel/rest/api/channel_test.clj
similarity index 99%
rename from test/metabase/channel/api/channel_test.clj
rename to test/metabase/channel/rest/api/channel_test.clj
index 7edd4820ab1..155d86ff53c 100644
--- a/test/metabase/channel/api/channel_test.clj
+++ b/test/metabase/channel/rest/api/channel_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.channel.api.channel-test
+(ns metabase.channel.rest.api.channel-test
(:require
[clojure.test :refer :all]
[metabase.channel.core :as channel]
diff --git a/test/metabase/channel/api/email_test.clj b/test/metabase/channel/rest/api/email_test.clj
similarity index 99%
rename from test/metabase/channel/api/email_test.clj
rename to test/metabase/channel/rest/api/email_test.clj
index 57a15ed2d3b..dbcf32f71e1 100644
--- a/test/metabase/channel/api/email_test.clj
+++ b/test/metabase/channel/rest/api/email_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.channel.api.email-test
+(ns metabase.channel.rest.api.email-test
(:require
[clojure.test :refer :all]
[metabase.channel.email :as email]
diff --git a/test/metabase/channel/api/slack_test.clj b/test/metabase/channel/rest/api/slack_test.clj
similarity index 99%
rename from test/metabase/channel/api/slack_test.clj
rename to test/metabase/channel/rest/api/slack_test.clj
index f707c6bdd31..7bda263315a 100644
--- a/test/metabase/channel/api/slack_test.clj
+++ b/test/metabase/channel/rest/api/slack_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.channel.api.slack-test
+(ns metabase.channel.rest.api.slack-test
(:require
[clojure.string :as str]
[clojure.test :refer :all]
@@ -7,7 +7,7 @@
[metabase.analytics-interface.core :as analytics]
[metabase.analytics.prometheus :as prometheus]
[metabase.analytics.prometheus-test :as prometheus-test]
- [metabase.channel.api.slack :as api.slack]
+ [metabase.channel.rest.api.slack :as api.slack]
[metabase.channel.settings :as channel.settings]
[metabase.channel.slack :as slack]
[metabase.config.core :as config]
diff --git a/test/metabase/channel/slack_test.clj b/test/metabase/channel/slack_test.clj
index 298b7bc3c2d..0a9964f2a29 100644
--- a/test/metabase/channel/slack_test.clj
+++ b/test/metabase/channel/slack_test.clj
@@ -4,9 +4,9 @@
[clojure.set :as s]
[clojure.test :refer :all]
[medley.core :as m]
- [metabase.channel.api.slack :as channel.api.slack]
[metabase.channel.impl.slack :as channel.impl.slack]
[metabase.channel.render.core :as channel.render]
+ [metabase.channel.rest.api.slack :as channel.api.slack]
[metabase.channel.settings :as channel.settings]
[metabase.channel.slack :as slack]
[metabase.notification.test-util :as notification.tu]
diff --git a/test/metabase/agent_api/usage_test.clj b/test/metabase/metabot/agent_api/usage_test.clj
similarity index 92%
rename from test/metabase/agent_api/usage_test.clj
rename to test/metabase/metabot/agent_api/usage_test.clj
index c2ee1dce996..0a7d92f1bf4 100644
--- a/test/metabase/agent_api/usage_test.clj
+++ b/test/metabase/metabot/agent_api/usage_test.clj
@@ -1,7 +1,7 @@
-(ns metabase.agent-api.usage-test
+(ns metabase.metabot.agent-api.usage-test
(:require
[clojure.test :refer :all]
- [metabase.agent-api.usage :as agent-api.usage]))
+ [metabase.metabot.agent-api.usage :as agent-api.usage]))
(deftest templatize-uri-test
(testing "numeric path segments are replaced with :id"
diff --git a/test/metabase/notification/models_test.clj b/test/metabase/notification/models_test.clj
index 10d7f425a2e..c5818aa093a 100644
--- a/test/metabase/notification/models_test.clj
+++ b/test/metabase/notification/models_test.clj
@@ -2,7 +2,7 @@
{:clj-kondo/config '{:linters {:deprecated-var {:exclude {metabase.test.data/mbql-query {:namespaces [metabase.notification.models-test]}}}}}}
(:require
[clojure.test :refer :all]
- [metabase.channel.api.channel-test :as api.channel-test]
+ [metabase.channel.rest.api.channel-test :as api.channel-test]
[metabase.events.core :as events]
[metabase.notification.models :as models.notification]
[metabase.notification.task.send :as task.notification]
diff --git a/test/metabase/premium_features/api_test.clj b/test/metabase/premium_features/rest/api_test.clj
similarity index 99%
rename from test/metabase/premium_features/api_test.clj
rename to test/metabase/premium_features/rest/api_test.clj
index 50e465982b7..1d64ccae503 100644
--- a/test/metabase/premium_features/api_test.clj
+++ b/test/metabase/premium_features/rest/api_test.clj
@@ -1,4 +1,4 @@
-(ns metabase.premium-features.api-test
+(ns metabase.premium-features.rest.api-test
(:require
[clj-http.client :as http]
[clj-http.cookies :as cookies]
diff --git a/test/metabase/pulse/api/pulse_test.clj b/test/metabase/pulse/api/pulse_test.clj
index 46114660a59..a7aaa70e489 100644
--- a/test/metabase/pulse/api/pulse_test.clj
+++ b/test/metabase/pulse/api/pulse_test.clj
@@ -7,8 +7,8 @@
[java-time.api :as t]
[medley.core :as m]
[metabase.api.response :as api.response]
- [metabase.channel.api.channel-test :as api.channel-test]
[metabase.channel.impl.http-test :as channel.http-test]
+ [metabase.channel.rest.api.channel-test :as api.channel-test]
[metabase.channel.settings :as channel.settings]
[metabase.driver :as driver]
[metabase.lib.core :as lib]
diff --git a/test/metabase/documents/revisions/integration_test.clj b/test/metabase/revisions/impl/document_integration_test.clj
similarity index 99%
rename from test/metabase/documents/revisions/integration_test.clj
rename to test/metabase/revisions/impl/document_integration_test.clj
index 8955dabf89a..ad3d5f82714 100644
--- a/test/metabase/documents/revisions/integration_test.clj
+++ b/test/metabase/revisions/impl/document_integration_test.clj
@@ -1,11 +1,11 @@
-(ns metabase.documents.revisions.integration-test
+(ns metabase.revisions.impl.document-integration-test
"Integration tests for Document revision history including API endpoints, events, and permissions."
(:require
[clojure.string :as str]
[clojure.test :refer :all]
[metabase.config.core :as config]
- [metabase.documents.revisions.impl]
[metabase.events.core :as events]
+ [metabase.revisions.impl.document]
[metabase.revisions.models.revision :as revision]
[metabase.test :as mt]
[metabase.util :as u]
diff --git a/test/metabase/documents/revisions/impl_test.clj b/test/metabase/revisions/impl/document_test.clj
similarity index 96%
rename from test/metabase/documents/revisions/impl_test.clj
rename to test/metabase/revisions/impl/document_test.clj
index 7a284bbf7da..e0663af8b79 100644
--- a/test/metabase/documents/revisions/impl_test.clj
+++ b/test/metabase/revisions/impl/document_test.clj
@@ -1,8 +1,8 @@
-(ns metabase.documents.revisions.impl-test
+(ns metabase.revisions.impl.document-test
"Unit tests for Document revision serialization and reversion functionality."
(:require
[clojure.test :refer :all]
- [metabase.documents.revisions.impl]
+ [metabase.revisions.impl.document]
[metabase.revisions.models.revision :as revision]
[metabase.test :as mt]
[toucan2.core :as t2]))
@@ -91,7 +91,7 @@
(deftest excluded-columns-test
(testing "excluded columns constant contains expected fields"
- (let [excluded-columns @#'metabase.documents.revisions.impl/excluded-columns-for-document-revision]
+ (let [excluded-columns @#'metabase.revisions.impl.document/excluded-columns-for-document-revision]
(is (contains? excluded-columns :id))
(is (contains? excluded-columns :creator_id))
(is (contains? excluded-columns :created_at))
diff --git a/test/metabase/transforms/feature_gating_test.clj b/test/metabase/transforms/feature_gating_test.clj
new file mode 100644
index 00000000000..2d4ebc7787e
--- /dev/null
+++ b/test/metabase/transforms/feature_gating_test.clj
@@ -0,0 +1,20 @@
+(ns metabase.transforms.feature-gating-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase.test :as mt]
+ [metabase.transforms.feature-gating :as transforms.gating]))
+
+(deftest enabled-source-types-for-user-follows-the-advanced-permissions-feature-test
+ (testing "a data analyst sees the enabled source types only while advanced-permissions is available"
+ (mt/with-data-analyst-role! (mt/user->id :rasta)
+ (mt/with-current-user (mt/user->id :rasta)
+ (mt/when-ee-evailable
+ (mt/with-premium-features #{:transforms-basic :hosting :advanced-permissions}
+ (is (= #{"native" "mbql"} (transforms.gating/enabled-source-types-for-user)))))
+ (testing "and none once the feature is gone"
+ (mt/with-premium-features #{:transforms-basic :hosting}
+ (is (nil? (transforms.gating/enabled-source-types-for-user))))))))
+ (testing "a superuser is unaffected"
+ (mt/with-current-user (mt/user->id :crowberto)
+ (mt/with-premium-features #{:transforms-basic :hosting}
+ (is (= #{"native" "mbql"} (transforms.gating/enabled-source-types-for-user)))))))
diff --git a/test/metabase/transforms/util_test.clj b/test/metabase/transforms/util_test.clj
index 25f71b7977c..bef57ed0788 100644
--- a/test/metabase/transforms/util_test.clj
+++ b/test/metabase/transforms/util_test.clj
@@ -825,18 +825,3 @@
(let [table (t2/select-one :model/Table (:id @synced-table))]
(is (nil? (:schema table))
"Table schema should remain nil when physical table isn't in default schema")))))))
-
-(deftest enabled-source-types-for-user-follows-the-advanced-permissions-feature-test
- (testing "a data analyst sees the enabled source types only while advanced-permissions is available"
- (mt/with-data-analyst-role! (mt/user->id :rasta)
- (mt/with-current-user (mt/user->id :rasta)
- (mt/when-ee-evailable
- (mt/with-premium-features #{:transforms-basic :hosting :advanced-permissions}
- (is (= #{"native" "mbql"} (transforms.u/enabled-source-types-for-user)))))
- (testing "and none once the feature is gone"
- (mt/with-premium-features #{:transforms-basic :hosting}
- (is (nil? (transforms.u/enabled-source-types-for-user))))))))
- (testing "a superuser is unaffected"
- (mt/with-current-user (mt/user->id :crowberto)
- (mt/with-premium-features #{:transforms-basic :hosting}
- (is (= #{"native" "mbql"} (transforms.u/enabled-source-types-for-user)))))))