Skip to content

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

GDGT-1552 feat: i18n workspace permission error msgs (#72152)

YB1e81f6f4aea8
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.clj
index 8671af21870..7dde2fdded2 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
@@ -1457,20 +1457,20 @@
(let [init-result (try
(driver/init-workspace-isolation! driver database test-workspace)
(catch Exception e
- (throw (ex-info (format "Failed to initialize workspace isolation: %s" (ex-message e))
+ (throw (ex-info (tru "Failed to initialize workspace isolation: {0}" (ex-message e))
{:step :init} e))))
workspace-with-details (merge test-workspace init-result)]
(when test-table
(try
(driver/grant-workspace-read-access! driver database workspace-with-details [test-table])
(catch Exception e
- (throw (ex-info (format "Failed to grant read access to table %s.%s: %s"
- (:schema test-table) (:name test-table) (ex-message e))
+ (throw (ex-info (tru "Failed to grant read access to table {0}.{1}: {2}"
+ (:schema test-table) (:name test-table) (ex-message e))
{:step :grant :table test-table} e)))))
(try
(driver/destroy-workspace-isolation! driver database workspace-with-details)
(catch Exception e
- (throw (ex-info (format "Failed to destroy workspace isolation: %s" (ex-message e))
+ (throw (ex-info (tru "Failed to destroy workspace isolation: {0}" (ex-message e))
{:step :destroy} e)))))
nil
(catch Exception e
diff --git a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
index b50129d10c9..9836b71dd49 100644
--- a/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
+++ b/modules/drivers/clickhouse/src/metabase/driver/clickhouse.clj
@@ -20,6 +20,7 @@
[metabase.driver.sql.util :as sql.u]
[metabase.driver.util :as driver.u]
[metabase.util :as u]
+ [metabase.util.i18n :refer [tru]]
[metabase.util.log :as log]
[metabase.util.performance :refer [not-empty]])
(:import
@@ -397,7 +398,7 @@
(sql.u/quote-name :clickhouse :table (:name table))
qu))]
(when-not read-user-name
- (throw (ex-info "Workspace isolation is not properly initialized - missing read user name"
+ (throw (ex-info (tru "Workspace isolation is not properly initialized - missing read user name")
{:workspace-id (:id workspace) :step :grant})))
(jdbc/with-db-transaction [t-conn (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(with-open [stmt (.createStatement ^Connection (:connection t-conn))]
diff --git a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj b/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
index 8cc13105011..2f3d258bf7d 100644
--- a/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
+++ b/modules/drivers/snowflake/src/metabase/driver/snowflake.clj
@@ -1061,10 +1061,10 @@
:password (driver.u/random-workspace-password)}
conn-spec (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(when-not db-name
- (throw (ex-info "Snowflake database configuration is missing required 'db' (database name) setting"
+ (throw (ex-info (tru "Snowflake database configuration is missing required ''db'' (database name) setting")
{:database-id (:id database) :step :init})))
(when-not warehouse
- (throw (ex-info "Snowflake database configuration is missing required 'warehouse' setting"
+ (throw (ex-info (tru "Snowflake database configuration is missing required ''warehouse'' setting")
{:database-id (:id database) :step :init})))
;; Snowflake RBAC: create schema -> create role -> grant privileges to role -> create user -> grant role to user
(doseq [sql [(format "CREATE SCHEMA IF NOT EXISTS \"%s\".\"%s\"" db-name schema-name)
@@ -1090,7 +1090,7 @@
username (driver.u/workspace-isolation-user-name workspace)
conn-spec (sql-jdbc.conn/db->pooled-connection-spec (:id database))]
(when-not db-name
- (throw (ex-info "Snowflake database configuration is missing required 'db' (database name) setting"
+ (throw (ex-info (tru "Snowflake database configuration is missing required ''db'' (database name) setting")
{:database-id (:id database) :step :destroy})))
;; Drop in reverse order of creation: schema (CASCADE handles tables) -> user -> role
(doseq [sql [(format "DROP SCHEMA IF EXISTS \"%s\".\"%s\" CASCADE" db-name schema-name)
@@ -1104,10 +1104,10 @@
db-name (:db (driver.conn/effective-details database))
role-name (-> workspace :database_details :role)]
(when-not db-name
- (throw (ex-info "Snowflake database configuration is missing required 'db' (database name) setting"
+ (throw (ex-info (tru "Snowflake database configuration is missing required ''db'' (database name) setting")
{:database-id (:id database) :step :grant})))
(when-not role-name
- (throw (ex-info "Workspace isolation is not properly initialized - missing role name"
+ (throw (ex-info (tru "Workspace isolation is not properly initialized - missing role name")
{:workspace-id (:id workspace) :step :grant})))
(let [qdb (sql.u/quote-name :snowflake :schema db-name)
qr (sql.u/quote-name :snowflake :field role-name)]
diff --git a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
index 1f022ce5282..83e07a7309f 100644
--- a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
+++ b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
@@ -29,6 +29,7 @@
[metabase.sql-tools.core :as sql-tools]
[metabase.util :as u]
[metabase.util.honey-sql-2 :as h2x]
+ [metabase.util.i18n :refer [tru]]
[metabase.util.json :as json]
[metabase.util.log :as log]
[metabase.util.malli :as mu]
@@ -1170,7 +1171,7 @@
(let [conn-spec (sql-jdbc.conn/db->pooled-connection-spec (:id database))
username (-> workspace :database_details :user)]
(when-not username
- (throw (ex-info "Workspace isolation is not properly initialized - missing read user name"
+ (throw (ex-info (tru "Workspace isolation is not properly initialized - missing read user name")
{:workspace-id (:id workspace) :step :grant})))
;; Grant SELECT on each specific table only - no schema-level grants
(let [qu (sql.u/quote-name :sqlserver :field username)]
diff --git a/src/metabase/driver/mysql.clj b/src/metabase/driver/mysql.clj
index 0d928df67df..4990f86dd91 100644
--- a/src/metabase/driver/mysql.clj
+++ b/src/metabase/driver/mysql.clj
@@ -31,7 +31,7 @@
[metabase.util :as u]
[metabase.util.date-2 :as u.date]
[metabase.util.honey-sql-2 :as h2x]
- [metabase.util.i18n :refer [deferred-tru]]
+ [metabase.util.i18n :refer [deferred-tru tru]]
[metabase.util.log :as log]
[metabase.util.malli :as mu]
[metabase.util.performance :as perf :refer [get-in not-empty some]])
@@ -1310,22 +1310,22 @@
(let [init-result (try
(driver/init-workspace-isolation! driver database test-workspace)
(catch Exception e
- (throw (ex-info (format "Failed to initialize workspace isolation (CREATE DATABASE/USER): %s"
- (ex-message e))
+ (throw (ex-info (tru "Failed to initialize workspace isolation (CREATE DATABASE/USER): {0}"
+ (ex-message e))
{:step :init} e))))
workspace-with-details (merge test-workspace init-result)]
(when test-table
(try
(driver/grant-workspace-read-access! driver database workspace-with-details [test-table])
(catch Exception e
- (throw (ex-info (format "Failed to grant read access to table %s.%s: %s"
- (:schema test-table) (:name test-table) (ex-message e))
+ (throw (ex-info (tru "Failed to grant read access to table {0}.{1}: {2}"
+ (:schema test-table) (:name test-table) (ex-message e))
{:step :grant :table test-table} e)))))
(try
(driver/destroy-workspace-isolation! driver database workspace-with-details)
(catch Exception e
- (throw (ex-info (format "Failed to destroy workspace isolation (DROP DATABASE/USER): %s"
- (ex-message e))
+ (throw (ex-info (tru "Failed to destroy workspace isolation (DROP DATABASE/USER): {0}"
+ (ex-message e))
{:step :destroy} e))))
nil)
(catch Exception e
diff --git a/src/metabase/driver/sql_jdbc.clj b/src/metabase/driver/sql_jdbc.clj
index 3ee6341f940..6c34d12a442 100644
--- a/src/metabase/driver/sql_jdbc.clj
+++ b/src/metabase/driver/sql_jdbc.clj
@@ -20,6 +20,7 @@
[metabase.driver.sql.query-processor :as sql.qp]
[metabase.driver.sync :as driver.s]
[metabase.util.honey-sql-2 :as h2x]
+ [metabase.util.i18n :refer [tru]]
[metabase.util.malli :as mu]
[metabase.util.performance :refer [mapv]])
(:import
@@ -396,22 +397,22 @@
(let [init-result (try
(driver/init-workspace-isolation! driver database test-workspace)
(catch Exception e
- (throw (ex-info (format "Failed to initialize workspace isolation (CREATE SCHEMA/USER): %s"
- (ex-message e))
+ (throw (ex-info (tru "Failed to initialize workspace isolation (CREATE SCHEMA/USER): {0}"
+ (ex-message e))
{:step :init} e))))
workspace-with-details (merge test-workspace init-result)]
(when test-table
(try
(driver/grant-workspace-read-access! driver database workspace-with-details [test-table])
(catch Exception e
- (throw (ex-info (format "Failed to grant read access to table %s.%s: %s"
- (:schema test-table) (:name test-table) (ex-message e))
+ (throw (ex-info (tru "Failed to grant read access to table {0}.{1}: {2}"
+ (:schema test-table) (:name test-table) (ex-message e))
{:step :grant :table test-table} e)))))
(try
(driver/destroy-workspace-isolation! driver database workspace-with-details)
(catch Exception e
- (throw (ex-info (format "Failed to destroy workspace isolation (DROP SCHEMA/USER): %s"
- (ex-message e))
+ (throw (ex-info (tru "Failed to destroy workspace isolation (DROP SCHEMA/USER): {0}"
+ (ex-message e))
{:step :destroy} e)))))
nil
(catch Exception e