Give EBS endpoint precedence over region

If a user has configured an endpoint to use for AWS, always use it, rather than deferring to an auto-generated endpoint based on the region.
wilius · Dec 19, 2017 · 750ce0e · 750ce0e
1 parent e190be1
commit 750ce0e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/libstorage/drivers/storage/ebs/storage/ebs_storage.go b/libstorage/drivers/storage/ebs/storage/ebs_storage.go
@@ -136,11 +136,11 @@ func (d *driver) Login(ctx types.Context) (interface{}, error) {
 		region   = d.mustRegion(ctx)
 	)
 
-	if region != nil {
+	if d.endpoint != nil {
+		endpoint = d.endpoint
+	} else {
 		szEndpint := fmt.Sprintf("ec2.%s.amazonaws.com", *region)
 		endpoint = &szEndpint
-	} else {
-		endpoint = d.endpoint
 	}
 
 	writeHkey(hkey, region)