From f78c7d3db01e887bf8a94c7c1799441316f071f1 Mon Sep 17 00:00:00 2001 From: hangaoshuai Date: Tue, 20 Mar 2018 17:27:20 +0800 Subject: [PATCH] Use function aws.Int64Value replace of deprecated function orZero --- pkg/cloudprovider/providers/aws/aws_loadbalancer.go | 4 ++-- pkg/cloudprovider/providers/aws/aws_utils.go | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go index 438b5617f19..05a1c1a6764 100644 --- a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go +++ b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go @@ -1027,10 +1027,10 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala if elbProtocolsAreEqual(actual.InstanceProtocol, expected.InstanceProtocol) { continue } - if orZero(actual.InstancePort) != orZero(expected.InstancePort) { + if aws.Int64Value(actual.InstancePort) != aws.Int64Value(expected.InstancePort) { continue } - if orZero(actual.LoadBalancerPort) != orZero(expected.LoadBalancerPort) { + if aws.Int64Value(actual.LoadBalancerPort) != aws.Int64Value(expected.LoadBalancerPort) { continue } if awsArnEquals(actual.SSLCertificateId, expected.SSLCertificateId) { diff --git a/pkg/cloudprovider/providers/aws/aws_utils.go b/pkg/cloudprovider/providers/aws/aws_utils.go index a0fa8eb8947..b56699f854b 100644 --- a/pkg/cloudprovider/providers/aws/aws_utils.go +++ b/pkg/cloudprovider/providers/aws/aws_utils.go @@ -42,9 +42,3 @@ func stringSetFromPointers(in []*string) sets.String { } return out } - -// orZero returns the value, or 0 if the pointer is nil -// Deprecated: prefer aws.Int64Value -func orZero(v *int64) int64 { - return aws.Int64Value(v) -}