From 8bdb2b6d8ba8f85e66d92a4b11499c6aae525632 Mon Sep 17 00:00:00 2001
From: Jamie Gaskins <jamie@forem.com>
Date: Tue, 18 Jan 2022 11:34:42 -0500
Subject: [PATCH] Support alternate S3 endpoints (#15445)

* Support alternate S3 endpoints

* Add missing comma

This is why we should use trailing commas

* Provide sample S3 endpoint config

* Comment out S3 image-storage config in .env_sample

See https://github.com/forem/forem/pull/15445#discussion_r754525723
---
 .env_sample                        | 13 ++++++++-----
 config/initializers/carrierwave.rb |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.env_sample b/.env_sample
index 5890ec9fe..851eb3211 100644
--- a/.env_sample
+++ b/.env_sample
@@ -72,11 +72,14 @@ NODE_ENV="development"
 HONEYBADGER_API_KEY="Optional"
 HONEYBADGER_JS_API_KEY="Optional"
 
-# AWS for images storages
-AWS_ID=
-AWS_SECRET=
-AWS_BUCKET_NAME=
-AWS_UPLOAD_REGION=
+# Uncomment the lines below and fill in values to enable AWS S3 (or S3-
+# compatible services) for image storage. The AWS_S3_ENDPOINT variable is only
+# necessary if you're using an S3-compatible service but not S3 proper.
+# AWS_ID=
+# AWS_SECRET=
+# AWS_BUCKET_NAME=
+# AWS_UPLOAD_REGION=
+# AWS_S3_ENDPOINT=
 
 # AWS for video storage
 AWS_S3_INPUT_BUCKET="Optional"
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index f2be3b9e6..f249b66c4 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -27,7 +27,8 @@ module CarrierWaveInitializer
         provider: "AWS",
         aws_access_key_id: ApplicationConfig["AWS_ID"],
         aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
-        region: ApplicationConfig["AWS_UPLOAD_REGION"].presence || ApplicationConfig["AWS_DEFAULT_REGION"]
+        region: ApplicationConfig["AWS_UPLOAD_REGION"].presence || ApplicationConfig["AWS_DEFAULT_REGION"],
+        endpoint: ApplicationConfig["AWS_S3_ENDPOINT"],
       }
     end
   end