Upgrade to 0.12

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

diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
index 51e21e0f38f652661516b8ff631f711b3d18ea3c..e1551495812ab3fc3e14d8c0f606f0951f26f858 100644 (file)
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
@@ -4,9 +4,8 @@ import (
        "fmt"
        "os"
 
-       "github.com/go-ini/ini"
-
        "github.com/aws/aws-sdk-go/aws/awserr"
+       "github.com/aws/aws-sdk-go/internal/ini"
        "github.com/aws/aws-sdk-go/internal/shareddefaults"
 )
 
@@ -77,36 +76,37 @@ func (p *SharedCredentialsProvider) IsExpired() bool {
 // The credentials retrieved from the profile will be returned or error. Error will be
 // returned if it fails to read from the file, or the data is invalid.
 func loadProfile(filename, profile string) (Value, error) {
-       config, err := ini.Load(filename)
+       config, err := ini.OpenFile(filename)
        if err != nil {
                return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to load shared credentials file", err)
        }
-       iniProfile, err := config.GetSection(profile)
-       if err != nil {
-               return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to get profile", err)
+
+       iniProfile, ok := config.GetSection(profile)
+       if !ok {
+               return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to get profile", nil)
        }
 
-       id, err := iniProfile.GetKey("aws_access_key_id")
-       if err != nil {
+       id := iniProfile.String("aws_access_key_id")
+       if len(id) == 0 {
                return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsAccessKey",
                        fmt.Sprintf("shared credentials %s in %s did not contain aws_access_key_id", profile, filename),
-                       err)
+                       nil)
        }
 
-       secret, err := iniProfile.GetKey("aws_secret_access_key")
-       if err != nil {
+       secret := iniProfile.String("aws_secret_access_key")
+       if len(secret) == 0 {
                return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsSecret",
                        fmt.Sprintf("shared credentials %s in %s did not contain aws_secret_access_key", profile, filename),
                        nil)
        }
 
        // Default to empty string if not found
-       token := iniProfile.Key("aws_session_token")
+       token := iniProfile.String("aws_session_token")
 
        return Value{
-               AccessKeyID:     id.String(),
-               SecretAccessKey: secret.String(),
-               SessionToken:    token.String(),
+               AccessKeyID:     id,
+               SecretAccessKey: secret,
+               SessionToken:    token,
                ProviderName:    SharedCredsProviderName,
        }, nil
 }