get tests to pass

src/metabase/models/setting.clj

@@ -380,7 +380,7 @@
      :env_name       (env-var-name setting)
      :description    (:description setting)
      :default        (or (when env-value
-                           (format "Using $%s" env-value))
+                           (format "Using $%s" (env-var-name setting)))
                          (:default setting))}))
 
 (defn all

test/metabase/api/setting_test.clj

@@ -15,8 +15,8 @@
 ;; ## GET /api/setting
 ;; Check that we can fetch all Settings for Org
 (expect
- [{:key "test-setting-1", :value nil,     :description "Test setting - this only shows up in dev (1)", :default "Using $MB_TEST_SETTING_1"}
-  {:key "test-setting-2", :value "FANCY", :description "Test setting - this only shows up in dev (2)", :default "[Default Value]"}]
+ [{:key "test-setting-1", :value nil,     :is_env_setting true,  :env_name "MB_TEST_SETTING_1", :description "Test setting - this only shows up in dev (1)", :default "Using $MB_TEST_SETTING_1"}
+  {:key "test-setting-2", :value "FANCY", :is_env_setting false, :env_name "MB_TEST_SETTING_2", :description "Test setting - this only shows up in dev (2)", :default "[Default Value]"}]
  (do (set-settings! nil "FANCY")
      (fetch-test-settings)))
 

test/metabase/models/setting_test.clj

@@ -125,47 +125,47 @@
 
 ;; user-facing-info w/ no db value, no env var value, no default value
 (expect
-  {:value nil, :default nil}
+  {:value nil, :is_env_setting false, :env_name "MB_TEST_SETTING_1", :default nil}
   (user-facing-info-with-db-and-env-var-values :test-setting-1 nil nil))
 
 ;; user-facing-info w/ no db value, no env var value, default value
 (expect
-  {:value nil, :default "[Default Value]"}
+  {:value nil, :is_env_setting false, :env_name "MB_TEST_SETTING_2", :default "[Default Value]"}
   (user-facing-info-with-db-and-env-var-values :test-setting-2 nil nil))
 
 ;; user-facing-info w/ no db value, env var value, no default value -- shouldn't leak env var value
 (expect
-  {:value nil, :default "Using $MB_TEST_SETTING_1"}
+  {:value nil, :is_env_setting true, :env_name "MB_TEST_SETTING_1", :default "Using $MB_TEST_SETTING_1"}
   (user-facing-info-with-db-and-env-var-values :test-setting-1 nil "TOUCANS"))
 
 ;; user-facing-info w/ no db value, env var value, default value
 (expect
-  {:value nil, :default "Using $MB_TEST_SETTING_2"}
+  {:value nil,  :is_env_setting true, :env_name "MB_TEST_SETTING_2", :default "Using $MB_TEST_SETTING_2"}
   (user-facing-info-with-db-and-env-var-values :test-setting-2 nil "TOUCANS"))
 
 ;; user-facing-info w/ db value, no env var value, no default value
 (expect
-  {:value "WOW", :default nil}
+  {:value "WOW", :is_env_setting false, :env_name "MB_TEST_SETTING_1", :default nil}
   (user-facing-info-with-db-and-env-var-values :test-setting-1 "WOW" nil))
 
 ;; user-facing-info w/ db value, no env var value, default value
 (expect
-  {:value "WOW", :default "[Default Value]"}
+  {:value "WOW", :is_env_setting false, :env_name "MB_TEST_SETTING_2", :default "[Default Value]"}
   (user-facing-info-with-db-and-env-var-values :test-setting-2 "WOW" nil))
 
 ;; user-facing-info w/ db value, env var value, no default value -- the DB value should take precedence over the env var
 (expect
-  {:value "WOW", :default "Using $MB_TEST_SETTING_1"}
+  {:value "WOW", :is_env_setting true, :env_name "MB_TEST_SETTING_1", :default "Using $MB_TEST_SETTING_1"}
   (user-facing-info-with-db-and-env-var-values :test-setting-1 "WOW" "ENV VAR"))
 
 ;; user-facing-info w/ db value, env var value, default value -- env var should take precedence over default value
 (expect
-  {:value "WOW", :default "Using $MB_TEST_SETTING_2"}
+  {:value "WOW", :is_env_setting true, :env_name "MB_TEST_SETTING_2", :default "Using $MB_TEST_SETTING_2"}
   (user-facing-info-with-db-and-env-var-values :test-setting-2 "WOW" "ENV VAR"))
 
 ;; all
 (expect
-  {:key :test-setting-2, :value "TOUCANS", :description "Test setting - this only shows up in dev (2)", :default "[Default Value]"}
+  {:key :test-setting-2, :value "TOUCANS", :description "Test setting - this only shows up in dev (2)",  :is_env_setting false, :env_name "MB_TEST_SETTING_2", :default "[Default Value]"}
   (do (set-settings! nil "TOUCANS")
       (some (fn [setting]
               (when (re-find #"^test-setting-2$" (name (:key setting)))
@@ -174,8 +174,8 @@
 
 ;; all
 (expect
-  [{:key :test-setting-1, :value nil,  :description "Test setting - this only shows up in dev (1)", :default "Using $MB_TEST_SETTING_1"}
-   {:key :test-setting-2, :value "S2", :description "Test setting - this only shows up in dev (2)", :default "[Default Value]"}]
+  [{:key :test-setting-1, :value nil, :is_env_setting true, :env_name "MB_TEST_SETTING_1", :description "Test setting - this only shows up in dev (1)", :default "Using $MB_TEST_SETTING_1"}
+   {:key :test-setting-2, :value "S2", :is_env_setting false, :env_name "MB_TEST_SETTING_2",  :description "Test setting - this only shows up in dev (2)", :default "[Default Value]"}]
   (do (set-settings! nil "S2")
       (for [setting (setting/all)
             :when   (re-find #"^test-setting-\d$" (name (:key setting)))]
@@ -185,12 +185,12 @@
 ;;; ------------------------------------------------------------ BOOLEAN SETTINGS ------------------------------------------------------------
 
 (expect
-  {:value nil, :default nil}
+  {:value nil, :is_env_setting false, :env_name "MB_TEST_BOOLEAN_SETTING", :default nil}
   (user-facing-info-with-db-and-env-var-values :test-boolean-setting nil nil))
 
 ;; boolean settings shouldn't be obfuscated when set by env var
 (expect
-  {:value true, :default "Using $MB_TEST_BOOLEAN_SETTING"}
+  {:value true, :is_env_setting true, :env_name "MB_TEST_BOOLEAN_SETTING", :default "Using $MB_TEST_BOOLEAN_SETTING"}
   (user-facing-info-with-db-and-env-var-values :test-boolean-setting nil "true"))
 
 ;; env var values should be case-insensitive