Skip to content

Handle missing Eureka AMI metadata #4565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pony-maggie wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −2
Open

Handle missing Eureka AMI metadata #4565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...erver/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,14 @@ private void populateApps(Map<String, Object> model) {
String zone = "";
if (info.getDataCenterInfo().getName() == DataCenterInfo.Name.Amazon) {
AmazonInfo dcInfo = (AmazonInfo) info.getDataCenterInfo();
ami = dcInfo.get(AmazonInfo.MetaDataKey.amiId);
zone = dcInfo.get(AmazonInfo.MetaDataKey.availabilityZone);
String amiId = dcInfo.get(AmazonInfo.MetaDataKey.amiId);
if (amiId != null) {
ami = amiId;
}
String availabilityZone = dcInfo.get(AmazonInfo.MetaDataKey.availabilityZone);
if (availabilityZone != null) {
zone = availabilityZone;
}
}
Integer count = amiCounts.get(ami);
if (count != null) {
Expand Down
35 changes: 35 additions & 0 deletions .../src/test/java/org/springframework/cloud/netflix/eureka/server/EurekaControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.List;
import java.util.Map;

import com.netflix.appinfo.AmazonInfo;
import com.netflix.appinfo.ApplicationInfoManager;
import com.netflix.appinfo.DataCenterInfo;
import com.netflix.appinfo.InstanceInfo;
Expand Down Expand Up @@ -117,11 +118,45 @@ void testStatus() {
assertThat((Boolean) instance.get("isHref")).as("isHref was wrong").isFalse();
}

@Test
void statusUsesDefaultAmiForAmazonInstancesWithoutAmiMetadata() {
AmazonInfo amazonInfo = new AmazonInfo(null, new HashMap<>());
Application app = new Application("myapp");
app.addInstance(InstanceInfo.Builder.newBuilder()
.setAppName("myapp")
.setDataCenterInfo(amazonInfo)
.setInstanceId("myapp:1")
.build());

when(getServerContext().getRegistry().getSortedApplications()).thenReturn(Collections.singletonList(app));

Map<String, Object> model = new HashMap<>();
EurekaController controller = new EurekaController(infoManager, new EurekaProperties());

controller.status(new MockHttpServletRequest("GET", "/"), model);

Map<String, Object> appData = getFirst(model, "apps");
Map.Entry<String, Integer> amiCount = getFirstEntry(appData, "amiCounts");
assertThat(amiCount.getKey()).isEqualTo("n/a");
assertThat(amiCount.getValue()).isEqualTo(1);
}

private EurekaServerContext getServerContext() {
return EurekaServerContextHolder.getInstance().getServerContext();
}

@SuppressWarnings("unchecked")
Map<String, Object> getFirst(Map<String, Object> model, String key) {
List<Map<String, Object>> apps = (List<Map<String, Object>>) model.get(key);
assertThat(apps).as(key + " was wrong size").hasSize(1);
return apps.get(0);
}

@SuppressWarnings("unchecked")
Map.Entry<String, Integer> getFirstEntry(Map<String, Object> model, String key) {
Iterable<Map.Entry<String, Integer>> entries = (Iterable<Map.Entry<String, Integer>>) model.get(key);
assertThat(entries).as(key + " was wrong size").hasSize(1);
return entries.iterator().next();
}

}