Merge pull request #2235 from jonodrew/aws-s3

Aws s3

Author: matyikriszta

Gemfile

@@ -9,7 +9,6 @@ gem 'bootsnap', require: false
 
 gem 'acts-as-taggable-on'
 gem 'carrierwave'
-gem 'carrierwave-ftp', github: 'luan/carrierwave-ftp', ref: '5481c13', require: 'carrierwave/storage/sftp'
 gem 'cocoon'
 gem 'delayed_job'
 gem 'delayed_job_active_record'
@@ -114,3 +113,5 @@ end
 
 gem 'rollbar'
 gem 'skylight'
+
+gem "carrierwave-aws", "~> 1.6"

Gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: https://github.com/luan/carrierwave-ftp.git
-  revision: 5481c1335fd3285d2057c7056e8a4662daa68dd4
-  ref: 5481c13
-  specs:
-    carrierwave-ftp (0.4.1)
-      carrierwave (>= 0.6.2)
-      double-bag-ftps (~> 0.1.4)
-      net-sftp (~> 4.0.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -83,6 +73,24 @@ GEM
     ast (2.4.2)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1137.0)
+    aws-sdk-core (3.227.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.108.0)
+      aws-sdk-core (~> 3, >= 3.227.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.194.0)
+      aws-sdk-core (~> 3, >= 3.227.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
+      aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
@@ -117,6 +125,9 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
+    carrierwave-aws (1.6.0)
+      aws-sdk-s3 (~> 1.0)
+      carrierwave (>= 2.0, < 4)
     childprocess (5.1.0)
       logger (~> 1.5)
     chosen-rails (1.10.0)
@@ -156,7 +167,6 @@ GEM
     dotenv-rails (3.1.0)
       dotenv (= 3.1.0)
       railties (>= 6.1)
-    double-bag-ftps (0.1.4)
     erubi (1.13.1)
     execjs (2.10.0)
     fabrication (2.31.0)
@@ -198,6 +208,7 @@ GEM
     jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
+    jmespath (1.6.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -244,11 +255,8 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-sftp (4.0.0)
-      net-ssh (>= 5.0.0, < 8.0.0)
     net-smtp (0.4.0.1)
       net-protocol
-    net-ssh (7.2.0)
     nio4r (2.7.3)
     nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
@@ -503,7 +511,7 @@ DEPENDENCIES
   bullet
   capybara
   carrierwave
-  carrierwave-ftp!
+  carrierwave-aws (~> 1.6)
   chosen-rails
   cocoon
   commonmarker

app/uploaders/avatar_uploader.rb

@@ -1,14 +1,18 @@
 # encoding: utf-8
 
 class AvatarUploader < CarrierWave::Uploader::Base
-  storage :sftp if Rails.env.production?
+  storage :s3 if Rails.env.production?
 
   include CarrierWave::MiniMagick
 
+  def content_type_allowlist
+    [/image\//]
+  end
+
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    "uploads/#{model.class.to_s.underscore}/#{model.id}"
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:

app/uploaders/image_uploader.rb

@@ -1,5 +1,5 @@
 class ImageUploader < CarrierWave::Uploader::Base
-  storage :sftp if Rails.env.production?
+  storage :s3 if Rails.env.production?
 
   # Include RMagick or MiniMagick support:
   include CarrierWave::MiniMagick

config/initializers/carrier_wave.rb

@@ -4,15 +4,14 @@
   if Rails.env.development?
     config.storage = :file
   elsif Rails.env.production?
-    config.cache_dir = "#{Rails.root}/tmp/uploads"
-    config.root = Rails.root.join('tmp')
-    config.sftp_host = ENV['UPLOADER_ASSET_HOST']
-    config.sftp_user = ENV['UPLOADER_USER']
-    config.sftp_folder = ENV['UPLOADER_FOLDER']
-    config.sftp_url = ENV['UPLOADER_URL']
-    config.sftp_options = {
-      password: ENV['UPLOADER_PASSW'],
-      port: 22
+    config.storage    = :aws
+    config.aws_bucket = ENV.fetch('S3_BUCKET_NAME', 'prod-sponsor-logos')
+    config.aws_acl    = 'public-read'  
+    config.aws_authenticated_url_expiration = 60 * 60 * 24 * 7  
+    config.aws_credentials = {
+      access_key_id:     ENV.fetch('AWS_ACCESS_KEY'),
+      secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
+      region:            ENV.fetch('AWS_REGION', 'eu-north-1') # Required
     }
   end
 end