From f44406d2dfa7d96caf0eb4edd8cd6396f0b4deed Mon Sep 17 00:00:00 2001
From: Sam Darwin <samuel.d.darwin@gmail.com>
Date: Fri, 16 May 2025 10:48:00 -0600
Subject: [PATCH] AWS S3 dualstack ipv6 support (#1776)

---
 config/settings.py                    | 3 ++-
 env.template                          | 2 +-
 kube/boost/values-cppal-dev-gke.yaml  | 2 +-
 kube/boost/values-production-gke.yaml | 2 +-
 kube/boost/values-stage-gke.yaml      | 2 +-
 templates/style_guide.html            | 4 ++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/settings.py b/config/settings.py
index 992ee2a5..10240de1 100755
--- a/config/settings.py
+++ b/config/settings.py
@@ -450,7 +450,8 @@ STATIC_CONTENT_BUCKET_NAME = env("STATIC_CONTENT_BUCKET_NAME", default="changeme
 STATIC_CONTENT_REGION = env("STATIC_CONTENT_REGION", default="us-east-2")
 
 STATIC_CONTENT_AWS_S3_ENDPOINT_URL = env(
-    "STATIC_CONTENT_AWS_S3_ENDPOINT_URL", default="https://s3.us-east-2.amazonaws.com"
+    "STATIC_CONTENT_AWS_S3_ENDPOINT_URL",
+    default="https://s3.dualstack.us-east-2.amazonaws.com",
 )
 
 # LinkPreview API Key
diff --git a/env.template b/env.template
index 6efb097a..4e39a5ab 100644
--- a/env.template
+++ b/env.template
@@ -24,7 +24,7 @@ STATIC_CONTENT_AWS_ACCESS_KEY_ID="changeme"
 STATIC_CONTENT_AWS_SECRET_ACCESS_KEY="changeme"
 STATIC_CONTENT_BUCKET_NAME="stage.boost.org.v2"
 STATIC_CONTENT_REGION="us-east-2"
-STATIC_CONTENT_AWS_S3_ENDPOINT_URL="https://s3.us-east-2.amazonaws.com"
+STATIC_CONTENT_AWS_S3_ENDPOINT_URL="https://s3.dualstack.us-east-2.amazonaws.com"
 
 PROD_MEDIA_CONTENT_AWS_ACCESS_KEY_ID=$STATIC_CONTENT_AWS_ACCESS_KEY_ID
 PROD_MEDIA_CONTENT_AWS_SECRET_ACCESS_KEY=$STATIC_CONTENT_AWS_SECRET_ACCESS_KEY
diff --git a/kube/boost/values-cppal-dev-gke.yaml b/kube/boost/values-cppal-dev-gke.yaml
index 65488fd3..48d84e35 100644
--- a/kube/boost/values-cppal-dev-gke.yaml
+++ b/kube/boost/values-cppal-dev-gke.yaml
@@ -118,7 +118,7 @@ Env:
   - name: MEDIA_BUCKET_NAME
     value: boost.org-cppal-dev-v2.media
   - name: AWS_S3_ENDPOINT_URL
-    value: https://s3.us-east-2.amazonaws.com
+    value: https://s3.dualstack.us-east-2.amazonaws.com
   - name: AWS_S3_REGION_NAME
     value: us-east-2
  # Staticly generated content bucket (Antora docs, etc)
diff --git a/kube/boost/values-production-gke.yaml b/kube/boost/values-production-gke.yaml
index b0660b01..055df8cc 100644
--- a/kube/boost/values-production-gke.yaml
+++ b/kube/boost/values-production-gke.yaml
@@ -118,7 +118,7 @@ Env:
   - name: MEDIA_BUCKET_NAME
     value: boost.org.media
   - name: AWS_S3_ENDPOINT_URL
-    value: https://s3.us-east-2.amazonaws.com
+    value: https://s3.dualstack.us-east-2.amazonaws.com
   - name: AWS_S3_REGION_NAME
     value: us-east-2
  # Staticly generated content bucket (Antora docs, etc)
diff --git a/kube/boost/values-stage-gke.yaml b/kube/boost/values-stage-gke.yaml
index d5cc901c..2f6513b0 100644
--- a/kube/boost/values-stage-gke.yaml
+++ b/kube/boost/values-stage-gke.yaml
@@ -118,7 +118,7 @@ Env:
   - name: MEDIA_BUCKET_NAME
     value: stage.boost.org.media
   - name: AWS_S3_ENDPOINT_URL
-    value: https://s3.us-east-2.amazonaws.com
+    value: https://s3.dualstack.us-east-2.amazonaws.com
   - name: AWS_S3_REGION_NAME
     value: us-east-2
  # Staticly generated content bucket (Antora docs, etc)
diff --git a/templates/style_guide.html b/templates/style_guide.html
index bdfdbf59..96e0b816 100644
--- a/templates/style_guide.html
+++ b/templates/style_guide.html
@@ -498,7 +498,7 @@
 				</span>
 				<br clear="all" />
 				<span class="inline-block h-[30px] w-[30px] overflow-hidden rounded mt-1 border border-gray-400 dark:border-gray-500">
-					<img src="https://s3.us-east-2.amazonaws.com/boost.org.media/profile-images/IMG_6155_1.jpg" alt="user" class="h-full w-full cursor-pointer object-cover"/>
+					<img src="https://s3.dualstack.us-east-2.amazonaws.com/boost.org.media/profile-images/IMG_6155_1.jpg" alt="user" class="h-full w-full cursor-pointer object-cover"/>
 				</span>
 
 				<p>User Avatars</p>
@@ -511,7 +511,7 @@
 	<i class="fas fa-user text-2xl ml-[4px]"></i>
 </span>
 <span class="inline-block h-[30px] w-[30px] overflow-hidden rounded mt-1 border border-gray-400 dark:border-gray-500">
-	<img src="https://s3.us-east-2.amazonaws.com/boost.org.media/profile-images/IMG_6155_1.jpg" alt="user" class="h-full w-full cursor-pointer object-cover"/>
+	<img src="https://s3.dualstack.us-east-2.amazonaws.com/boost.org.media/profile-images/IMG_6155_1.jpg" alt="user" class="h-full w-full cursor-pointer object-cover"/>
 </span>
 {% endfilter %}</pre></div>
 				</div>