From c0626f50e9ff14d008ae93de48a04318dd93eef2 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 2 Nov 2022 15:41:40 -0400 Subject: [PATCH] 19234: Ignore Region when using custom Endpoint with s3v1 driver. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/keepstore/s3_volume.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go index ee89b156f7..7873764004 100644 --- a/services/keepstore/s3_volume.go +++ b/services/keepstore/s3_volume.go @@ -56,15 +56,12 @@ func (v *S3Volume) check() error { return errors.New("DriverParameters: RaceWindow must not be negative") } - var ok bool - v.region, ok = aws.Regions[v.Region] if v.Endpoint == "" { + r, ok := aws.Regions[v.Region] if !ok { return fmt.Errorf("unrecognized region %+q; try specifying endpoint instead", v.Region) } - } else if ok { - return fmt.Errorf("refusing to use AWS region name %+q with endpoint %+q; "+ - "specify empty endpoint or use a different region name", v.Region, v.Endpoint) + v.region = r } else { v.region = aws.Region{ Name: v.Region, -- 2.30.2