The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
fix: strip some attached dwh config keys on update (#66594)
Filipe Silvab3d775360960
diff --git a/enterprise/backend/src/metabase_enterprise/advanced_config/file/databases.clj b/enterprise/backend/src/metabase_enterprise/advanced_config/file/databases.cljindex 7ba921ae6e8..f4606174136 100644--- a/enterprise/backend/src/metabase_enterprise/advanced_config/file/databases.clj+++ b/enterprise/backend/src/metabase_enterprise/advanced_config/file/databases.clj@@ -56,6 +56,12 @@{:auto_cruft_tables :auto-cruft-tables:auto_cruft_columns :auto-cruft-columns}))+(defn- strip-attached-dwh-update-ks+ "When using the MB Cloud attached DWH, we don't want all config keys to be set on every restart+ because the customer might have changed some of them meanwhile."+ [database]+ (dissoc database :uploads_enabled :uploads_schema_name :uploads_table_prefix))+(defn- init-from-config-file@@ -74,7 +80,8 @@;; assert that we are able to connect to this Database. Otherwise, throw an Exception.(driver.u/can-connect-with-details? (keyword (:engine database)) (:details database) :throw-exceptions)(if-let [existing-database-id (t2/select-one-pk :model/Database :engine (:engine database), :name (:name database))]- (do+ (let [database (cond-> database+ (:is_attached_dwh database) strip-attached-dwh-update-ks)](log/info (u/format-color :blue "Updating Database %s %s" (:engine database) (pr-str (:name database))))(t2/update! :model/Database existing-database-id (normalize-settings database)))(dodiff --git a/enterprise/backend/test/metabase_enterprise/advanced_config/file/databases_test.clj b/enterprise/backend/test/metabase_enterprise/advanced_config/file/databases_test.cljindex e29196a119d..011d862e1ec 100644--- a/enterprise/backend/test/metabase_enterprise/advanced_config/file/databases_test.clj+++ b/enterprise/backend/test/metabase_enterprise/advanced_config/file/databases_test.clj@@ -23,12 +23,13 @@(deftest init-from-config-file-test(mt/with-temporary-setting-values [config-from-file-sync-databases true](let [db-type (mdb/db-type)- original-db (mt/with-driver db-type (mt/db))]+ original-db (mt/with-driver db-type (mt/db))+ config {:version 1+ :config {:databases [{:name test-db-name+ :engine (name db-type)+ :details (:details original-db)}]}}](try- (binding [advanced-config.file/*config* {:version 1- :config {:databases [{:name test-db-name- :engine (name db-type)- :details (:details original-db)}]}}]+ (binding [advanced-config.file/*config* config](testing "Create a Database if it does not already exist"(is (= :ok(advanced-config.file/initialize!)))@@ -43,6 +44,27 @@(is (= 1(t2/count :model/Database :name test-db-name)))(is (partial= {:engine db-type}+ (t2/select-one :model/Database :name test-db-name))))+ (testing "updates db"+ (is (= :ok+ (binding [advanced-config.file/*config*+ (assoc-in config [:config :databases 0 :description] "foo")]+ (advanced-config.file/initialize!))))+ (is (partial= {:description "foo"}+ (t2/select-one :model/Database :name test-db-name))))+ (testing "does not re-set attached dwh db keys on update"+ (is (= :ok+ (binding [advanced-config.file/*config*+ (update-in config [:config :databases 0] merge+ {:is_attached_dwh true+ :uploads_enabled true+ :uploads_schema_name "db_123"+ :uploads_table_prefix "upload_"})]+ (advanced-config.file/initialize!))))+ (is (partial= {:is_attached_dwh true+ :uploads_enabled false+ :uploads_schema_name nil+ :uploads_table_prefix nil}(t2/select-one :model/Database :name test-db-name)))))))(finally(t2/delete! :model/Database :name test-db-name))))))