Removed the workflow for getting Primary ipv4 address of the vpc.

This is not required as we can use the dns settings of the primary instance ENI.

agent/ec2/blackhole_ec2_metadata_client.go

@@ -15,7 +15,6 @@ package ec2
 
 import (
 	"errors"
-	"net"
 
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 )
@@ -85,7 +84,3 @@ func (blackholeMetadataClient) SpotInstanceAction() (string, error) {
 func (blackholeMetadataClient) OutpostARN() (string, error) {
 	return "", errors.New("blackholed")
 }
-
-func (c blackholeMetadataClient) PrimaryIPV4VPCCIDR(mac string) (*net.IPNet, error) {
-	return nil, errors.New("blackholed")
-}

agent/ec2/ec2_metadata_client.go

@@ -17,7 +17,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net"
 	"strings"
 	"time"
 
@@ -83,7 +82,6 @@ type EC2MetadataClient interface {
 	PublicIPv4Address() (string, error)
 	SpotInstanceAction() (string, error)
 	OutpostARN() (string, error)
-	PrimaryIPV4VPCCIDR(mac string) (*net.IPNet, error)
 }
 
 type ec2MetadataClientImpl struct {
@@ -205,18 +203,3 @@ func (c *ec2MetadataClientImpl) SpotInstanceAction() (string, error) {
 func (c *ec2MetadataClientImpl) OutpostARN() (string, error) {
 	return c.client.GetMetadata(OutpostARN)
 }
-
-// PrimaryIPV4VPCCIDR returns the primary IPV4 block associated with the VPC
-func (c *ec2MetadataClientImpl) PrimaryIPV4VPCCIDR(mac string) (*net.IPNet, error) {
-	vpcCIDR, err := c.client.GetMetadata(fmt.Sprintf(PrimaryIPV4VPCCIDRResourceFormat, mac))
-	if err != nil {
-		return nil, err
-	}
-
-	_, parsedCIDR, err := net.ParseCIDR(vpcCIDR)
-	if err != nil {
-		return nil, err
-	}
-
-	return parsedCIDR, nil
-}

agent/ec2/ec2_metadata_client_test.go

@@ -33,16 +33,14 @@ import (
 )
 
 const (
-	testRoleName            = "test-role"
-	mac                     = "01:23:45:67:89:ab"
-	macs                    = "01:23:45:67:89:ab/\n01:23:45:67:89:ac"
-	vpcID                   = "vpc-1234"
-	subnetID                = "subnet-1234"
-	iidRegion               = "us-east-1"
-	privateIP               = "127.0.0.1"
-	publicIP                = "127.0.0.1"
-	vpcPrimaryCIDR          = "10.0.0.0/16"
-	incorrectVPCPrimaryCIDR = "10.0.0.0\n/16"
+	testRoleName = "test-role"
+	mac          = "01:23:45:67:89:ab"
+	macs         = "01:23:45:67:89:ab/\n01:23:45:67:89:ac"
+	vpcID        = "vpc-1234"
+	subnetID     = "subnet-1234"
+	iidRegion    = "us-east-1"
+	privateIP    = "127.0.0.1"
+	publicIP     = "127.0.0.1"
 )
 
 func makeTestRoleCredentials() ec2.RoleCredentials {
@@ -254,33 +252,3 @@ func TestSpotInstanceActionError(t *testing.T) {
 	assert.Error(t, err)
 	assert.Equal(t, "", resp)
 }
-
-func TestPrimaryIPV4VPCCIDRSuccess(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	mockGetter := mock_ec2.NewMockHttpClient(ctrl)
-	testClient := ec2.NewEC2MetadataClient(mockGetter)
-
-	mockGetter.EXPECT().GetMetadata(fmt.Sprintf(ec2.PrimaryIPV4VPCCIDRResourceFormat, mac)).
-		Return(vpcPrimaryCIDR, nil)
-	resp, err := testClient.PrimaryIPV4VPCCIDR(mac)
-
-	assert.NoError(t, err)
-	assert.Equal(t, vpcPrimaryCIDR, resp.String())
-}
-
-func TestPrimaryIPV4VPCCIDRError(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	mockGetter := mock_ec2.NewMockHttpClient(ctrl)
-	testClient := ec2.NewEC2MetadataClient(mockGetter)
-
-	mockGetter.EXPECT().GetMetadata(fmt.Sprintf(ec2.PrimaryIPV4VPCCIDRResourceFormat, mac)).
-		Return(incorrectVPCPrimaryCIDR, nil)
-	resp, err := testClient.PrimaryIPV4VPCCIDR(mac)
-
-	assert.Error(t, err)
-	assert.Nil(t, resp)
-}