Upgrade to 0.12

[github/fretlink/terraform-provider-statuscake.git] / vendor / github.com / aws / aws-sdk-go / aws / defaults / defaults.go

diff --git a/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
index 5040a2f64776c257c7f15e853873acc1fda07578..23bb639e018676840e0e1673ac97e62883d07c42 100644 (file)
--- a/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
@@ -24,6 +24,7 @@ import (
        "github.com/aws/aws-sdk-go/aws/ec2metadata"
        "github.com/aws/aws-sdk-go/aws/endpoints"
        "github.com/aws/aws-sdk-go/aws/request"
+       "github.com/aws/aws-sdk-go/internal/shareddefaults"
 )
 
 // A Defaults provides a collection of default values for SDK clients.
@@ -112,8 +113,8 @@ func CredProviders(cfg *aws.Config, handlers request.Handlers) []credentials.Pro
 }
 
 const (
-       httpProviderEnvVar     = "AWS_CONTAINER_CREDENTIALS_FULL_URI"
-       ecsCredsProviderEnvVar = "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"
+       httpProviderAuthorizationEnvVar = "AWS_CONTAINER_AUTHORIZATION_TOKEN"
+       httpProviderEnvVar              = "AWS_CONTAINER_CREDENTIALS_FULL_URI"
 )
 
 // RemoteCredProvider returns a credentials provider for the default remote
@@ -123,8 +124,8 @@ func RemoteCredProvider(cfg aws.Config, handlers request.Handlers) credentials.P
                return localHTTPCredProvider(cfg, handlers, u)
        }
 
-       if uri := os.Getenv(ecsCredsProviderEnvVar); len(uri) > 0 {
-               u := fmt.Sprintf("http://169.254.170.2%s", uri)
+       if uri := os.Getenv(shareddefaults.ECSCredsProviderEnvVar); len(uri) > 0 {
+               u := fmt.Sprintf("%s%s", shareddefaults.ECSContainerCredentialsURI, uri)
                return httpCredProvider(cfg, handlers, u)
        }
 
@@ -187,6 +188,7 @@ func httpCredProvider(cfg aws.Config, handlers request.Handlers, u string) crede
        return endpointcreds.NewProviderClient(cfg, handlers, u,
                func(p *endpointcreds.Provider) {
                        p.ExpiryWindow = 5 * time.Minute
+                       p.AuthorizationToken = os.Getenv(httpProviderAuthorizationEnvVar)
                },
        )
 }