From 3bb1b98b0ec5b3105eac53674d888a3d47c86680 Mon Sep 17 00:00:00 2001 From: Marica Odagaki Date: Wed, 15 Feb 2017 00:08:32 -0800 Subject: [PATCH] FIX: admin dashboard shouldn't complain when using iam profile for s3 access Previous code wasn't working as intended because it was parsed as (bad_keys = (access_key or secret_key)) and !use_iam_profile because of Ruby's operator precedence: `=` binds more eagerly than `and`. http://ruby-doc.org/core-2.3.1/doc/syntax/precedence_rdoc.html See also: https://github.com/bbatsov/ruby-style-guide#no-and-or-or --- app/models/admin_dashboard_data.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index 5ac4bd55c35..b6b0b32ded4 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -198,7 +198,7 @@ class AdminDashboardData end def s3_config_check - bad_keys = (SiteSetting.s3_access_key_id.blank? or SiteSetting.s3_secret_access_key.blank?) and !SiteSetting.s3_use_iam_profile + bad_keys = (SiteSetting.s3_access_key_id.blank? || SiteSetting.s3_secret_access_key.blank?) && !SiteSetting.s3_use_iam_profile return I18n.t('dashboard.s3_config_warning') if SiteSetting.enable_s3_uploads and (bad_keys or SiteSetting.s3_upload_bucket.blank?) return I18n.t('dashboard.s3_backup_config_warning') if SiteSetting.enable_s3_backups and (bad_keys or SiteSetting.s3_backup_bucket.blank?)