From 2eeeda9bad793a15eaf8f232435c6dee087dd366 Mon Sep 17 00:00:00 2001
From: Hosmel Quintana <hosmelq@gmail.com>
Date: Fri, 5 Dec 2025 11:57:19 -0600
Subject: [PATCH] rename Active Storage service to s3 and add checksum env

---
 README.md              | 18 ++++++++++--------
 config/storage.oss.yml | 16 +++++++++-------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 87a4658a0..20fdf7936 100644
--- a/README.md
+++ b/README.md
@@ -99,18 +99,20 @@ bin/kamal deploy
 
 Production uses the local disk service by default. To use any other service defined in `config/storage.yml`, set `ACTIVE_STORAGE_SERVICE`.
 
-To use the included `aws` service, set:
+To use the included `s3` service, set:
 
-- `ACTIVE_STORAGE_SERVICE=aws`
-- `AWS_ACCESS_KEY_ID`
-- `AWS_BUCKET` (defaults to `fizzy-#{Rails.env}-activestorage`)
-- `AWS_REGION` (defaults to `us-east-1`)
-- `AWS_SECRET_ACCESS_KEY`
+- `ACTIVE_STORAGE_SERVICE=s3`
+- `S3_ACCESS_KEY_ID`
+- `S3_BUCKET` (defaults to `fizzy-#{Rails.env}-activestorage`)
+- `S3_REGION` (defaults to `us-east-1`)
+- `S3_SECRET_ACCESS_KEY`
 
 Optional for S3-compatible endpoints:
 
-- `AWS_ENDPOINT`
-- `AWS_FORCE_PATH_STYLE=true`
+- `S3_ENDPOINT`
+- `S3_FORCE_PATH_STYLE=true`
+- `S3_REQUEST_CHECKSUM_CALCULATION` (defaults to `when_supported`)
+- `S3_RESPONSE_CHECKSUM_VALIDATION` (defaults to `when_supported`)
 
 ## Development
 
diff --git a/config/storage.oss.yml b/config/storage.oss.yml
index 0c9430a88..37052e6c5 100644
--- a/config/storage.oss.yml
+++ b/config/storage.oss.yml
@@ -17,11 +17,13 @@ devminio:
   access_key_id: minioadmin
   secret_access_key: minioadmin
 
-aws:
+s3:
   service: S3
-  access_key_id: <%= ENV["AWS_ACCESS_KEY_ID"] %>
-  bucket: <%= ENV["AWS_BUCKET"] || "fizzy-#{Rails.env}-activestorage" %>
-  endpoint: <%= ENV["AWS_ENDPOINT"] %>
-  force_path_style: <%= ENV["AWS_FORCE_PATH_STYLE"] == "true" %>
-  region: <%= ENV.fetch("AWS_REGION", "us-east-1") %>
-  secret_access_key: <%= ENV["AWS_SECRET_ACCESS_KEY"] %>
+  access_key_id: <%= ENV["S3_ACCESS_KEY_ID"] %>
+  bucket: <%= ENV["S3_BUCKET"] || "fizzy-#{Rails.env}-activestorage" %>
+  endpoint: <%= ENV["S3_ENDPOINT"] %>
+  force_path_style: <%= ENV["S3_FORCE_PATH_STYLE"] == "true" %>
+  region: <%= ENV.fetch("S3_REGION", "us-east-1") %>
+  request_checksum_calculation: <%= ENV.fetch("S3_REQUEST_CHECKSUM_CALCULATION", "when_supported") %>
+  response_checksum_validation: <%= ENV.fetch("S3_RESPONSE_CHECKSUM_VALIDATION", "when_supported") %>
+  secret_access_key: <%= ENV["S3_SECRET_ACCESS_KEY"] %>