Light, fluffy, and always free - The AWS Local Emulator alternative
feat(servicequotas): add quota request history lookup (#3054)
Franklin G. Mendoza532e27986eca
diff --git a/docs/services/servicequotas.md b/docs/services/servicequotas.mdindex 37c7ef4d55..1fda386629 100644--- a/docs/services/servicequotas.md+++ b/docs/services/servicequotas.md@@ -8,8 +8,10 @@ Floci answers Service Quotas lookups from a generated in-memory catalog. Every sresolves to a quota list: a curated set with real AWS quota codes where tooling depends onthem — CodeBuild's `L-2DC20C30` ("Concurrently running builds") and Lambda's `L-B99A9384`("Concurrent executions") — plus a deterministic generic set for any other service code. All-values are deliberately generous (5000) so local pipelines that gate on quota headroom, such-as AWS Landing Zone Accelerator, never stall on a limit the emulator does not enforce.+values are deliberately generous so local pipelines that gate on quota headroom, such+as AWS Landing Zone Accelerator, never stall on a limit the emulator does not enforce. The+Organizations `Maximum number of accounts` quota uses AWS quota code `L-E619E033` and a local value+of 50.Applied quotas and AWS default quotas return the same data, and quota values are static.`RequestServiceQuotaIncrease` is accepted and validated but does not change any quota value —@@ -25,6 +27,7 @@ see Limitations.| `GetAWSDefaultServiceQuota` | Same as GetServiceQuota; defaults equal applied values || `ListAWSDefaultServiceQuotas` | Same as ListServiceQuotas; defaults equal applied values || `RequestServiceQuotaIncrease` | Validates and echoes an increase request as `PENDING`; not persisted, quota unchanged |+| `ListRequestedServiceQuotaChangeHistoryByQuota` | Validates the service/quota pair and returns the locally recorded request history; currently empty for the static catalog |<!-- floci:actions:end -->## Limitationsdiff --git a/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasJsonHandler.javaindex f95e53fdfb..d2b49a89b3 100644--- a/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasJsonHandler.java@@ -33,6 +33,10 @@ public class ServiceQuotasJsonHandler {case "GetAWSDefaultServiceQuota" -> handleGetServiceQuota(request, region, accountId);case "ListAWSDefaultServiceQuotas" -> handleListServiceQuotas(request, region, accountId);case "RequestServiceQuotaIncrease" -> handleRequestServiceQuotaIncrease(request, region, accountId);+ case "ListRequestedServiceQuotaChangeHistoryByQuota" ->+ Response.ok(service.listRequestedServiceQuotaChangeHistoryByQuota(+ stringOrNull(request, "ServiceCode"), stringOrNull(request, "QuotaCode"),+ stringOrNull(request, "NextToken"), integerOrNull(request, "MaxResults"))).build();default -> Response.status(400).entity(new AwsErrorResponse("UnknownOperationException","Unknown operation: ServiceQuotasV20190624." + action))diff --git a/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasService.java b/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasService.javaindex 045b467f07..54b35988ff 100644--- a/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasService.java+++ b/src/main/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasService.java@@ -54,9 +54,11 @@ public class ServiceQuotasService {private static final Map<String, List<QuotaDefinition>> CURATED_QUOTAS = Map.of("codebuild", List.of(- new QuotaDefinition("L-2DC20C30", "Concurrently running builds", GENERIC_QUOTA_VALUE)),+ new QuotaDefinition("L-2DC20C30", "Concurrently running builds", GENERIC_QUOTA_VALUE, false)),"lambda", List.of(- new QuotaDefinition("L-B99A9384", "Concurrent executions", GENERIC_QUOTA_VALUE)));+ new QuotaDefinition("L-B99A9384", "Concurrent executions", GENERIC_QUOTA_VALUE, false)),+ "organizations", List.of(+ new QuotaDefinition("L-E619E033", "Maximum number of accounts", 50.0, true)));private static final List<String> GENERIC_QUOTA_NAMES = List.of("Resources per Region",@@ -109,7 +111,9 @@ public class ServiceQuotasService {List<QuotaDefinition> quotasFor(String serviceCode) {List<QuotaDefinition> quotas = new ArrayList<>(CURATED_QUOTAS.getOrDefault(serviceCode, List.of()));for (String name : GENERIC_QUOTA_NAMES) {- quotas.add(new QuotaDefinition(syntheticQuotaCode(serviceCode, name), name, GENERIC_QUOTA_VALUE));+ quotas.add(new QuotaDefinition(+ syntheticQuotaCode(serviceCode, name), name, GENERIC_QUOTA_VALUE,+ "organizations".equals(serviceCode)));}return quotas;}@@ -135,7 +139,7 @@ public class ServiceQuotasService {node.put("Value", quota.value());node.put("Unit", "None");node.put("Adjustable", true);- node.put("GlobalQuota", false);+ node.put("GlobalQuota", quota.globalQuota());node.put("QuotaAppliedAtLevel", "ACCOUNT");return node;}@@ -190,7 +194,29 @@ public class ServiceQuotasService {}}- record QuotaDefinition(String quotaCode, String quotaName, double value) {+ public ObjectNode listRequestedServiceQuotaChangeHistoryByQuota(String serviceCode, String quotaCode,+ String nextToken, Integer maxResults) {+ requireServiceCode(serviceCode);+ if (quotaCode == null || quotaCode.isBlank()) {+ throw new AwsException("IllegalArgumentException", "Invalid input: QuotaCode must not be empty.", 400);+ }+ boolean exists = quotasFor(serviceCode).stream().anyMatch(quota -> quota.quotaCode().equals(quotaCode));+ if (!exists) {+ throw new AwsException("NoSuchResourceException",+ "The request failed because the specified service quota does not exist.", 400);+ }+ if (maxResults != null && (maxResults < 1 || maxResults > 100)) {+ throw new AwsException("IllegalArgumentException", "Invalid input: MaxResults must be between 1 and 100.", 400);+ }+ if (nextToken != null && !nextToken.isEmpty()) {+ throw new AwsException("InvalidPaginationTokenException", "Invalid NextToken.", 400);+ }+ ObjectNode response = objectMapper.createObjectNode();+ response.putArray("RequestedQuotas");+ return response;+ }++ record QuotaDefinition(String quotaCode, String quotaName, double value, boolean globalQuota) {}private record Page(List<QuotaDefinition> items, String nextToken) {@@ -235,7 +261,7 @@ public class ServiceQuotasService {requestedQuota.put("Status", "PENDING");requestedQuota.put("Requester", "floci-emulator");requestedQuota.put("Unit", "None");- requestedQuota.put("GlobalQuota", false);+ requestedQuota.put("GlobalQuota", quota.globalQuota());requestedQuota.put("QuotaRequestedAtLevel", "ACCOUNT");requestedQuota.put("Created", now);requestedQuota.put("LastUpdated", now);diff --git a/src/test/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasIntegrationTest.javaindex a5f6cebe12..0bc975edf8 100644--- a/src/test/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/servicequotas/ServiceQuotasIntegrationTest.java@@ -158,6 +158,81 @@ class ServiceQuotasIntegrationTest {.body("Quota.GlobalQuota", equalTo(false));}+ @Test+ void organizationsQuotaUsesAwsQuotaCode() {+ given()+ .contentType(CONTENT_TYPE)+ .header("X-Amz-Target", "ServiceQuotasV20190624.GetServiceQuota")+ .header("Authorization", AUTH_HEADER)+ .body("{\"ServiceCode\":\"organizations\",\"QuotaCode\":\"L-E619E033\"}")+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("Quota.QuotaCode", equalTo("L-E619E033"))+ .body("Quota.QuotaName", equalTo("Maximum number of accounts"))+ .body("Quota.Value", equalTo(50.0f))+ .body("Quota.GlobalQuota", equalTo(true));+ }++ @Test+ void listRequestedQuotaHistoryByQuotaReturnsEmptyHistoryForKnownQuota() {+ given()+ .contentType(CONTENT_TYPE)+ .header("X-Amz-Target", "ServiceQuotasV20190624.ListRequestedServiceQuotaChangeHistoryByQuota")+ .header("Authorization", AUTH_HEADER)+ .body("{\"ServiceCode\":\"organizations\",\"QuotaCode\":\"L-E619E033\"}")+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("RequestedQuotas.size()", equalTo(0));+ }++ @Test+ void listRequestedQuotaHistoryByQuotaRejectsImpossibleNextToken() {+ given()+ .contentType(CONTENT_TYPE)+ .header("X-Amz-Target", "ServiceQuotasV20190624.ListRequestedServiceQuotaChangeHistoryByQuota")+ .header("Authorization", AUTH_HEADER)+ .body("{\"ServiceCode\":\"organizations\",\"QuotaCode\":\"L-E619E033\",\"NextToken\":\"MQ\"}")+ .when()+ .post("/")+ .then()+ .statusCode(400)+ .body("__type", equalTo("InvalidPaginationTokenException"));+ }++ @Test+ void listRequestedQuotaHistoryByQuotaRejectsUnknownQuota() {+ given()+ .contentType(CONTENT_TYPE)+ .header("X-Amz-Target", "ServiceQuotasV20190624.ListRequestedServiceQuotaChangeHistoryByQuota")+ .header("Authorization", AUTH_HEADER)+ .body("{\"ServiceCode\":\"organizations\",\"QuotaCode\":\"L-DOESNOTEX\"}")+ .when()+ .post("/")+ .then()+ .statusCode(400)+ .body("__type", equalTo("NoSuchResourceException"));+ }++ @Test+ void requestOrganizationsQuotaIncreasePreservesGlobalQuota() {+ given()+ .contentType(CONTENT_TYPE)+ .header("X-Amz-Target", "ServiceQuotasV20190624.RequestServiceQuotaIncrease")+ .header("Authorization", AUTH_HEADER)+ .body("{\"ServiceCode\":\"organizations\",\"QuotaCode\":\"L-E619E033\",\"DesiredValue\":100}")+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("RequestedQuota.ServiceCode", equalTo("organizations"))+ .body("RequestedQuota.QuotaCode", equalTo("L-E619E033"))+ .body("RequestedQuota.GlobalQuota", equalTo(true));+ }+@Testvoid getServiceQuota_unknownQuotaCode_returnsNoSuchResource() {given()