github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update aws-sdk-go dependency from awslabs to aws.

Browse Source
This commit is contained in:
Trevor Pounds
2015-06-03 22:54:59 -07:00
parent a161edb396
commit 7cdf573015
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/cloudprovider/aws/aws.go
View File

@@ -30,10 +30,11 @@ import (
"time" "time"
"code.google.com/p/gcfg" "code.google.com/p/gcfg"
"github.com/awslabs/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/awslabs/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/awserr"
"github.com/awslabs/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/aws/credentials"
"github.com/awslabs/aws-sdk-go/service/elb" "github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/elb"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
@@ -1294,8 +1295,8 @@ func (s *AWSCloud) describeLoadBalancer(region, name string) (*elb.LoadBalancerD
response, err := elbClient.DescribeLoadBalancers(request) response, err := elbClient.DescribeLoadBalancers(request)
if err != nil { if err != nil {
if awsError := aws.Error(err); awsError != nil { if awsError := err.(awserr.Error); awsError != nil {
if awsError.Code == "LoadBalancerNotFound" { if awsError.Code() == "LoadBalancerNotFound" {
return nil, nil return nil, nil
} }
} }

6
pkg/cloudprovider/aws/aws_test.go
View File

@@ -22,9 +22,9 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/awslabs/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/awslabs/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"
"github.com/awslabs/aws-sdk-go/service/elb" "github.com/aws/aws-sdk-go/service/elb"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"