Compatibility layer with goamz added

builtin/providers/aws/config.go

@@ -3,6 +3,7 @@ package aws
 import (
 	"fmt"
 	"log"
+	"os"
 	"time"
 
 	"github.com/hashicorp/aws-sdk-go/aws"
@@ -36,6 +37,7 @@ type AWSClient struct {
 }
 
 func (c *Config) loadAndValidate(providerCode string) (interface{}, error) {
+	c.tryLoadingDeprecatedEnvVars()
 	credsProvider, err := c.getCredsProvider(providerCode)
 	if err != nil {
 		return nil, err
@@ -50,6 +52,19 @@ func (c *Config) loadAndValidate(providerCode string) (interface{}, error) {
 	return c.Client()
 }
 
+func (c *Config) tryLoadingDeprecatedEnvVars() {
+	// Backward compatibility
+	if c.Token == "" {
+		c.Token = os.Getenv("AWS_SECURITY_TOKEN")
+	}
+	if c.CredentialsFilePath == "" {
+		c.CredentialsFilePath = os.Getenv("AWS_CREDENTIAL_FILE")
+	}
+	if c.CredentialsFileProfile == "" {
+		c.CredentialsFileProfile = os.Getenv("AWS_PROFILE")
+	}
+}
+
 func (c *Config) getCredsProvider(providerCode string) (aws.CredentialsProvider, error) {
 	if providerCode == "static" {
 		return aws.Creds(c.AccessKey, c.SecretKey, c.Token), nil