From fed5e00a180691784e3a1183a5a426e042c5f06c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Aug 2025 14:19:36 -0400 Subject: [PATCH] fix default region reversion Commit 215640096f6a3469c119d50373f3035cf19fe130 caused the default region for S3 to change to us-east-2. This was due to regionInfo having an undocumented property that the first item in the list is for the default region. Avoid relying on regionInfo for defaultRegion. Sponsored-by: Dartmouth College's DANDI project --- Remote/Helper/AWS.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Remote/Helper/AWS.hs b/Remote/Helper/AWS.hs index 2c9d535a85..e03f1b4591 100644 --- a/Remote/Helper/AWS.hs +++ b/Remote/Helper/AWS.hs @@ -1,6 +1,6 @@ {- Amazon Web Services common infrastructure. - - - Copyright 2011-2014 Joey Hess + - Copyright 2011-2025 Joey Hess - - Licensed under the GNU AGPL version 3 or higher. -} @@ -40,7 +40,8 @@ regionMap :: Service -> M.Map Text Region regionMap = M.fromList . regionInfo defaultRegion :: Service -> Region -defaultRegion = snd . fromMaybe (error "internal") . headMaybe . regionInfo +defaultRegion S3 = "US" +defaultRegion Glacier = "us-east-1" data ServiceRegion = BothRegion Region | S3Region Region | GlacierRegion Region -- 2.30.2