Added tests

Netflix · Nov 8, 2023 · c0e280d · c0e280d
1 parent da18301
commit c0e280d
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -52,7 +52,7 @@ allprojects {
         // test deps
         jetty_version = '7.2.0.v20101020'
         junit_version = '4.11'
-        mockitoVersion = '1.10.19'
+        mockitoVersion = '3.4.0'
         mockserverVersion = '3.9.2'
     }
 }

diff --git a/eureka-client/build.gradle b/eureka-client/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     testCompile project(':eureka-test-utils')
     testCompile "junit:junit:${junit_version}"
     testCompile 'org.mortbay.jetty:jetty:6.1H.22'
-    testCompile "org.mockito:mockito-core:${mockitoVersion}"
+    testCompile "org.mockito:mockito-inline:${mockitoVersion}"
     testCompile "org.mock-server:mockserver-netty:${mockserverVersion}"
     testCompile "com.netflix.governator:governator:${governatorVersion}"
     testCompile "com.github.tomakehurst:wiremock-jre8:2.25.1"

diff --git a/eureka-client/src/main/java/com/netflix/appinfo/AmazonInfo.java b/eureka-client/src/main/java/com/netflix/appinfo/AmazonInfo.java
@@ -22,11 +22,11 @@
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -64,7 +64,26 @@ public enum MetaDataKey {
         availabilityZone("availability-zone", "placement/"),
         publicHostname("public-hostname"),
         publicIpv4("public-ipv4"),
-        macs("macs", "network/interfaces/"), // macs declared above public-ipv4s so will be found before publicIpv4s (where it is needed)
+        // macs declared above public-ipv4s so will be found before publicIpv4s (where it is needed)
+        macs("macs", "network/interfaces/") {
+            @Override
+            public String read(InputStream inputStream) throws IOException {
+                BufferedReader br = new BufferedReader(new InputStreamReader(inputStream));
+                String toReturn;
+                try {
+                    toReturn = br.lines().collect(Collectors.joining("\n"));
+                } finally {
+                    br.close();
+                }
+
+                return toReturn;
+            }
+        },
+        // Because we stop reading the body returned by IMDS after the first newline,
+        // publicIPv4s will only contain the first IPv4 address returned in the body of the
+        // URL for a given MAC, despite IMDS being able to return multiple addresses under
+        // that key (separated by \n). The first IPv4 address is always the one attached to
+        // the interface and is the only address that should be registered for this instance.
         publicIpv4s("public-ipv4s", "network/interfaces/macs/") {
             @Override
             public URL getURL(String prepend, String mac) throws MalformedURLException {
@@ -216,8 +235,7 @@ public AmazonInfo autoBuild(String namespace) {
                                 String publicIpv4s = AmazonInfoUtils.readEc2MetadataUrl(key, url, config.getConnectTimeout(), config.getReadTimeout());
 
                                 if (publicIpv4s != null) {
-                                    // only support registering the first found public IPv4 address
-                                    result.metadata.put(key.getName(), publicIpv4s.split("\n")[0]);
+                                    result.metadata.put(key.getName(), publicIpv4s);
                                     break;
                                 }
                             }

diff --git a/eureka-client/src/test/java/com/netflix/appinfo/AmazonInfoTest.java b/eureka-client/src/test/java/com/netflix/appinfo/AmazonInfoTest.java
@@ -2,10 +2,18 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.net.URL;
 
+import com.netflix.discovery.internal.util.AmazonInfoUtils;
 import org.junit.Test;
 
+import org.mockito.MockedStatic;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
 
 /**
  * @author David Liu
@@ -34,4 +42,85 @@ public void testExtractAccountId() throws Exception {
 
         assertEquals("1111111111", accountId);
     }
+
+    @Test
+    public void testExtractMacs_SingleMac() throws Exception {
+        String body = "0d:c2:9a:3c:18:2b";
+
+        InputStream inputStream = new ByteArrayInputStream(body.getBytes());
+        String macs = AmazonInfo.MetaDataKey.macs.read(inputStream);
+
+        assertEquals("0d:c2:9a:3c:18:2b", macs);
+    }
+
+    @Test
+    public void testExtractMacs_MultipleMacs() throws Exception {
+        String body = "0d:c2:9a:3c:18:2b\n4c:31:99:7e:26:d6";
+
+        InputStream inputStream = new ByteArrayInputStream(body.getBytes());
+        String macs = AmazonInfo.MetaDataKey.macs.read(inputStream);
+
+        assertEquals("0d:c2:9a:3c:18:2b\n4c:31:99:7e:26:d6", macs);
+    }
+
+    @Test
+    public void testExtractPublicIPv4s_SingleAddress() throws Exception {
+        String body = "10.0.0.1";
+
+        InputStream inputStream = new ByteArrayInputStream(body.getBytes());
+        String publicIPv4s = AmazonInfo.MetaDataKey.publicIpv4s.read(inputStream);
+
+        assertEquals("10.0.0.1", publicIPv4s);
+    }
+
+    @Test
+    public void testExtractPublicIPv4s_MultipleAddresses() throws Exception {
+        String body = "10.0.0.1\n10.0.0.2";
+
+        InputStream inputStream = new ByteArrayInputStream(body.getBytes());
+        String publicIPv4s = AmazonInfo.MetaDataKey.publicIpv4s.read(inputStream);
+
+        assertEquals("10.0.0.1", publicIPv4s);
+    }
+
+    @Test
+    public void testAutoBuild() throws Exception {
+        try (MockedStatic<AmazonInfoUtils> mockUtils = mockStatic(AmazonInfoUtils.class)) {
+            mockUtils.when(
+                    () -> AmazonInfoUtils.readEc2MetadataUrl(any(AmazonInfo.MetaDataKey.class), any(URL.class), anyInt(), anyInt())
+            ).thenReturn(null);
+
+            mockUtils.when(
+                    () -> AmazonInfoUtils.readEc2MetadataUrl(any(AmazonInfo.MetaDataKey.class), any(URL.class), anyInt(), anyInt())
+            ).thenReturn(null);
+
+            URL macsUrl = AmazonInfo.MetaDataKey.macs.getURL(null, null);
+            mockUtils.when(
+                    () -> AmazonInfoUtils.readEc2MetadataUrl(eq(AmazonInfo.MetaDataKey.macs), eq(macsUrl), anyInt(), anyInt())
+            ).thenReturn("0d:c2:9a:3c:18:2b\n4c:31:99:7e:26:d6");
+
+            URL firstMacPublicIPv4sUrl = AmazonInfo.MetaDataKey.publicIpv4s.getURL(null, "0d:c2:9a:3c:18:2b");
+            mockUtils.when(
+                    () -> AmazonInfoUtils.readEc2MetadataUrl(eq(AmazonInfo.MetaDataKey.publicIpv4s), eq(firstMacPublicIPv4sUrl), anyInt(), anyInt())
+            ).thenReturn(null);
+
+            URL secondMacPublicIPv4sUrl = AmazonInfo.MetaDataKey.publicIpv4s.getURL(null, "4c:31:99:7e:26:d6");
+            mockUtils.when(
+                    () -> AmazonInfoUtils.readEc2MetadataUrl(eq(AmazonInfo.MetaDataKey.publicIpv4s), eq(secondMacPublicIPv4sUrl), anyInt(), anyInt())
+            ).thenReturn("10.0.0.1");
+
+            AmazonInfoConfig config = mock(AmazonInfoConfig.class);
+            when(config.getNamespace()).thenReturn("test_namespace");
+            when(config.getConnectTimeout()).thenReturn(10);
+            when(config.getNumRetries()).thenReturn(1);
+            when(config.getReadTimeout()).thenReturn(10);
+            when(config.shouldLogAmazonMetadataErrors()).thenReturn(false);
+            when(config.shouldValidateInstanceId()).thenReturn(false);
+            when(config.shouldFailFastOnFirstLoad()).thenReturn(false);
+
+            AmazonInfo info = AmazonInfo.Builder.newBuilder().withAmazonInfoConfig(config).autoBuild("test_namespace");
+
+            assertEquals("10.0.0.1", info.get(AmazonInfo.MetaDataKey.publicIpv4s));
+        }
+    }
 }
diff --git a/eureka-client/src/test/java/com/netflix/appinfo/CloudInstanceConfigTest.java b/eureka-client/src/test/java/com/netflix/appinfo/CloudInstanceConfigTest.java
@@ -55,6 +55,17 @@ public void testBroadcastPublicIpv4Address() {
         assertEquals(instanceInfo.getIPAddr(), config.getIpAddress());
     }
 
+    @Test
+    public void testBroadcastPublicIpv4Address_usingPublicIpv4s() {
+        AmazonInfo info = (AmazonInfo) instanceInfo.getDataCenterInfo();
+        info.getMetadata().remove(AmazonInfo.MetaDataKey.publicIpv4.getName());
+        info.getMetadata().put(AmazonInfo.MetaDataKey.publicIpv4s.getName(), "10.0.0.1");
+
+        config = createConfig(info);
+
+        assertEquals("10.0.0.1", config.getIpAddress());
+    }
+
     private CloudInstanceConfig createConfig(AmazonInfo info) {
 
         return new CloudInstanceConfig(info) {