Merge pull request #456 from mogren/avoid-unecessary-call

Avoid unnecessary call to EC2
aws · May 9, 2019 · 0c54452 · 0c54452
2 parents 3460788 + d7c7950
commit 0c54452
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/awsutils/awsutils.go b/pkg/awsutils/awsutils.go
@@ -866,6 +866,11 @@ func (cache *EC2InstanceMetadataCache) AllocIPAddresses(eniID string, numIPs int
 		needIPs = ipLimit
 	}
 
+	// If we don't need any more IPs, exit
+	if needIPs < 1 {
+		return nil
+	}
+
 	log.Infof("Trying to allocate %d IP address on ENI %s", needIPs, eniID)
 
 	input := &ec2.AssignPrivateIpAddressesInput{

diff --git a/pkg/awsutils/awsutils_test.go b/pkg/awsutils/awsutils_test.go
@@ -610,6 +610,11 @@ func TestAllocIPAddresses(t *testing.T) {
 	err = ins.AllocIPAddresses("eni-id", 30)
 
 	assert.NoError(t, err)
+
+	// Adding 0 should do nothing
+	err = ins.AllocIPAddresses("eni-id", 0)
+
+	assert.NoError(t, err)
 }
 
 func TestAllocAllIPAddressOnErr(t *testing.T) {