Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(eks): validate the node group launchTemplate against EC2 on CreateNodegroup (#4148)

Simone Primarosa90d8c355d9fa
diff --git a/docs/services/eks.md b/docs/services/eks.md
index e65ad629d3..87e738a21a 100644
--- a/docs/services/eks.md
+++ b/docs/services/eks.md
@@ -268,7 +268,7 @@ EKS clusters support configuring KMS envelope encryption for secrets and control
```
- **Omission**: When a structured input is not supplied, it is omitted from `CreateNodegroup` and `DescribeNodegroup` responses rather than serialized as an explicit `null`. The exception is `updateConfig`, which receives the AWS default of `{"maxUnavailable": 1}`.
-- **Validation**: Floci does not validate these structures. A `launchTemplate` is not resolved against EC2, so a reference to a launch template that does not exist is accepted where real EKS would reject it.
+- **Validation**: When `launchTemplate` is supplied, Floci validates it against EC2. Requests must specify either `id` or `name`, but not both; supplying neither or both is rejected with `InvalidParameterException` (HTTP 400). The template and requested version (defaulting to the template's default version when omitted) must exist in EC2, otherwise the request is rejected with `InvalidParameterException` (HTTP 400). The other structured inputs (`remoteAccess`, `taints`, `nodeRepairConfig`, `warmPoolConfig`) are not validated against external resources.
- **No backfill**: Node groups created before this was supported genuinely had no launch template, taints, remote access, node repair config, or warm pool config, so there is nothing to reconstruct. They continue to omit those members, which is the correct answer for them.
### Metadata only
diff --git a/src/main/java/io/github/hectorvent/floci/services/eks/EksService.java b/src/main/java/io/github/hectorvent/floci/services/eks/EksService.java
index 8dd45178a4..7ff76d8aa5 100644
--- a/src/main/java/io/github/hectorvent/floci/services/eks/EksService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/eks/EksService.java
@@ -627,7 +627,9 @@ public class EksService implements TagHandler, ResourceProvider {
"Nodegroup already exists: " + nodegroupName, 409);
}
- String region = config.defaultRegion();
+ String region = resolveClusterRegion(cluster);
+ validateLaunchTemplate(region, request.getLaunchTemplate());
+
String accountId = regionResolver.getAccountId();
String id = UUID.randomUUID().toString();
String arn = AwsArnUtils.Arn.of("eks", region, accountId,
@@ -670,6 +672,43 @@ public class EksService implements TagHandler, ResourceProvider {
return nodeGroup;
}
+ private void validateLaunchTemplate(String region, Object launchTemplateObj) {
+ if (!(launchTemplateObj instanceof Map<?, ?> map)) {
+ return;
+ }
+
+ String id = asNonBlankString(map.get("id"));
+ String name = asNonBlankString(map.get("name"));
+ String version = asNonBlankString(map.get("version"));
+
+ if ((id != null && name != null) || (id == null && name == null)) {
+ throw new AwsException("InvalidParameterException",
+ "You must specify either the launch template ID or the launch template name in the request, but not both.",
+ 400);
+ }
+
+ try {
+ ec2Service.resolveLaunchTemplateData(region, id, name, version);
+ } catch (AwsException e) {
+ switch (e.getErrorCode()) {
+ case "InvalidLaunchTemplateId.NotFound", "InvalidLaunchTemplateName.NotFoundException" ->
+ throw new AwsException("InvalidParameterException",
+ "Launch template could not be found : " + e.getMessage(), 400);
+ case "InvalidLaunchTemplateVersion.NotFound", "InvalidLaunchTemplateVersion.Malformed" ->
+ throw new AwsException("InvalidParameterException", e.getMessage(), 400);
+ default -> throw e;
+ }
+ }
+ }
+
+ private static String asNonBlankString(Object val) {
+ if (val == null) {
+ return null;
+ }
+ String s = val.toString().trim();
+ return s.isEmpty() ? null : s;
+ }
+
public Nodegroup describeNodeGroup(String clusterName, String nodegroupName) {
describeCluster(clusterName);
return nodeGroupStorage.get(nodeGroupKey(clusterName, nodegroupName))
diff --git a/src/test/java/io/github/hectorvent/floci/services/eks/EksNodegroupStructuredInputsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/eks/EksNodegroupStructuredInputsIntegrationTest.java
index 37fe5a4d89..1f6b66f548 100644
--- a/src/test/java/io/github/hectorvent/floci/services/eks/EksNodegroupStructuredInputsIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/eks/EksNodegroupStructuredInputsIntegrationTest.java
@@ -2,7 +2,10 @@ package io.github.hectorvent.floci.services.eks;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import io.github.hectorvent.floci.services.ec2.Ec2Service;
+import io.github.hectorvent.floci.services.ec2.model.LaunchTemplateData;
import io.quarkus.test.junit.QuarkusTest;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -30,7 +33,7 @@ class EksNodegroupStructuredInputsIntegrationTest {
private static final String BARE_NODEGROUP = "ng-bare";
private static final String STRUCTURED_INPUTS = """
- "launchTemplate":{"id":"lt-0a1b2c3d4e5f60718","name":"node-lt","version":"3"},\
+ "launchTemplate":{"name":"node-lt","version":"3"},\
"remoteAccess":{"ec2SshKey":"my-keypair","sourceSecurityGroups":["sg-0123456789abcdef0"]},\
"taints":[{"key":"dedicated","value":"gpu","effect":"NO_SCHEDULE"},\
{"key":"spot","value":"true","effect":"PREFER_NO_SCHEDULE"}],\
@@ -40,9 +43,16 @@ class EksNodegroupStructuredInputsIntegrationTest {
private static final ObjectMapper MAPPER = new ObjectMapper();
+ @Inject
+ Ec2Service ec2Service;
+
@Test
@Order(1)
void createCluster() {
+ ec2Service.createLaunchTemplate("us-east-1", "node-lt", new LaunchTemplateData(), null, null);
+ ec2Service.createLaunchTemplateVersion("us-east-1", null, "node-lt", "1", new LaunchTemplateData());
+ ec2Service.createLaunchTemplateVersion("us-east-1", null, "node-lt", "2", new LaunchTemplateData());
+
given().contentType(JSON)
.body("{\"name\":\"" + CLUSTER + "\",\"roleArn\":\"arn:aws:iam::000000000000:role/eks-role\","
+ "\"version\":\"1.29\"}")
@@ -59,7 +69,6 @@ class EksNodegroupStructuredInputsIntegrationTest {
.when().post("/clusters/" + CLUSTER + "/node-groups")
.then().statusCode(200)
.body("nodegroup.nodegroupName", equalTo(NODEGROUP))
- .body("nodegroup.launchTemplate.id", equalTo("lt-0a1b2c3d4e5f60718"))
.body("nodegroup.launchTemplate.name", equalTo("node-lt"))
.body("nodegroup.launchTemplate.version", equalTo("3"))
.body("nodegroup.remoteAccess.ec2SshKey", equalTo("my-keypair"))
@@ -118,6 +127,7 @@ class EksNodegroupStructuredInputsIntegrationTest {
given().contentType(JSON)
.when().delete("/clusters/" + CLUSTER)
.then().statusCode(200);
+ ec2Service.deleteLaunchTemplate("us-east-1", null, "node-lt");
}
private String structuredNodeGroupBody(String nodegroupName) {
diff --git a/src/test/java/io/github/hectorvent/floci/services/eks/EksServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/eks/EksServiceTest.java
index 49d4287176..5fa5286f06 100644
--- a/src/test/java/io/github/hectorvent/floci/services/eks/EksServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/eks/EksServiceTest.java
@@ -14,6 +14,8 @@ import io.github.hectorvent.floci.services.ec2.Ec2ContainerManager;
import io.github.hectorvent.floci.services.ec2.Ec2ImageCatalog;
import io.github.hectorvent.floci.services.ec2.Ec2InstanceTypeCatalog;
import io.github.hectorvent.floci.services.ec2.Ec2Service;
+import io.github.hectorvent.floci.services.ec2.model.LaunchTemplate;
+import io.github.hectorvent.floci.services.ec2.model.LaunchTemplateData;
import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;
import io.github.hectorvent.floci.services.ec2.model.Tag;
import io.github.hectorvent.floci.services.ec2.portforward.Ec2PortForwardManager;
@@ -66,6 +68,7 @@ class EksServiceTest {
private EksService eksService;
private StorageFactory storageFactory;
private RegionResolver regionResolver;
+ private Ec2Service ec2Service;
@BeforeEach
void setUp() {
@@ -79,7 +82,13 @@ class EksServiceTest {
EmulatorConfig config = testConfig();
EksClusterManager clusterManager = null;
- Ec2Service ec2Service = null;
+ ec2Service = realEc2Service();
+ ec2Service.createLaunchTemplate("us-east-1", "my-node-launch-template",
+ new LaunchTemplateData(), null, null);
+ ec2Service.createLaunchTemplateVersion("us-east-1", null, "my-node-launch-template",
+ "1", new LaunchTemplateData());
+ ec2Service.createLaunchTemplateVersion("us-east-1", null, "my-node-launch-template",
+ "2", new LaunchTemplateData());
regionResolver = new RegionResolver("us-east-1", "000000000000");
eksService = new EksService(storageFactory, config, regionResolver, clusterManager, ec2Service,
new EksOidcService(storageFactory, new ObjectMapper()), mock(EksAccessEntryService.class),
@@ -2040,7 +2049,6 @@ class EksServiceTest {
}
private static final Map<String, Object> LAUNCH_TEMPLATE = Map.of(
- "id", "lt-0a1b2c3d4e5f60718",
"name", "my-node-launch-template",
"version", "3");
@@ -2103,7 +2111,7 @@ class EksServiceTest {
// The nested members are what OpenTofu diffs against its declared block, so spot-check
// them individually rather than trusting the whole-map comparison alone.
Map<?, ?> launchTemplate = (Map<?, ?>) described.getLaunchTemplate();
- assertEquals("lt-0a1b2c3d4e5f60718", launchTemplate.get("id"));
+ assertNull(launchTemplate.get("id"));
assertEquals("my-node-launch-template", launchTemplate.get("name"));
assertEquals("3", launchTemplate.get("version"));
Map<?, ?> remoteAccess = (Map<?, ?>) described.getRemoteAccess();
@@ -2161,11 +2169,200 @@ class EksServiceTest {
assertEquals(created.getTaints(), described.getTaints());
}
+ @Test
+ void createNodeGroupWithValidLaunchTemplateIdAndVersionSucceeds() {
+ createTestCluster("lt-cluster");
+ LaunchTemplate lt = ec2Service.createLaunchTemplate("us-east-1", "test-lt-id",
+ new LaunchTemplateData(), null, null);
+
+ CreateNodeGroupRequest request = nodeGroupRequest("valid-lt-id-ng");
+ request.setLaunchTemplate(Map.of("id", lt.getLaunchTemplateId(), "version", "1"));
+
+ Nodegroup created = eksService.createNodeGroup("lt-cluster", request);
+ assertNotNull(created);
+ assertEquals(Map.of("id", lt.getLaunchTemplateId(), "version", "1"), created.getLaunchTemplate());
+ }
+
+ @Test
+ void createNodeGroupWithValidLaunchTemplateNameAndVersionSucceeds() {
+ createTestCluster("lt-cluster");
+ ec2Service.createLaunchTemplate("us-east-1", "test-lt-name",
+ new LaunchTemplateData(), null, null);
+
+ CreateNodeGroupRequest request = nodeGroupRequest("valid-lt-name-ng");
+ request.setLaunchTemplate(Map.of("name", "test-lt-name", "version", "1"));
+
+ Nodegroup created = eksService.createNodeGroup("lt-cluster", request);
+ assertNotNull(created);
+ assertEquals(Map.of("name", "test-lt-name", "version", "1"), created.getLaunchTemplate());
+ }
+
+ @Test
+ void createNodeGroupWithValidLaunchTemplateWithoutVersionDefaultsVersion() {
+ createTestCluster("lt-cluster");
+ LaunchTemplate lt = ec2Service.createLaunchTemplate("us-east-1", "test-lt-default-ver",
+ new LaunchTemplateData(), null, null);
+
+ CreateNodeGroupRequest request = nodeGroupRequest("default-ver-ng");
+ request.setLaunchTemplate(Map.of("id", lt.getLaunchTemplateId()));
+
+ Nodegroup created = eksService.createNodeGroup("lt-cluster", request);
+ assertNotNull(created);
+ }
+
+ @Test
+ void createNodeGroupWithNonExistentLaunchTemplateIdFails() {
+ createTestCluster("lt-cluster");
+ CreateNodeGroupRequest request = nodeGroupRequest("missing-lt-id-ng");
+ request.setLaunchTemplate(Map.of("id", "lt-missing123456789", "version", "1"));
+
+ AwsException ex = assertThrows(AwsException.class,
+ () -> eksService.createNodeGroup("lt-cluster", request));
+ assertEquals("InvalidParameterException", ex.getErrorCode());
+ assertEquals(400, ex.getHttpStatus());
+ assertTrue(ex.getMessage().contains("Launch template could not be found"));
+ }
+
+ @Test
+ void createNodeGroupWithNonExistentLaunchTemplateNameFails() {
+ createTestCluster("lt-cluster");
+ CreateNodeGroupRequest request = nodeGroupRequest("missing-lt-name-ng");
+ request.setLaunchTemplate(Map.of("name", "non-existent-template", "version", "1"));
+
+ AwsException ex = assertThrows(AwsException.class,
+ () -> eksService.createNodeGroup("lt-cluster", request));
+ assertEquals("InvalidParameterException", ex.getErrorCode());
+ assertEquals(400, ex.getHttpStatus());
+ assertTrue(ex.getMessage().contains("Launch template could not be found"));
+ }
+
+ @Test
+ void createNodeGroupWithNonExistentLaunchTemplateVersionFails() {
+ createTestCluster("lt-cluster");
+ LaunchTemplate lt = ec2Service.createLaunchTemplate("us-east-1", "test-lt-missing-ver",
+ new LaunchTemplateData(), null, null);
+
+ CreateNodeGroupRequest request = nodeGroupRequest("missing-ver-ng");
+ request.setLaunchTemplate(Map.of("id", lt.getLaunchTemplateId(), "version", "99"));
+
+ AwsException ex = assertThrows(AwsException.class,
+ () -> eksService.createNodeGroup("lt-cluster", request));
+ assertEquals("InvalidParameterException", ex.getErrorCode());
+ assertEquals(400, ex.getHttpStatus());
+ assertEquals("The specified launch template version does not exist.", ex.getMessage());
+ }
+
+ @Test
+ void createNodeGroupWithMalformedLaunchTemplateVersionFails() {
+ createTestCluster("lt-cluster");
+ LaunchTemplate lt = ec2Service.createLaunchTemplate("us-east-1", "test-lt-malformed-ver",
+ new LaunchTemplateData(), null, null);
+
+ CreateNodeGroupRequest request = nodeGroupRequest("malformed-ver-ng");
+ request.setLaunchTemplate(Map.of("id", lt.getLaunchTemplateId(), "version", "not-a-number"));
+
+ AwsException ex = assertThrows(AwsException.class,
+ () -> eksService.createNodeGroup("lt-cluster", request));
+ assertEquals("InvalidParameterException", ex.getErrorCode());
+ assertEquals(400, ex.getHttpStatus());
+ assertEquals("The specified launch template version is not valid.", ex.getMessage());
+ }
+
+ @Test
+ void createNodeGroupUsesClusterRegionForArnAndLaunchTemplate() {
+ Cluster cluster = new Cluster();
+ cluster.setName("regional-cluster");
+ cluster.setArn("arn:aws:eks:eu-west-1:000000000000:cluster/regional-cluster");
+ cluster.setStatus(ClusterStatus.ACTIVE);
+ eksService.putClusterForAccount("000000000000", cluster);
+
+ LaunchTemplate lt = ec2Service.createLaunchTemplate("eu-west-1", "eu-lt",
+ new LaunchTemplateData(), null, null);
+
+ CreateNodeGroupRequest request = nodeGroupRequest("regional-ng");
+ request.setLaunchTemplate(Map.of("id", lt.getLaunchTemplateId(), "version", "1"));
+
+ Nodegroup created = eksService.createNodeGroup("regional-cluster", request);
+ assertNotNull(created);
+ assertTrue(created.getNodegroupArn().startsWith(
+ "arn:aws:eks:eu-west-1:000000000000:nodegroup/regional-cluster/regional-ng/"));
+ }
+
+ @Test
+ void createNodeGroupValidatesLaunchTemplateInClusterRegion() {
+ Cluster cluster = new Cluster();
+ cluster.setName("eu-cluster");
+ cluster.setArn("arn:aws:eks:eu-west-1:000000000000:cluster/eu-cluster");
+ cluster.setStatus(ClusterStatus.ACTIVE);
+ eksService.putClusterForAccount("000000000000", cluster);
+
+ LaunchTemplate lt = ec2Service.createLaunchTemplate("us-east-1", "us-only-lt",
+ new LaunchTemplateData(), null, null);
+
+ CreateNodeGroupRequest request = nodeGroupRequest("eu-ng");
+ request.setLaunchTemplate(Map.of("id", lt.getLaunchTemplateId(), "version", "1"));
+
+ AwsException ex = assertThrows(AwsException.class,
+ () -> eksService.createNodeGroup("eu-cluster", request));
+ assertEquals("InvalidParameterException", ex.getErrorCode());
+ assertEquals(400, ex.getHttpStatus());
+ assertTrue(ex.getMessage().contains("Launch template could not be found"));
+ }
+
+ @Test
+ void createNodeGroupWithBothLaunchTemplateIdAndNameFails() {
+ createTestCluster("lt-cluster");
+ LaunchTemplate lt = ec2Service.createLaunchTemplate("us-east-1", "test-lt-both",
+ new LaunchTemplateData(), null, null);
+
+ CreateNodeGroupRequest request = nodeGroupRequest("both-id-name-ng");
+ request.setLaunchTemplate(Map.of(
+ "id", lt.getLaunchTemplateId(),
+ "name", lt.getLaunchTemplateName(),
+ "version", "1"));
+
+ AwsException ex = assertThrows(AwsException.class,
+ () -> eksService.createNodeGroup("lt-cluster", request));
+ assertEquals("InvalidParameterException", ex.getErrorCode());
+ assertEquals(400, ex.getHttpStatus());
+ assertEquals("You must specify either the launch template ID or the launch template name in the request, but not both.",
+ ex.getMessage());
+ }
+
+ @Test
+ void createNodeGroupWithNeitherLaunchTemplateIdNorNameFails() {
+ createTestCluster("lt-cluster");
+ CreateNodeGroupRequest request = nodeGroupRequest("neither-id-name-ng");
+ request.setLaunchTemplate(Map.of("version", "1"));
+
+ AwsException ex = assertThrows(AwsException.class,
+ () -> eksService.createNodeGroup("lt-cluster", request));
+ assertEquals("InvalidParameterException", ex.getErrorCode());
+ assertEquals(400, ex.getHttpStatus());
+ assertEquals("You must specify either the launch template ID or the launch template name in the request, but not both.",
+ ex.getMessage());
+ }
+
+ @Test
+ void createNodeGroupWithNoLaunchTemplateUnaffected() {
+ createTestCluster("lt-cluster");
+ CreateNodeGroupRequest request = nodeGroupRequest("no-lt-ng");
+ request.setLaunchTemplate(null);
+
+ Nodegroup created = eksService.createNodeGroup("lt-cluster", request);
+ assertNotNull(created);
+ assertNull(created.getLaunchTemplate());
+ }
+
/**
* A service whose stores are real JSON files under {@code directory}, one per store name, so a
* second instance over the same directory reloads through Jackson exactly as a restart does.
*/
private EksService persistentEksService(Path directory) {
+ return persistentEksService(directory, ec2Service);
+ }
+
+ private EksService persistentEksService(Path directory, Ec2Service ec2) {
StorageFactory storageFactory = new StorageFactory(null, null) {
@Override
public <V> AccountAwareStorageBackend<V> create(String serviceName, String fileName,
@@ -2177,7 +2374,7 @@ class EksServiceTest {
}
};
return new EksService(storageFactory, testConfig(true),
- new RegionResolver("us-east-1", "000000000000"), null, realEc2Service(),
+ new RegionResolver("us-east-1", "000000000000"), null, ec2,
new EksOidcService(storageFactory, new ObjectMapper()), mock(EksAccessEntryService.class),
mock(EksPodIdentityAssociationService.class));
}