Light, fluffy, and always free - The AWS Local Emulator alternative
fix(ec2): describe launchable unknown AMI ids in DescribeImages (#3168)
Matan Baruchde5dc0da3508
diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.java b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.javaindex e530c5749b..1df5a5d165 100644--- a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.java@@ -3981,9 +3981,47 @@ public class Ec2Service implements ContainerTeardown, ResourceProvider {.collect(Collectors.toList());List<Image> images = new ArrayList<>(catalogImages);images.addAll(createdImages);+ addFallbackLaunchableImages(region, images, imageIds, owners, filters);return images;}+ // RunInstances launches an unrecognised AMI id by falling back to the catalog default image (see+ // AmiImageResolver), so an explicitly requested but unknown id is still launchable. IaC providers read+ // the AMI's root device via DescribeImages before RunInstances, so an empty result there aborts the+ // create (the aws provider reports "collecting instance settings: empty result"). Mirror the launch-time+ // fallback so a describe of a launchable id returns a matching image instead of nothing.+ private void addFallbackLaunchableImages(String region, List<Image> images, List<String> imageIds,+ List<String> owners, Map<String, List<String>> filters) {+ if (imageIds == null || imageIds.isEmpty()) {+ return;+ }+ Set<String> present = images.stream().map(Image::getImageId).collect(Collectors.toSet());+ for (String imageId : imageIds) {+ if (imageId == null || !imageId.startsWith("ami-") || present.contains(imageId)+ || imageCatalog.findByIdOrAlias(imageId).isPresent()+ || registeredImages.get(key(region, imageId)).isPresent()) {+ continue;+ }+ Image fallback = fallbackLaunchableImage(imageId);+ if (matchesImageOwners(fallback, owners) && matchesRegisteredImageFilters(fallback, filters)) {+ images.add(fallback);+ present.add(imageId);+ }+ }+ }++ private Image fallbackLaunchableImage(String imageId) {+ Image image = new Image();+ image.setImageId(imageId);+ image.setName(imageId);+ image.setDescription("Floci fallback image for launchable AMI " + imageId);+ image.setArchitecture("x86_64");+ image.setOwnerId(AMAZON_OWNER_ID);+ image.setImageOwnerAlias("amazon");+ image.setCreationDate("2026-01-01T00:00:00.000Z");+ return image;+ }+public Image createImage(String region, String instanceId, String name, String description,boolean noReboot) {ensureDefaultResources(region);diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.javaindex 8b00a3518f..6c2a2fe547 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java@@ -490,6 +490,30 @@ class Ec2ServiceTest {assertTrue(resolved.systemd());}+ @Test+ void describeImagesResolvesUnknownLaunchableAmiId() {+ Ec2ImageCatalog imageCatalog = new Ec2ImageCatalog();+ Ec2Service service = new Ec2Service(mockConfig(true), mock(Ec2ContainerManager.class),+ mock(Ec2PortForwardManager.class),+ new AmiImageResolver(imageCatalog), imageCatalog, new Ec2InstanceTypeCatalog(),+ new InMemoryStorageFactory());++ // RunInstances launches an unknown id via the catalog-default fallback, so DescribeImages has to+ // resolve it too: the aws provider reads the AMI root device before RunInstances and aborts the+ // create with "collecting instance settings: empty result" when the describe comes back empty.+ List<Image> unknown = service.describeImages(+ "us-east-1", List.of("ami-0c02fb55956c7d316"), List.of(), Map.of());+ assertEquals(1, unknown.size());+ assertEquals("ami-0c02fb55956c7d316", unknown.getFirst().getImageId());+ assertEquals("/dev/xvda", unknown.getFirst().getRootDeviceName());++ // A real catalog id resolves to exactly the catalog image, never a duplicate fallback.+ List<Image> catalog = service.describeImages(+ "us-east-1", List.of("ami-0abcdef1234567891"), List.of(), Map.of());+ assertEquals(1, catalog.size());+ assertEquals("al2023-ami-2023.0.20230315.0-kernel-6.1-x86_64", catalog.getFirst().getName());+ }+@Testvoid describeInstanceTypesUsesExactCatalogMatches() {Ec2Service service = new Ec2Service(mockConfig(true), mock(Ec2ContainerManager.class),