Skip to content

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

Address review comments from pr #69874 (#72500)

Andersondc2bfa264bf5
diff --git a/enterprise/backend/src/metabase_enterprise/remote_sync/settings.clj b/enterprise/backend/src/metabase_enterprise/remote_sync/settings.clj
index 78c21b7e08b..abff003cc9d 100644
--- a/enterprise/backend/src/metabase_enterprise/remote_sync/settings.clj
+++ b/enterprise/backend/src/metabase_enterprise/remote_sync/settings.clj
@@ -207,9 +207,9 @@
(setting/set! :remote-sync-branch nil))
(let [current-token (setting/get :remote-sync-token)
obfuscated? (= remote-sync-token (setting/obfuscate-value current-token))
- token-to-check (if obfuscated? current-token remote-sync-token)
- _ (when updating-git-settings?
- (check-git-settings! (assoc settings :remote-sync-token token-to-check)))]
+ token-to-check (if obfuscated? current-token remote-sync-token)]
+ (when updating-git-settings?
+ (check-git-settings! (assoc settings :remote-sync-token token-to-check)))
(t2/with-transaction [_conn]
(doseq [k [:remote-sync-url :remote-sync-token :remote-sync-type :remote-sync-branch :remote-sync-auto-import :remote-sync-transforms]]
(when (and (contains? settings k)
diff --git a/enterprise/backend/test/metabase_enterprise/remote_sync/settings_test.clj b/enterprise/backend/test/metabase_enterprise/remote_sync/settings_test.clj
index 6d7bf6ad178..268231d1e4b 100644
--- a/enterprise/backend/test/metabase_enterprise/remote_sync/settings_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/remote_sync/settings_test.clj
@@ -57,13 +57,11 @@
(settings/check-and-update-remote-settings! {:remote-sync-transforms true})
(is (false? @git-check-called?) "Git validation should not be called for transforms-only update")
(is (true? (settings/remote-sync-transforms))))
-
(testing "Updating only remote-sync-auto-import does not check git settings"
(reset! git-check-called? false)
(settings/check-and-update-remote-settings! {:remote-sync-auto-import true})
(is (false? @git-check-called?) "Git validation should not be called for auto-import-only update")
(is (true? (settings/remote-sync-auto-import))))
-
(testing "Updating both non-git settings does not check git settings"
(reset! git-check-called? false)
(settings/check-and-update-remote-settings! {:remote-sync-transforms false