From 682ea4473e20e9bcf82cb7ddb78a5e2b81d99c4c Mon Sep 17 00:00:00 2001
From: Daniel Uber <djuber@gmail.com>
Date: Wed, 26 May 2021 13:54:16 -0500
Subject: [PATCH] When AWS_ID is the placeholder value, act as though AWS not
 setup (#13850)

* When AWS_ID is the placeholder value, act as though AWS not setup

We have "Optional" as the placeholder in the .env_sample

When that's the "final" value in the .env file, assume we're actually
going to use local storage instead.

* Clear placeholder AWS values from env_sample

Revert the change to the carrierwave initializer (don't hardcode the
placeholder value).

Mimics choices we made for Cloudinary in #13767
---
 .env_sample | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env_sample b/.env_sample
index c60b7cc03..ed0de8d83 100644
--- a/.env_sample
+++ b/.env_sample
@@ -73,10 +73,10 @@ HONEYBADGER_API_KEY="Optional"
 HONEYBADGER_JS_API_KEY="Optional"
 
 # AWS for images storages
-AWS_ID="Optional"
-AWS_SECRET="Optional"
-AWS_BUCKET_NAME="Optional"
-AWS_UPLOAD_REGION=""
+AWS_ID=
+AWS_SECRET=
+AWS_BUCKET_NAME=
+AWS_UPLOAD_REGION=
 
 # AWS for video storage
 AWS_S3_INPUT_BUCKET="Optional"