This handles trailing whitespace in the IPv4 / IPv6 endpoints

Netflix · Feb 6, 2019 · 29a0c19 · 29a0c19
1 parent 62f465a
commit 29a0c19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/vpc/ec2wrapper/ec2metadata.go b/vpc/ec2wrapper/ec2metadata.go
@@ -202,10 +202,10 @@ func (mdc *EC2MetadataClientWrapper) getMetadata(path string) (string, error) {
 }
 
 func ipStringToList(ips string) []string {
+	ips = strings.TrimSpace(ips)
 	if ips == "" {
 		return []string{}
 	}
-	// This expects a non-\n terminated list of IPs separated by \n, and returns a normalized form
 	addresses := strings.Split(ips, "\n")
 	result := make([]string, len(addresses))
 	for idx, addr := range addresses {

diff --git a/vpc/ec2wrapper/ec2metadata_test.go b/vpc/ec2wrapper/ec2metadata_test.go
@@ -143,5 +143,5 @@ func TestMetadataService(t *testing.T) {
 
 func TestIPStringToList(t *testing.T) {
 	assert.Equal(t, []string{}, ipStringToList(""))
-	assert.Equal(t, []string{"1.2.3.4", "4.5.6.8"}, ipStringToList("1.2.3.4\n4.5.6.8"))
+	assert.Equal(t, []string{"1.2.3.4", "4.5.6.8"}, ipStringToList("1.2.3.4\n4.5.6.8\n"))
 }