Merge pull request #73 from 99designs/remove-pinned-vendors

Remove pinned vendors

glide.yaml

@@ -1,13 +1,9 @@
 package: github.com/99designs/aws-vault
 import:
 - package: github.com/alecthomas/template
-  version: b867cc6ab45cece8143cfcc6fc9c77cf3f2c23c0
 - package: github.com/alecthomas/units
-  version: 6b4e7dc5e3143b85ea77909c72caf89416fc2915
 - package: github.com/aulanov/go.dbus
-  version: 25c3068a42a0b50b877953fb249dbcffc6bd1bca
 - package: github.com/aws/aws-sdk-go
-  version: 376badeb12ede342ca2f41fd7b45027aa3f00264
   subpackages:
   - aws
   - internal/endpoints
@@ -20,11 +16,8 @@ import:
   - aws/credentials
   - service/iam
 - package: github.com/skratchdot/open-golang
-  version: c8748311a7528d0ba7330d302adbc5a677ef9c9e
   subpackages:
   - open
 - package: github.com/vaughan0/go-ini
-  version: a98ad7ee00ec53921f08832bc06ecf7fd600e6a1
 - package: gopkg.in/alecthomas/kingpin.v2
-  version: 639879d6110b1b0409410c7b737ef0bb18325038
 - package: github.com/dvsekhvalnov/jose2go

provider.go

@@ -11,6 +11,7 @@ import (
 	"github.com/99designs/aws-vault/prompt"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sts"
 )
 
@@ -191,11 +192,11 @@ func (p *VaultProvider) getSessionToken(creds *credentials.Value) (sts.Credentia
 
 	client := p.client
 	if client == nil {
-		client = sts.New(&aws.Config{
+		client = sts.New(session.New(&aws.Config{
 			Credentials: credentials.NewCredentials(&credentials.StaticProvider{
 				Value: *creds,
 			}),
-		})
+		}))
 	}
 
 	log.Printf("Getting new session token for profile %s", p.profiles.sourceProfile(p.profile))
@@ -207,14 +208,14 @@ func (p *VaultProvider) getSessionToken(creds *credentials.Value) (sts.Credentia
 	return *resp.Credentials, nil
 }
 
-func (p *VaultProvider) assumeRole(session sts.Credentials, roleArn string) (sts.Credentials, error) {
+func (p *VaultProvider) assumeRole(creds sts.Credentials, roleArn string) (sts.Credentials, error) {
 	client := p.client
 	if client == nil {
-		client = sts.New(&aws.Config{Credentials: credentials.NewStaticCredentials(
-			*session.AccessKeyId,
-			*session.SecretAccessKey,
-			*session.SessionToken,
-		)})
+		client = sts.New(session.New(&aws.Config{Credentials: credentials.NewStaticCredentials(
+			*creds.AccessKeyId,
+			*creds.SecretAccessKey,
+			*creds.SessionToken,
+		)}))
 	}
 
 	// Try to work out a role name that will hopefully end up unique.

rotate.go

@@ -6,6 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/iam"
 )
 
@@ -47,9 +48,9 @@ func RotateCommand(ui Ui, input RotateCommandInput) {
 		}
 	}
 
-	client := iam.New(&aws.Config{
+	client := iam.New(session.New(&aws.Config{
 		Credentials: credentials.NewCredentials(&credentials.StaticProvider{Value: oldVal}),
-	})
+	}))
 
 	createOut, err := client.CreateAccessKey(&iam.CreateAccessKeyInput{})
 	if err != nil {
@@ -59,7 +60,7 @@ func RotateCommand(ui Ui, input RotateCommandInput) {
 	ui.Debug.Println("Created new access key")
 
 	newMasterCreds := credentials.Value{
-		AccessKeyID: *createOut.AccessKey.AccessKeyId,
+		AccessKeyID:     *createOut.AccessKey.AccessKeyId,
 		SecretAccessKey: *createOut.AccessKey.SecretAccessKey,
 	}
 
@@ -96,9 +97,9 @@ func RotateCommand(ui Ui, input RotateCommandInput) {
 		}
 	}
 
-	client = iam.New(&aws.Config{
+	client = iam.New(session.New(&aws.Config{
 		Credentials: credentials.NewCredentials(&credentials.StaticProvider{Value: newVal}),
-	})
+	}))
 
 	_, err = client.DeleteAccessKey(&iam.DeleteAccessKeyInput{
 		AccessKeyId: aws.String(oldMasterCreds.AccessKeyID),