[arvados] updated: 2.1.0-3009-gc0626f50e

[git repository hosting]

Summary of changes:
 services/keepstore/s3_volume.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

       via  c0626f50e9ff14d008ae93de48a04318dd93eef2 (commit)
      from  d0f3483739a0140802374e6a9f5d0ab5972bd951 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c0626f50e9ff14d008ae93de48a04318dd93eef2
Author: Tom Clegg <tom at curii.com>
Date:   Wed Nov 2 15:41:40 2022 -0400

    19234: Ignore Region when using custom Endpoint with s3v1 driver.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index ee89b156f..787376400 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,

-----------------------------------------------------------------------


hooks/post-receive
--