Light, fluffy, and always free - The AWS Local Emulator alternative
feat(ec2): support Spot Instance request actions (#1291)
MAN$I VERMAff86b542c437
diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.javaindex 9eb9ddf0de..bd8e7389b4 100644--- a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.java@@ -137,6 +137,10 @@ public class Ec2QueryHandler {case "CreateVolume" -> handleCreateVolume(params, region);case "DescribeVolumes" -> handleDescribeVolumes(params, region);case "DeleteVolume" -> handleDeleteVolume(params, region);+ // Spot Instances+ case "RequestSpotInstances" -> handleRequestSpotInstances(params, region);+ case "DescribeSpotInstanceRequests" -> handleDescribeSpotInstanceRequests(params, region);+ case "CancelSpotInstanceRequests" -> handleCancelSpotInstanceRequests(params, region);default -> ec2Error("UnsupportedOperation","Operation " + action + " is not supported.", 400);};@@ -2109,4 +2113,158 @@ public class Ec2QueryHandler {xml.end(wrapperTag);return xml.build();}++ private Response handleRequestSpotInstances(MultivaluedMap<String, String> p, String region) {+ String spotPrice = p.getFirst("SpotPrice");+ Integer instanceCount = parseIntParam(p, "InstanceCount", 1);+ String type = p.getFirst("Type");+ String productDescription = p.getFirst("ProductDescription");++ String imageId = p.getFirst("LaunchSpecification.ImageId");+ String instanceType = p.getFirst("LaunchSpecification.InstanceType");+ String keyName = p.getFirst("LaunchSpecification.KeyName");+ String subnetId = p.getFirst("LaunchSpecification.SubnetId");+ List<String> securityGroupIds = getList(p, "LaunchSpecification.SecurityGroupId");+ String userDataEncoded = p.getFirst("LaunchSpecification.UserData");+ String userData = null;+ if (userDataEncoded != null && !userDataEncoded.isBlank()) {+ userData = new String(Base64.getDecoder().decode(userDataEncoded), StandardCharsets.UTF_8);+ }+ String iamInstanceProfileArn = p.getFirst("LaunchSpecification.IamInstanceProfile.Arn");++ // Parse TagSpecifications+ List<Tag> spotRequestTags = new ArrayList<>();+ List<Tag> instanceTags = new ArrayList<>();+ for (int i = 1; ; i++) {+ String resType = p.getFirst("TagSpecification." + i + ".ResourceType");+ if (resType == null) break;+ if ("spot-instances-request".equals(resType)) {+ for (int j = 1; ; j++) {+ String k = p.getFirst("TagSpecification." + i + ".Tag." + j + ".Key");+ if (k == null) break;+ String v = p.getFirst("TagSpecification." + i + ".Tag." + j + ".Value");+ spotRequestTags.add(new Tag(k, v));+ }+ } else if ("instance".equals(resType)) {+ for (int j = 1; ; j++) {+ String k = p.getFirst("TagSpecification." + i + ".Tag." + j + ".Key");+ if (k == null) break;+ String v = p.getFirst("TagSpecification." + i + ".Tag." + j + ".Value");+ instanceTags.add(new Tag(k, v));+ }+ }+ }++ List<SpotInstanceRequest> requests = service.requestSpotInstances(region, spotPrice, instanceCount,+ type, productDescription, imageId, instanceType, keyName, subnetId, securityGroupIds, userData, iamInstanceProfileArn,+ spotRequestTags, instanceTags);++ XmlBuilder xml = new XmlBuilder()+ .start("RequestSpotInstancesResponse", AwsNamespaces.EC2)+ .elem("requestId", UUID.randomUUID().toString())+ .start("spotInstanceRequestSet");+ for (SpotInstanceRequest sir : requests) {+ xml.start("item").raw(spotInstanceRequestXml(sir)).end("item");+ }+ xml.end("spotInstanceRequestSet")+ .end("RequestSpotInstancesResponse");+ return xmlResponse(xml.build());+ }++ private Response handleDescribeSpotInstanceRequests(MultivaluedMap<String, String> p, String region) {+ List<String> ids = getList(p, "SpotInstanceRequestId");+ Map<String, List<String>> filters = getFilters(p);+ List<SpotInstanceRequest> requests = service.describeSpotInstanceRequests(region, ids, filters);++ XmlBuilder xml = new XmlBuilder()+ .start("DescribeSpotInstanceRequestsResponse", AwsNamespaces.EC2)+ .elem("requestId", UUID.randomUUID().toString())+ .start("spotInstanceRequestSet");+ for (SpotInstanceRequest sir : requests) {+ xml.start("item").raw(spotInstanceRequestXml(sir)).end("item");+ }+ xml.end("spotInstanceRequestSet")+ .end("DescribeSpotInstanceRequestsResponse");+ return xmlResponse(xml.build());+ }++ private Response handleCancelSpotInstanceRequests(MultivaluedMap<String, String> p, String region) {+ List<String> ids = getList(p, "SpotInstanceRequestId");+ List<SpotInstanceRequest> requests = service.cancelSpotInstanceRequests(region, ids);++ XmlBuilder xml = new XmlBuilder()+ .start("CancelSpotInstanceRequestsResponse", AwsNamespaces.EC2)+ .elem("requestId", UUID.randomUUID().toString())+ .start("spotInstanceRequestSet");+ for (SpotInstanceRequest sir : requests) {+ xml.start("item")+ .elem("spotInstanceRequestId", sir.getSpotInstanceRequestId())+ .elem("state", sir.getState())+ .end("item");+ }+ xml.end("spotInstanceRequestSet")+ .end("CancelSpotInstanceRequestsResponse");+ return xmlResponse(xml.build());+ }++ private String spotInstanceRequestXml(SpotInstanceRequest sir) {+ XmlBuilder xml = new XmlBuilder()+ .elem("spotInstanceRequestId", sir.getSpotInstanceRequestId())+ .elem("spotPrice", sir.getSpotPrice())+ .elem("type", sir.getType())+ .elem("state", sir.getState())+ .start("status")+ .elem("code", sir.getStatusCode())+ .elem("updateTime", sir.getStatusUpdateTime() != null ? ISO_FMT.format(sir.getStatusUpdateTime()) : "")+ .elem("message", sir.getStatusMessage())+ .end("status");++ if (sir.getLaunchSpecification() != null) {+ LaunchSpecification spec = sir.getLaunchSpecification();+ xml.start("launchSpecification")+ .elem("imageId", spec.getImageId())+ .elem("instanceType", spec.getInstanceType())+ .elem("keyName", spec.getKeyName())+ .elem("subnetId", spec.getSubnetId());++ xml.start("groupSet");+ for (GroupIdentifier gi : spec.getSecurityGroups()) {+ xml.start("item")+ .elem("groupId", gi.getGroupId())+ .elem("groupName", gi.getGroupName())+ .end("item");+ }+ xml.end("groupSet");++ if (spec.getUserData() != null) {+ String encodedUserData = Base64.getEncoder().encodeToString(spec.getUserData().getBytes(StandardCharsets.UTF_8));+ xml.elem("userData", encodedUserData);+ }+ if (spec.getIamInstanceProfileArn() != null) {+ xml.start("iamInstanceProfile")+ .elem("arn", spec.getIamInstanceProfileArn())+ .end("iamInstanceProfile");+ }+ xml.end("launchSpecification");+ }++ if (sir.getInstanceId() != null) {+ xml.elem("instanceId", sir.getInstanceId());+ }+ xml.elem("createTime", sir.getCreateTime() != null ? ISO_FMT.format(sir.getCreateTime()) : "")+ .elem("productDescription", sir.getProductDescription());++ if (sir.getTags() != null && !sir.getTags().isEmpty()) {+ xml.start("tagSet");+ for (Tag t : sir.getTags()) {+ xml.start("item")+ .elem("key", t.getKey())+ .elem("value", t.getValue())+ .end("item");+ }+ xml.end("tagSet");+ }++ return xml.build();+ }}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 e70f507f8b..cd4e6d7b69 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@@ -61,6 +61,8 @@ import io.github.hectorvent.floci.services.ec2.model.VolumeAttachment;import io.github.hectorvent.floci.services.ec2.model.Vpc;import io.github.hectorvent.floci.services.ec2.model.VpcCidrBlockAssociation;import io.github.hectorvent.floci.services.ec2.model.VpcEndpoint;+import io.github.hectorvent.floci.services.ec2.model.LaunchSpecification;+import io.github.hectorvent.floci.services.ec2.model.SpotInstanceRequest;import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;@@ -93,6 +95,7 @@ public class Ec2Service {private final StorageBackend<String, LaunchTemplate> launchTemplates;private final StorageBackend<String, VpcEndpoint> vpcEndpoints;private final StorageBackend<String, NatGateway> natGateways;+ private final StorageBackend<String, SpotInstanceRequest> spotInstanceRequests;// resourceId → List<Tag>private final StorageBackend<String, List<Tag>> tags;private final Set<String> seededRegions = ConcurrentHashMap.newKeySet();@@ -117,6 +120,7 @@ public class Ec2Service {storageFactory.create("ec2", "ec2-launch-templates.json", new TypeReference<Map<String, LaunchTemplate>>() {}),storageFactory.create("ec2", "ec2-vpc-endpoints.json", new TypeReference<Map<String, VpcEndpoint>>() {}),storageFactory.create("ec2", "ec2-nat-gateways.json", new TypeReference<Map<String, NatGateway>>() {}),+ storageFactory.create("ec2", "ec2-spot-instance-requests.json", new TypeReference<Map<String, SpotInstanceRequest>>() {}),storageFactory.create("ec2", "ec2-tags.json", new TypeReference<Map<String, List<Tag>>>() {}));}@@ -136,6 +140,7 @@ public class Ec2Service {StorageBackend<String, LaunchTemplate> launchTemplates,StorageBackend<String, VpcEndpoint> vpcEndpoints,StorageBackend<String, NatGateway> natGateways,+ StorageBackend<String, SpotInstanceRequest> spotInstanceRequests,StorageBackend<String, List<Tag>> tags) {this.accountId = config.defaultAccountId();this.config = config;@@ -155,6 +160,7 @@ public class Ec2Service {this.launchTemplates = launchTemplates;this.vpcEndpoints = vpcEndpoints;this.natGateways = natGateways;+ this.spotInstanceRequests = spotInstanceRequests;this.tags = tags;}@@ -2041,6 +2047,14 @@ public class Ec2Service {default -> true;};}+ if (resource instanceof SpotInstanceRequest sir) {+ return switch (filterName) {+ case "spot-instance-request-id" -> matchesValue(values, sir.getSpotInstanceRequestId());+ case "state" -> matchesValue(values, sir.getState());+ case "instance-id" -> matchesValue(values, sir.getInstanceId());+ default -> true;+ };+ }return true;}@@ -2058,6 +2072,7 @@ public class Ec2Service {if (resource instanceof LaunchTemplate lt) return lt.getTags();if (resource instanceof VpcEndpoint endpoint) return endpoint.getTags();if (resource instanceof NatGateway natGateway) return natGateway.getTags();+ if (resource instanceof SpotInstanceRequest sir) return sir.getTags();return Collections.emptyList();}@@ -2262,4 +2277,107 @@ public class Ec2Service {.filter(a -> instanceId.equals(a.getInstanceId()) && a.getAssociationId() != null).findFirst();}++ public List<SpotInstanceRequest> requestSpotInstances(String region, String spotPrice, Integer instanceCount,+ String type, String productDescription, String imageId, String instanceType,+ String keyName, String subnetId, List<String> securityGroupIds,+ String userData, String iamInstanceProfileArn,+ List<Tag> spotRequestTags, List<Tag> instanceTags) {+ ensureDefaultResources(region);++ int count = instanceCount != null ? instanceCount : 1;+ String finalType = type != null ? type : "one-time";++ List<SpotInstanceRequest> requests = new ArrayList<>();++ for (int i = 0; i < count; i++) {+ String spotRequestId = "sir-" + randomHex(8);++ Reservation reservation = runInstances(region, imageId, instanceType, 1, 1, keyName,+ securityGroupIds, subnetId, null, instanceTags, userData, iamInstanceProfileArn);++ Instance launchedInstance = reservation.getInstances().get(0);++ LaunchSpecification spec = new LaunchSpecification();+ spec.setImageId(launchedInstance.getImageId());+ spec.setInstanceType(launchedInstance.getInstanceType());+ spec.setKeyName(launchedInstance.getKeyName());+ spec.setSubnetId(launchedInstance.getSubnetId());+ spec.setUserData(userData);+ spec.setIamInstanceProfileArn(iamInstanceProfileArn);++ if (launchedInstance.getSecurityGroups() != null) {+ spec.setSecurityGroups(new ArrayList<>(launchedInstance.getSecurityGroups()));+ }++ SpotInstanceRequest sir = new SpotInstanceRequest();+ sir.setSpotInstanceRequestId(spotRequestId);+ sir.setSpotPrice(spotPrice);+ sir.setType(finalType);+ sir.setState("active");+ sir.setStatusCode("fulfilled");+ sir.setStatusMessage("Your Spot Instance request is fulfilled.");+ sir.setStatusUpdateTime(Instant.now());+ sir.setInstanceId(launchedInstance.getInstanceId());+ sir.setCreateTime(Instant.now());+ sir.setLaunchSpecification(spec);+ sir.setRegion(region);+ if (productDescription != null && !productDescription.isBlank()) {+ sir.setProductDescription(productDescription);+ } else {+ sir.setProductDescription("Linux/UNIX");+ }++ if (spotRequestTags != null && !spotRequestTags.isEmpty()) {+ sir.setTags(new ArrayList<>(spotRequestTags));+ tags.put(spotRequestId, new ArrayList<>(spotRequestTags));+ }++ spotInstanceRequests.put(key(region, spotRequestId), sir);+ requests.add(sir);+ }++ return requests;+ }++ public List<SpotInstanceRequest> describeSpotInstanceRequests(String region, List<String> spotRequestIds, Map<String, List<String>> filters) {+ ensureDefaultResources(region);++ if (!spotRequestIds.isEmpty()) {+ for (String id : spotRequestIds) {+ if (spotInstanceRequests.get(key(region, id)).isEmpty()) {+ throw new AwsException("InvalidSpotInstanceRequestID.NotFound",+ "The spot instance request ID '" + id + "' does not exist", 400);+ }+ }+ }++ return spotInstanceRequests.scan(k -> true).stream()+ .filter(sir -> sir.getRegion().equals(region))+ .filter(sir -> spotRequestIds.isEmpty() || spotRequestIds.contains(sir.getSpotInstanceRequestId()))+ .filter(sir -> matchesFilters(sir, filters, region))+ .collect(Collectors.toList());+ }++ public List<SpotInstanceRequest> cancelSpotInstanceRequests(String region, List<String> spotRequestIds) {+ ensureDefaultResources(region);++ List<SpotInstanceRequest> result = new ArrayList<>();+ for (String id : spotRequestIds) {+ SpotInstanceRequest sir = spotInstanceRequests.get(key(region, id)).orElse(null);+ if (sir == null) {+ throw new AwsException("InvalidSpotInstanceRequestID.NotFound",+ "The spot instance request ID '" + id + "' does not exist", 400);+ }++ sir.setState("cancelled");+ sir.setStatusCode("request-canceled-and-instance-running");+ sir.setStatusMessage("Spot Instance request canceled. Associated Spot Instance is still running.");+ sir.setStatusUpdateTime(Instant.now());+ spotInstanceRequests.put(key(region, id), sir);+ result.add(sir);+ }++ return result;+ }}diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/model/LaunchSpecification.java b/src/main/java/io/github/hectorvent/floci/services/ec2/model/LaunchSpecification.javanew file mode 100644index 0000000000..71baafc311--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/model/LaunchSpecification.java@@ -0,0 +1,78 @@+package io.github.hectorvent.floci.services.ec2.model;++import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.util.ArrayList;+import java.util.List;++@RegisterForReflection+@JsonIgnoreProperties(ignoreUnknown = true)+public class LaunchSpecification {++ private String imageId;+ private String instanceType;+ private String keyName;+ private String subnetId;+ private List<GroupIdentifier> securityGroups = new ArrayList<>();+ private String userData;+ private String iamInstanceProfileArn;++ public LaunchSpecification() {}++ public String getImageId() {+ return imageId;+ }++ public void setImageId(String imageId) {+ this.imageId = imageId;+ }++ public String getInstanceType() {+ return instanceType;+ }++ public void setInstanceType(String instanceType) {+ this.instanceType = instanceType;+ }++ public String getKeyName() {+ return keyName;+ }++ public void setKeyName(String keyName) {+ this.keyName = keyName;+ }++ public String getSubnetId() {+ return subnetId;+ }++ public void setSubnetId(String subnetId) {+ this.subnetId = subnetId;+ }++ public List<GroupIdentifier> getSecurityGroups() {+ return securityGroups;+ }++ public void setSecurityGroups(List<GroupIdentifier> securityGroups) {+ this.securityGroups = securityGroups;+ }++ public String getUserData() {+ return userData;+ }++ public void setUserData(String userData) {+ this.userData = userData;+ }++ public String getIamInstanceProfileArn() {+ return iamInstanceProfileArn;+ }++ public void setIamInstanceProfileArn(String iamInstanceProfileArn) {+ this.iamInstanceProfileArn = iamInstanceProfileArn;+ }+}diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/model/SpotInstanceRequest.java b/src/main/java/io/github/hectorvent/floci/services/ec2/model/SpotInstanceRequest.javanew file mode 100644index 0000000000..34951f24cb--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/model/SpotInstanceRequest.java@@ -0,0 +1,133 @@+package io.github.hectorvent.floci.services.ec2.model;++import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.quarkus.runtime.annotations.RegisterForReflection;++import java.time.Instant;+import java.util.ArrayList;+import java.util.List;++@RegisterForReflection+@JsonIgnoreProperties(ignoreUnknown = true)+public class SpotInstanceRequest {++ private String spotInstanceRequestId;+ private String spotPrice;+ private String type; // "one-time" | "persistent"+ private String state; // "open" | "active" | "closed" | "cancelled" | "failed"+ private String statusCode;+ private String statusMessage;+ private Instant statusUpdateTime;+ private String instanceId;+ private Instant createTime;+ private String productDescription = "Linux/UNIX";+ private LaunchSpecification launchSpecification;+ private String region;+ private List<Tag> tags = new ArrayList<>();++ public SpotInstanceRequest() {}++ public String getSpotInstanceRequestId() {+ return spotInstanceRequestId;+ }++ public void setSpotInstanceRequestId(String spotInstanceRequestId) {+ this.spotInstanceRequestId = spotInstanceRequestId;+ }++ public String getSpotPrice() {+ return spotPrice;+ }++ public void setSpotPrice(String spotPrice) {+ this.spotPrice = spotPrice;+ }++ public String getType() {+ return type;+ }++ public void setType(String type) {+ this.type = type;+ }++ public String getState() {+ return state;+ }++ public void setState(String state) {+ this.state = state;+ }++ public String getStatusCode() {+ return statusCode;+ }++ public void setStatusCode(String statusCode) {+ this.statusCode = statusCode;+ }++ public String getStatusMessage() {+ return statusMessage;+ }++ public void setStatusMessage(String statusMessage) {+ this.statusMessage = statusMessage;+ }++ public Instant getStatusUpdateTime() {+ return statusUpdateTime;+ }++ public void setStatusUpdateTime(Instant statusUpdateTime) {+ this.statusUpdateTime = statusUpdateTime;+ }++ public String getInstanceId() {+ return instanceId;+ }++ public void setInstanceId(String instanceId) {+ this.instanceId = instanceId;+ }++ public Instant getCreateTime() {+ return createTime;+ }++ public void setCreateTime(Instant createTime) {+ this.createTime = createTime;+ }++ public String getProductDescription() {+ return productDescription;+ }++ public void setProductDescription(String productDescription) {+ this.productDescription = productDescription;+ }++ public LaunchSpecification getLaunchSpecification() {+ return launchSpecification;+ }++ public void setLaunchSpecification(LaunchSpecification launchSpecification) {+ this.launchSpecification = launchSpecification;+ }++ public String getRegion() {+ return region;+ }++ public void setRegion(String region) {+ this.region = region;+ }++ public List<Tag> getTags() {+ return tags;+ }++ public void setTags(List<Tag> tags) {+ this.tags = tags;+ }+}diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.javaindex fdbf87a593..ba08397292 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java@@ -2277,4 +2277,82 @@ class Ec2IntegrationTest {.when().post("/");}++ @Test+ @Order(150)+ void spotInstanceLifecycle() {+ // 1. Request Spot Instance+ String spotRequestId = given()+ .formParam("Action", "RequestSpotInstances")+ .formParam("SpotPrice", "0.05")+ .formParam("InstanceCount", "1")+ .formParam("Type", "one-time")+ .formParam("LaunchSpecification.ImageId", "ami-0abcdef1234567890")+ .formParam("LaunchSpecification.InstanceType", "t2.micro")+ .formParam("TagSpecification.1.ResourceType", "spot-instances-request")+ .formParam("TagSpecification.1.Tag.1.Key", "SpotKey")+ .formParam("TagSpecification.1.Tag.1.Value", "SpotValue")+ .header("Authorization", AUTH_HEADER)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .contentType("application/xml")+ .body("RequestSpotInstancesResponse.spotInstanceRequestSet.item[0].spotInstanceRequestId", startsWith("sir-"))+ .body("RequestSpotInstancesResponse.spotInstanceRequestSet.item[0].spotPrice", equalTo("0.05"))+ .body("RequestSpotInstancesResponse.spotInstanceRequestSet.item[0].state", equalTo("active"))+ .body("RequestSpotInstancesResponse.spotInstanceRequestSet.item[0].status.code", equalTo("fulfilled"))+ .body("RequestSpotInstancesResponse.spotInstanceRequestSet.item[0].launchSpecification.imageId", equalTo("ami-0abcdef1234567890"))+ .body("RequestSpotInstancesResponse.spotInstanceRequestSet.item[0].productDescription", equalTo("Linux/UNIX"))+ .body("RequestSpotInstancesResponse.spotInstanceRequestSet.item[0].tagSet.item[0].key", equalTo("SpotKey"))+ .body("RequestSpotInstancesResponse.spotInstanceRequestSet.item[0].tagSet.item[0].value", equalTo("SpotValue"))+ .extract().path("RequestSpotInstancesResponse.spotInstanceRequestSet.item[0].spotInstanceRequestId");++ // 2. Describe Spot Instance Request by ID+ given()+ .formParam("Action", "DescribeSpotInstanceRequests")+ .formParam("SpotInstanceRequestId.1", spotRequestId)+ .header("Authorization", AUTH_HEADER)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("DescribeSpotInstanceRequestsResponse.spotInstanceRequestSet.item[0].spotInstanceRequestId", equalTo(spotRequestId))+ .body("DescribeSpotInstanceRequestsResponse.spotInstanceRequestSet.item[0].state", equalTo("active"));++ // 3. Describe Spot Instance Request using tag filter+ given()+ .formParam("Action", "DescribeSpotInstanceRequests")+ .formParam("Filter.1.Name", "tag:SpotKey")+ .formParam("Filter.1.Value.1", "SpotValue")+ .header("Authorization", AUTH_HEADER)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("DescribeSpotInstanceRequestsResponse.spotInstanceRequestSet.item[0].spotInstanceRequestId", equalTo(spotRequestId));++ // 4. Cancel Spot Instance Request+ given()+ .formParam("Action", "CancelSpotInstanceRequests")+ .formParam("SpotInstanceRequestId.1", spotRequestId)+ .header("Authorization", AUTH_HEADER)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("CancelSpotInstanceRequestsResponse.spotInstanceRequestSet.item[0].spotInstanceRequestId", equalTo(spotRequestId))+ .body("CancelSpotInstanceRequestsResponse.spotInstanceRequestSet.item[0].state", equalTo("cancelled"));++ // 5. Describe Spot Instance Request to verify state is cancelled+ given()+ .formParam("Action", "DescribeSpotInstanceRequests")+ .formParam("SpotInstanceRequestId.1", spotRequestId)+ .header("Authorization", AUTH_HEADER)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("DescribeSpotInstanceRequestsResponse.spotInstanceRequestSet.item[0].state", equalTo("cancelled"));+ }}diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServicePersistenceTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServicePersistenceTest.javaindex 90368c259a..2e600aed06 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServicePersistenceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServicePersistenceTest.java@@ -18,6 +18,7 @@ import io.github.hectorvent.floci.services.ec2.model.Tag;import io.github.hectorvent.floci.services.ec2.model.Volume;import io.github.hectorvent.floci.services.ec2.model.Vpc;import io.github.hectorvent.floci.services.ec2.model.VpcEndpoint;+import io.github.hectorvent.floci.services.ec2.model.SpotInstanceRequest;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.io.TempDir;@@ -80,6 +81,7 @@ class Ec2ServicePersistenceTest {load(dir, "ec2-launch-templates.json", new TypeReference<Map<String, LaunchTemplate>>() {}),load(dir, "ec2-vpc-endpoints.json", new TypeReference<Map<String, VpcEndpoint>>() {}),load(dir, "ec2-nat-gateways.json", new TypeReference<Map<String, NatGateway>>() {}),+ load(dir, "ec2-spot-instance-requests.json", new TypeReference<Map<String, SpotInstanceRequest>>() {}),load(dir, "ec2-tags.json", new TypeReference<Map<String, List<Tag>>>() {}));}