From ebdaaaf15b27817e96112c669faeb314def69d6e Mon Sep 17 00:00:00 2001
From: Jamie Gaskins <jamie@forem.com>
Date: Tue, 18 Jan 2022 14:11:18 -0500
Subject: [PATCH] Revert "Support alternate S3 endpoints" (#16173)

---
 .env_sample                        | 13 +++++--------
 config/initializers/carrierwave.rb |  3 +--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.env_sample b/.env_sample
index 851eb3211..5890ec9fe 100644
--- a/.env_sample
+++ b/.env_sample
@@ -72,14 +72,11 @@ NODE_ENV="development"
 HONEYBADGER_API_KEY="Optional"
 HONEYBADGER_JS_API_KEY="Optional"
 
-# 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 images storages
+AWS_ID=
+AWS_SECRET=
+AWS_BUCKET_NAME=
+AWS_UPLOAD_REGION=
 
 # AWS for video storage
 AWS_S3_INPUT_BUCKET="Optional"
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index f249b66c4..f2be3b9e6 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -27,8 +27,7 @@ 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"],
-        endpoint: ApplicationConfig["AWS_S3_ENDPOINT"],
+        region: ApplicationConfig["AWS_UPLOAD_REGION"].presence || ApplicationConfig["AWS_DEFAULT_REGION"]
       }
     end
   end