Commit 89d7eb05 authored by Trevor Pounds's avatar Trevor Pounds

Update AWS cloud provider to aws-sdk-go v1.0.2.

parent bd9adaf8
......@@ -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{
......
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment