Merge d4dd84b into bb105e3

opengovsg · Feb 20, 2024 · ac0fa50 · ac0fa50
2 parents bb105e3 + d4dd84b
commit ac0fa50
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/app/config/schema.ts b/src/app/config/schema.ts
@@ -59,8 +59,11 @@ const validateS3BucketUrl = (
   }
   // Region should be specified correctly in production
   const isRegionCorrect = new RegExp(`^https://s3.${region}.amazonaws.com`, 'i')
-  if (!isDev && !isRegionCorrect.test(val)) {
-    throw new Error(`region should be ${region}`)
+  const isR2 = new RegExp(`^https://\\w+.r2.cloudflarestorage.com`, 'i')
+  if (!isDev && !isRegionCorrect.test(val) && !isR2.test(val)) {
+    throw new Error(
+      `region should be ${region}, or url should be for Cloudflare R2`,
+    )
   }
   /* eslint-enable typesafe/no-throw-sync-func */
 }