Allow region to be read from environment variable

weaveworks · Sep 17, 2019 · ecd64a5 · ecd64a5
1 parent afb9996
commit ecd64a5
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/aws/config.go b/aws/config.go
@@ -5,6 +5,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"os"
 	"strings"
 	"time"
 
@@ -45,10 +46,14 @@ func ConfigFromURL(awsURL *url.URL) (*aws.Config, error) {
 	}
 
 	if strings.Contains(awsURL.Host, ".") {
+		region := os.Getenv("AWS_REGION")
+		if region == "" {
+			region = "dummy"
+		}
 		if awsURL.Scheme == "https" {
-			return config.WithEndpoint(fmt.Sprintf("https://%s", awsURL.Host)).WithRegion("dummy"), nil
+			return config.WithEndpoint(fmt.Sprintf("https://%s", awsURL.Host)).WithRegion(region), nil
 		}
-		return config.WithEndpoint(fmt.Sprintf("http://%s", awsURL.Host)).WithRegion("dummy"), nil
+		return config.WithEndpoint(fmt.Sprintf("http://%s", awsURL.Host)).WithRegion(region), nil
 	}
 
 	// Let AWS generate default endpoint based on region passed as a host in URL.