X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fbbafc5ecb48485913cec69d9dd45ffd42c99cef..74fec3cd8284eae4829dad2c287588d52c621c4b:/services/keepstore/s3_volume.go

diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index 4c43b3f469..7873764004 100644
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package keepstore
 
 import (
 	"bufio"
@@ -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,