FEATURE: allow shadowing all s3 settings

approved
#1

FEATURE: allow shadowing all s3 settings

Previously enable s3 uploads and s3 upload bucket were not shadowed.

This caused confusion when people were configuring stuff via env cause most of s3 settings are shadowed.

diff --git a/config/site_settings.yml b/config/site_settings.yml
index d513c6b..a690f16 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1074,6 +1074,7 @@ files:
   enable_s3_uploads:
     default: false
     client: true
+    shadowed_by_global: true
   s3_use_iam_profile: false
   s3_access_key_id:
     default: ""
@@ -1090,6 +1091,7 @@ files:
   s3_upload_bucket:
     default: ""
     regex: '^[a-z0-9\-\/_]+$' # can't use '.' when using HTTPS
+    shadowed_by_global: true
   s3_endpoint:
     default: ""
     regex: '^https?:\/\/.+[^\/]$'

GitHub sha: dafc941a

Approved #2
#3

Is there a reason why a setting should not be shadowed?

#4

I discussed this with @tgxworld in the past, honestly… I am not sure. I agree this is pointless mental weight we are carrying and busywork and the risk here is almost nothing.

There is some slight risk that globals and site settings could clash I guess.

1 Like