X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9828e9218084856240fdeafa2d388d8bf322e655..09cbdc3074b3f1e69c9c537875146f6da0a6ed8f:/services/keepstore/s3_volume.go

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,