Skip to content

K
k3s
Commit df0718ca authored by Trevor Pounds's avatar Trevor Pounds
Browse files
Options

Migrate source to aws-sdk-go v0.9.9.

Upgrading to aws-sdk-go >= v0.9.0 requires a source migration via awsmigrate-renamer tool. see: http://aws.amazon.com/releasenotes/2948141298714307
parent b76f6a02
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
pkg/cloudprovider/providers/aws/aws_instancegroups.go
View file @ df0718ca
...@@ -32,8 +32,8 @@ var _ InstanceGroups = &AWSCloud{} ...@@ -32,8 +32,8 @@ var _ InstanceGroups = &AWSCloud{}
func (a *AWSCloud) ResizeInstanceGroup(instanceGroupName string, size int) error { func (a *AWSCloud) ResizeInstanceGroup(instanceGroupName string, size int) error {
request := &autoscaling.UpdateAutoScalingGroupInput{ request := &autoscaling.UpdateAutoScalingGroupInput{
AutoScalingGroupName: aws.String(instanceGroupName), AutoScalingGroupName: aws.String(instanceGroupName),
MinSize: aws.Long(int64(size)), MinSize: aws.Int64(int64(size)),
MaxSize: aws.Long(int64(size)), MaxSize: aws.Int64(int64(size)),
} }
if _, err := a.asg.UpdateAutoScalingGroup(request); err != nil { if _, err := a.asg.UpdateAutoScalingGroup(request); err != nil {
return fmt.Errorf("error resizing AWS autoscaling group: %v", err) return fmt.Errorf("error resizing AWS autoscaling group: %v", err)
......
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View file @ df0718ca
...@@ -133,7 +133,7 @@ func (s *AWSCloud) ensureLoadBalancer(name string, listeners []*elb.Listener, su ...@@ -133,7 +133,7 @@ func (s *AWSCloud) ensureLoadBalancer(name string, listeners []*elb.Listener, su
if orZero(actual.LoadBalancerPort) != orZero(expected.LoadBalancerPort) { if orZero(actual.LoadBalancerPort) != orZero(expected.LoadBalancerPort) {
continue continue
} }
if orEmpty(actual.SSLCertificateID) != orEmpty(expected.SSLCertificateID) { if orEmpty(actual.SSLCertificateId) != orEmpty(expected.SSLCertificateId) {
continue continue
} }
found = i found = i
...@@ -247,12 +247,12 @@ func (s *AWSCloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerD ...@@ -247,12 +247,12 @@ func (s *AWSCloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerD
func (s *AWSCloud) ensureLoadBalancerInstances(loadBalancerName string, lbInstances []*elb.Instance, instances []*ec2.Instance) error { func (s *AWSCloud) ensureLoadBalancerInstances(loadBalancerName string, lbInstances []*elb.Instance, instances []*ec2.Instance) error {
expected := sets.NewString() expected := sets.NewString()
for _, instance := range instances { for _, instance := range instances {
expected.Insert(orEmpty(instance.InstanceID)) expected.Insert(orEmpty(instance.InstanceId))
} }
actual := sets.NewString() actual := sets.NewString()
for _, lbInstance := range lbInstances { for _, lbInstance := range lbInstances {
actual.Insert(orEmpty(lbInstance.InstanceID)) actual.Insert(orEmpty(lbInstance.InstanceId))
} }
additions := expected.Difference(actual) additions := expected.Difference(actual)
...@@ -261,14 +261,14 @@ func (s *AWSCloud) ensureLoadBalancerInstances(loadBalancerName string, lbInstan ...@@ -261,14 +261,14 @@ func (s *AWSCloud) ensureLoadBalancerInstances(loadBalancerName string, lbInstan
addInstances := []*elb.Instance{} addInstances := []*elb.Instance{}
for instanceId := range additions { for instanceId := range additions {
addInstance := &elb.Instance{} addInstance := &elb.Instance{}
addInstance.InstanceID = aws.String(instanceId) addInstance.InstanceId = aws.String(instanceId)
addInstances = append(addInstances, addInstance) addInstances = append(addInstances, addInstance)
} }
removeInstances := []*elb.Instance{} removeInstances := []*elb.Instance{}
for instanceId := range removals { for instanceId := range removals {
removeInstance := &elb.Instance{} removeInstance := &elb.Instance{}
removeInstance.InstanceID = aws.String(instanceId) removeInstance.InstanceId = aws.String(instanceId)
removeInstances = append(removeInstances, removeInstance) removeInstances = append(removeInstances, removeInstance)
} }
......
pkg/cloudprovider/providers/aws/aws_routes.go
View file @ df0718ca
...@@ -56,8 +56,8 @@ func (s *AWSCloud) ListRoutes(clusterName string) ([]*cloudprovider.Route, error ...@@ -56,8 +56,8 @@ func (s *AWSCloud) ListRoutes(clusterName string) ([]*cloudprovider.Route, error
var routes []*cloudprovider.Route var routes []*cloudprovider.Route
for _, r := range table.Routes { for _, r := range table.Routes {
instanceID := orEmpty(r.InstanceID) instanceID := orEmpty(r.InstanceId)
destinationCIDR := orEmpty(r.DestinationCIDRBlock) destinationCIDR := orEmpty(r.DestinationCidrBlock)
if instanceID == "" || destinationCIDR == "" { if instanceID == "" || destinationCIDR == "" {
continue continue
...@@ -67,7 +67,7 @@ func (s *AWSCloud) ListRoutes(clusterName string) ([]*cloudprovider.Route, error ...@@ -67,7 +67,7 @@ func (s *AWSCloud) ListRoutes(clusterName string) ([]*cloudprovider.Route, error
if err != nil { if err != nil {
return nil, err return nil, err
} }
instanceName := orEmpty(instance.PrivateDNSName) instanceName := orEmpty(instance.PrivateDnsName)
routeName := clusterName + "-" + destinationCIDR routeName := clusterName + "-" + destinationCIDR
routes = append(routes, &cloudprovider.Route{Name: routeName, TargetInstance: instanceName, DestinationCIDR: destinationCIDR}) routes = append(routes, &cloudprovider.Route{Name: routeName, TargetInstance: instanceName, DestinationCIDR: destinationCIDR})
} }
...@@ -78,8 +78,8 @@ func (s *AWSCloud) ListRoutes(clusterName string) ([]*cloudprovider.Route, error ...@@ -78,8 +78,8 @@ func (s *AWSCloud) ListRoutes(clusterName string) ([]*cloudprovider.Route, error
// Sets the instance attribute "source-dest-check" to the specified value // Sets the instance attribute "source-dest-check" to the specified value
func (s *AWSCloud) configureInstanceSourceDestCheck(instanceID string, sourceDestCheck bool) error { func (s *AWSCloud) configureInstanceSourceDestCheck(instanceID string, sourceDestCheck bool) error {
request := &ec2.ModifyInstanceAttributeInput{} request := &ec2.ModifyInstanceAttributeInput{}
request.InstanceID = aws.String(instanceID) request.InstanceId = aws.String(instanceID)
request.SourceDestCheck = &ec2.AttributeBooleanValue{Value: aws.Boolean(sourceDestCheck)} request.SourceDestCheck = &ec2.AttributeBooleanValue{Value: aws.Bool(sourceDestCheck)}
_, err := s.ec2.ModifyInstanceAttribute(request) _, err := s.ec2.ModifyInstanceAttribute(request)
if err != nil { if err != nil {
...@@ -98,7 +98,7 @@ func (s *AWSCloud) CreateRoute(clusterName string, nameHint string, route *cloud ...@@ -98,7 +98,7 @@ func (s *AWSCloud) CreateRoute(clusterName string, nameHint string, route *cloud
// In addition to configuring the route itself, we also need to configure the instance to accept that traffic // In addition to configuring the route itself, we also need to configure the instance to accept that traffic
// On AWS, this requires turning source-dest checks off // On AWS, this requires turning source-dest checks off
err = s.configureInstanceSourceDestCheck(orEmpty(instance.InstanceID), false) err = s.configureInstanceSourceDestCheck(orEmpty(instance.InstanceId), false)
if err != nil { if err != nil {
return err return err
} }
...@@ -110,9 +110,9 @@ func (s *AWSCloud) CreateRoute(clusterName string, nameHint string, route *cloud ...@@ -110,9 +110,9 @@ func (s *AWSCloud) CreateRoute(clusterName string, nameHint string, route *cloud
request := &ec2.CreateRouteInput{} request := &ec2.CreateRouteInput{}
// TODO: use ClientToken for idempotency? // TODO: use ClientToken for idempotency?
request.DestinationCIDRBlock = aws.String(route.DestinationCIDR) request.DestinationCidrBlock = aws.String(route.DestinationCIDR)
request.InstanceID = instance.InstanceID request.InstanceId = instance.InstanceId
request.RouteTableID = table.RouteTableID request.RouteTableId = table.RouteTableId
_, err = s.ec2.CreateRoute(request) _, err = s.ec2.CreateRoute(request)
if err != nil { if err != nil {
...@@ -131,8 +131,8 @@ func (s *AWSCloud) DeleteRoute(clusterName string, route *cloudprovider.Route) e ...@@ -131,8 +131,8 @@ func (s *AWSCloud) DeleteRoute(clusterName string, route *cloudprovider.Route) e
} }
request := &ec2.DeleteRouteInput{} request := &ec2.DeleteRouteInput{}
request.DestinationCIDRBlock = aws.String(route.DestinationCIDR) request.DestinationCidrBlock = aws.String(route.DestinationCIDR)
request.RouteTableID = table.RouteTableID request.RouteTableId = table.RouteTableId
_, err = s.ec2.DeleteRoute(request) _, err = s.ec2.DeleteRoute(request)
if err != nil { if err != nil {
......
pkg/cloudprovider/providers/aws/aws_test.go
View file @ df0718ca
...@@ -132,8 +132,8 @@ func NewFakeAWSServices() *FakeAWSServices { ...@@ -132,8 +132,8 @@ func NewFakeAWSServices() *FakeAWSServices {
s.instanceId = "i-self" s.instanceId = "i-self"
s.privateDnsName = "ip-172-20-0-100.ec2.internal" s.privateDnsName = "ip-172-20-0-100.ec2.internal"
var selfInstance ec2.Instance var selfInstance ec2.Instance
selfInstance.InstanceID = &s.instanceId selfInstance.InstanceId = &s.instanceId
selfInstance.PrivateDNSName = &s.privateDnsName selfInstance.PrivateDnsName = &s.privateDnsName
s.instances = []*ec2.Instance{&selfInstance} s.instances = []*ec2.Instance{&selfInstance}
var tag ec2.Tag var tag ec2.Tag
...@@ -263,10 +263,10 @@ func contains(haystack []*string, needle string) bool { ...@@ -263,10 +263,10 @@ func contains(haystack []*string, needle string) bool {
func instanceMatchesFilter(instance *ec2.Instance, filter *ec2.Filter) bool { func instanceMatchesFilter(instance *ec2.Instance, filter *ec2.Filter) bool {
name := *filter.Name name := *filter.Name
if name == "private-dns-name" { if name == "private-dns-name" {
if instance.PrivateDNSName == nil { if instance.PrivateDnsName == nil {
return false return false
} }
return contains(filter.Values, *instance.PrivateDNSName) return contains(filter.Values, *instance.PrivateDnsName)
} }
panic("Unknown filter name: " + name) panic("Unknown filter name: " + name)
} }
...@@ -274,15 +274,15 @@ func instanceMatchesFilter(instance *ec2.Instance, filter *ec2.Filter) bool { ...@@ -274,15 +274,15 @@ func instanceMatchesFilter(instance *ec2.Instance, filter *ec2.Filter) bool {
func (self *FakeEC2) DescribeInstances(request *ec2.DescribeInstancesInput) ([]*ec2.Instance, error) { func (self *FakeEC2) DescribeInstances(request *ec2.DescribeInstancesInput) ([]*ec2.Instance, error) {
matches := []*ec2.Instance{} matches := []*ec2.Instance{}
for _, instance := range self.aws.instances { for _, instance := range self.aws.instances {
if request.InstanceIDs != nil { if request.InstanceIds != nil {
if instance.InstanceID == nil { if instance.InstanceId == nil {
glog.Warning("Instance with no instance id: ", instance) glog.Warning("Instance with no instance id: ", instance)
continue continue
} }
found := false found := false
for _, instanceId := range request.InstanceIDs { for _, instanceId := range request.InstanceIds {
if *instanceId == *instance.InstanceID { if *instanceId == *instance.InstanceId {
found = true found = true
break break
} }
...@@ -381,7 +381,7 @@ func (ec2 *FakeEC2) RevokeSecurityGroupIngress(*ec2.RevokeSecurityGroupIngressIn ...@@ -381,7 +381,7 @@ func (ec2 *FakeEC2) RevokeSecurityGroupIngress(*ec2.RevokeSecurityGroupIngressIn
panic("Not implemented") panic("Not implemented")
} }
func (ec2 *FakeEC2) DescribeVPCs(*ec2.DescribeVPCsInput) ([]*ec2.VPC, error) { func (ec2 *FakeEC2) DescribeVPCs(*ec2.DescribeVpcsInput) ([]*ec2.Vpc, error) {
panic("Not implemented") panic("Not implemented")
} }
...@@ -500,8 +500,8 @@ func TestList(t *testing.T) { ...@@ -500,8 +500,8 @@ func TestList(t *testing.T) {
Value: aws.String("foo"), Value: aws.String("foo"),
} }
instance0.Tags = []*ec2.Tag{&tag0} instance0.Tags = []*ec2.Tag{&tag0}
instance0.InstanceID = aws.String("instance0") instance0.InstanceId = aws.String("instance0")
instance0.PrivateDNSName = aws.String("instance0.ec2.internal") instance0.PrivateDnsName = aws.String("instance0.ec2.internal")
state0 := ec2.InstanceState{ state0 := ec2.InstanceState{
Name: aws.String("running"), Name: aws.String("running"),
} }
...@@ -513,8 +513,8 @@ func TestList(t *testing.T) { ...@@ -513,8 +513,8 @@ func TestList(t *testing.T) {
Value: aws.String("bar"), Value: aws.String("bar"),
} }
instance1.Tags = []*ec2.Tag{&tag1} instance1.Tags = []*ec2.Tag{&tag1}
instance1.InstanceID = aws.String("instance1") instance1.InstanceId = aws.String("instance1")
instance1.PrivateDNSName = aws.String("instance1.ec2.internal") instance1.PrivateDnsName = aws.String("instance1.ec2.internal")
state1 := ec2.InstanceState{ state1 := ec2.InstanceState{
Name: aws.String("running"), Name: aws.String("running"),
} }
...@@ -526,8 +526,8 @@ func TestList(t *testing.T) { ...@@ -526,8 +526,8 @@ func TestList(t *testing.T) {
Value: aws.String("baz"), Value: aws.String("baz"),
} }
instance2.Tags = []*ec2.Tag{&tag2} instance2.Tags = []*ec2.Tag{&tag2}
instance2.InstanceID = aws.String("instance2") instance2.InstanceId = aws.String("instance2")
instance2.PrivateDNSName = aws.String("instance2.ec2.internal") instance2.PrivateDnsName = aws.String("instance2.ec2.internal")
state2 := ec2.InstanceState{ state2 := ec2.InstanceState{
Name: aws.String("running"), Name: aws.String("running"),
} }
...@@ -539,8 +539,8 @@ func TestList(t *testing.T) { ...@@ -539,8 +539,8 @@ func TestList(t *testing.T) {
Value: aws.String("quux"), Value: aws.String("quux"),
} }
instance3.Tags = []*ec2.Tag{&tag3} instance3.Tags = []*ec2.Tag{&tag3}
instance3.InstanceID = aws.String("instance3") instance3.InstanceId = aws.String("instance3")
instance3.PrivateDNSName = aws.String("instance3.ec2.internal") instance3.PrivateDnsName = aws.String("instance3.ec2.internal")
state3 := ec2.InstanceState{ state3 := ec2.InstanceState{
Name: aws.String("running"), Name: aws.String("running"),
} }
...@@ -585,10 +585,10 @@ func TestNodeAddresses(t *testing.T) { ...@@ -585,10 +585,10 @@ func TestNodeAddresses(t *testing.T) {
var instance1 ec2.Instance var instance1 ec2.Instance
//0 //0
instance0.InstanceID = aws.String("instance-same") instance0.InstanceId = aws.String("instance-same")
instance0.PrivateDNSName = aws.String("instance-same.ec2.internal") instance0.PrivateDnsName = aws.String("instance-same.ec2.internal")
instance0.PrivateIPAddress = aws.String("192.168.0.1") instance0.PrivateIpAddress = aws.String("192.168.0.1")
instance0.PublicIPAddress = aws.String("1.2.3.4") instance0.PublicIpAddress = aws.String("1.2.3.4")
instance0.InstanceType = aws.String("c3.large") instance0.InstanceType = aws.String("c3.large")
state0 := ec2.InstanceState{ state0 := ec2.InstanceState{
Name: aws.String("running"), Name: aws.String("running"),
...@@ -596,9 +596,9 @@ func TestNodeAddresses(t *testing.T) { ...@@ -596,9 +596,9 @@ func TestNodeAddresses(t *testing.T) {
instance0.State = &state0 instance0.State = &state0
//1 //1
instance1.InstanceID = aws.String("instance-same") instance1.InstanceId = aws.String("instance-same")
instance1.PrivateDNSName = aws.String("instance-same.ec2.internal") instance1.PrivateDnsName = aws.String("instance-same.ec2.internal")
instance1.PrivateIPAddress = aws.String("192.168.0.2") instance1.PrivateIpAddress = aws.String("192.168.0.2")
instance1.InstanceType = aws.String("c3.large") instance1.InstanceType = aws.String("c3.large")
state1 := ec2.InstanceState{ state1 := ec2.InstanceState{
Name: aws.String("running"), Name: aws.String("running"),
......
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