From 32d00cb2b90f01ebbedfc39d438a1da6b34ece69 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 28 Nov 2018 10:41:05 +0100 Subject: [PATCH] Make AWS access key variables optional [SCI-2727] --- config/initializers/aws.rb | 9 ++------- config/initializers/paperclip.rb | 6 ++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/config/initializers/aws.rb b/config/initializers/aws.rb index 711328c42..a5db3cb96 100644 --- a/config/initializers/aws.rb +++ b/config/initializers/aws.rb @@ -1,10 +1,5 @@ -if ENV['AWS_ACCESS_KEY_ID'] - Aws.config.update( - region: ENV['AWS_REGION'], - credentials: Aws::Credentials.new( - ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'] - ) - ) +# frozen_string_literal: true +if ENV['PAPERCLIP_STORAGE'] == 's3' S3_BUCKET = Aws::S3::Resource.new.bucket(ENV['S3_BUCKET']) end diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index c02f3afec..8e65d0ee7 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -14,10 +14,8 @@ Paperclip::Attachment.default_options.merge!( Paperclip::UriAdapter.register if ENV['PAPERCLIP_STORAGE'] == 's3' - if ENV['S3_BUCKET'].nil? || ENV['AWS_REGION'].nil? || - ENV['AWS_ACCESS_KEY_ID'].nil? || ENV['AWS_SECRET_ACCESS_KEY'].nil? - puts 'WARNING! Environment variables S3_BUCKET, AWS_REGION, '\ - 'AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY must be set.' + if ENV['S3_BUCKET'].nil? || ENV['AWS_REGION'].nil? + puts 'WARNING! Environment variables S3_BUCKET and AWS_REGION must be set.' exit 1 end