From 89d7eb050a8577855c8ea76f944acaf30b955045 Mon Sep 17 00:00:00 2001
From: Trevor Pounds <trevor.pounds@gmail.com>
Date: Tue, 24 Nov 2015 13:01:59 -0600
Subject: [PATCH] Update AWS cloud provider to aws-sdk-go v1.0.2.

---
 pkg/cloudprovider/providers/aws/aws.go         | 15 ++++++++-------
 pkg/cloudprovider/providers/aws/log_handler.go |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go
index 4023b776759..67809337225 100644
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -35,6 +35,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/elb"
@@ -224,10 +225,10 @@ func addHandlers(h *request.Handlers) {
 }
 
 func (p *awsSDKProvider) Compute(regionName string) (EC2, error) {
-	service := ec2.New(&aws.Config{
+	service := ec2.New(session.New(&aws.Config{
 		Region:      &regionName,
 		Credentials: p.creds,
-	})
+	}))
 
 	addHandlers(&service.Handlers)
 
@@ -238,10 +239,10 @@ func (p *awsSDKProvider) Compute(regionName string) (EC2, error) {
 }
 
 func (p *awsSDKProvider) LoadBalancing(regionName string) (ELB, error) {
-	elbClient := elb.New(&aws.Config{
+	elbClient := elb.New(session.New(&aws.Config{
 		Region:      &regionName,
 		Credentials: p.creds,
-	})
+	}))
 
 	addHandlers(&elbClient.Handlers)
 
@@ -249,10 +250,10 @@ func (p *awsSDKProvider) LoadBalancing(regionName string) (ELB, error) {
 }
 
 func (p *awsSDKProvider) Autoscaling(regionName string) (ASG, error) {
-	client := autoscaling.New(&aws.Config{
+	client := autoscaling.New(session.New(&aws.Config{
 		Region:      &regionName,
 		Credentials: p.creds,
-	})
+	}))
 
 	addHandlers(&client.Handlers)
 
@@ -335,7 +336,7 @@ func (self *awsSdkEC2) DescribeInstances(request *ec2.DescribeInstancesInput) ([
 }
 
 type awsSdkMetadata struct {
-	metadata *ec2metadata.Client
+	metadata *ec2metadata.EC2Metadata
 }
 
 var metadataClient = http.Client{
diff --git a/pkg/cloudprovider/providers/aws/log_handler.go b/pkg/cloudprovider/providers/aws/log_handler.go
index 656d212ce77..177c7074a8f 100644
--- a/pkg/cloudprovider/providers/aws/log_handler.go
+++ b/pkg/cloudprovider/providers/aws/log_handler.go
@@ -23,7 +23,7 @@ import (
 
 // Handler for aws-sdk-go that logs all requests
 func awsHandlerLogger(req *request.Request) {
-	service := req.Service.ServiceName
+	service := req.ClientInfo.ServiceName
 
 	name := "?"
 	if req.Operation != nil {