Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(codebuild): honor project listing sort options (#6120)

Aniket Shukla03836d5244c0
diff --git a/docs/services/codebuild.md b/docs/services/codebuild.md
index c5edf0b8b4..735482873c 100644
--- a/docs/services/codebuild.md
+++ b/docs/services/codebuild.md
@@ -21,7 +21,7 @@ Floci implements the CodeBuild API — stored-state management plus real build e
| `UpdateProject` | Partial update — only supplied fields are modified |
| `DeleteProject` | Removes project by name |
| `BatchGetProjects` | Returns found projects and a `projectsNotFound` list |
-| `ListProjects` | Returns all project names in the region |
+| `ListProjects` | Returns project names in the region, with optional name, creation-time, or last-modified-time sorting |
### Build Execution
diff --git a/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildJsonHandler.java
index ecfa0b02db..a18a488757 100644
--- a/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildJsonHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildJsonHandler.java
@@ -38,7 +38,7 @@ public class CodeBuildJsonHandler {
case "UpdateProject" -> updateProject(request, region);
case "DeleteProject" -> deleteProject(request, region);
case "BatchGetProjects" -> batchGetProjects(request, region);
- case "ListProjects" -> listProjects(region);
+ case "ListProjects" -> listProjects(request, region);
case "CreateReportGroup" -> createReportGroup(request, region, account);
case "UpdateReportGroup" -> updateReportGroup(request, region);
case "DeleteReportGroup" -> deleteReportGroup(request, region);
@@ -129,8 +129,9 @@ public class CodeBuildJsonHandler {
return Response.ok(Map.of("projects", found, "projectsNotFound", notFound)).build();
}
- private Response listProjects(String region) {
- List<String> names = service.listProjects(region);
+ private Response listProjects(JsonNode req, String region) {
+ List<String> names = service.listProjects(region,
+ req.path("sortBy").asText(null), req.path("sortOrder").asText(null));
return Response.ok(Map.of("projects", names)).build();
}
diff --git a/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildService.java b/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildService.java
index ecb38ca9a7..53764ef55c 100644
--- a/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/codebuild/CodeBuildService.java
@@ -20,6 +20,7 @@ import jakarta.inject.Inject;
import java.time.Instant;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -249,6 +250,30 @@ public class CodeBuildService {
return new ArrayList<>(projectsFor(region).keySet());
}
+ public List<String> listProjects(String region, String sortBy, String sortOrder) {
+ if (sortBy == null && sortOrder == null) {
+ return listProjects(region);
+ }
+ Comparator<Project> comparator = switch (sortBy == null ? "NAME" : sortBy) {
+ case "NAME" -> Comparator.comparing(Project::getName);
+ case "CREATED_TIME" -> Comparator.comparing(Project::getCreated,
+ Comparator.nullsFirst(Comparator.naturalOrder()));
+ case "LAST_MODIFIED_TIME" -> Comparator.comparing(Project::getLastModified,
+ Comparator.nullsFirst(Comparator.naturalOrder()));
+ default -> throw new AwsException("InvalidInputException", "Invalid sortBy: " + sortBy, 400);
+ };
+ if (sortOrder != null && !"ASCENDING".equals(sortOrder) && !"DESCENDING".equals(sortOrder)) {
+ throw new AwsException("InvalidInputException", "Invalid sortOrder: " + sortOrder, 400);
+ }
+ if ("DESCENDING".equals(sortOrder)) {
+ comparator = comparator.reversed();
+ }
+ return projectsFor(region).values().stream()
+ .sorted(comparator.thenComparing(Project::getName))
+ .map(Project::getName)
+ .toList();
+ }
+
// ---- Report Groups ----
public ReportGroup createReportGroup(String region, String account,
diff --git a/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildIntegrationTest.java
index ad181bb636..f0b2c5e281 100644
--- a/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildIntegrationTest.java
@@ -8,8 +8,11 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import java.util.List;
+
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@QuarkusTest
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@@ -312,4 +315,53 @@ class CodeBuildIntegrationTest {
.statusCode(400)
.body("__type", containsString("ResourceNotFoundException"));
}
+
+ @Test
+ @Order(14)
+ void listProjectsHonorsSortOptionsOverTheWire() {
+ List<String> names = List.of("sort-project-zeta", "sort-project-alpha", "sort-project-mu");
+ try {
+ for (String name : names) {
+ given().header("X-Amz-Target", "CodeBuild_20161006.CreateProject")
+ .contentType(CONTENT_TYPE)
+ .body("""
+ {"name":"%s","source":{"type":"NO_SOURCE"},
+ "artifacts":{"type":"NO_ARTIFACTS"},
+ "environment":{"type":"LINUX_CONTAINER","image":"unused",
+ "computeType":"BUILD_GENERAL1_SMALL"},
+ "serviceRole":"arn:aws:iam::000000000000:role/codebuild-role"}
+ """.formatted(name))
+ .post("/").then().statusCode(200);
+ }
+ for (String direction : List.of("ASCENDING", "DESCENDING")) {
+ List<String> expected = List.of("sort-project-alpha", "sort-project-mu", "sort-project-zeta");
+ if ("DESCENDING".equals(direction)) {
+ expected = expected.reversed();
+ }
+ List<String> projects = given()
+ .header("X-Amz-Target", "CodeBuild_20161006.ListProjects")
+ .contentType(CONTENT_TYPE)
+ .body("{\"sortBy\":\"NAME\",\"sortOrder\":\"" + direction + "\"}")
+ .post("/").then().statusCode(200)
+ .extract().jsonPath().getList("projects", String.class);
+ assertEquals(expected,
+ projects.stream().filter(names::contains).toList());
+ }
+ } finally {
+ for (String name : names) {
+ given().header("X-Amz-Target", "CodeBuild_20161006.DeleteProject")
+ .contentType(CONTENT_TYPE).body("{\"name\":\"" + name + "\"}")
+ .post("/");
+ }
+ }
+ }
+
+ @Test
+ @Order(15)
+ void listProjectsRejectsInvalidSortOptionsOverTheWire() {
+ given().header("X-Amz-Target", "CodeBuild_20161006.ListProjects")
+ .contentType(CONTENT_TYPE).body("{\"sortOrder\":\"UNKNOWN\"}")
+ .post("/").then().statusCode(400)
+ .body("__type", containsString("InvalidInputException"));
+ }
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildListProjectsTest.java b/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildListProjectsTest.java
new file mode 100644
index 0000000000..82042ddd0c
--- /dev/null
+++ b/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildListProjectsTest.java
@@ -0,0 +1,99 @@
+package io.github.hectorvent.floci.services.codebuild;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.github.hectorvent.floci.config.EmulatorConfig;
+import io.github.hectorvent.floci.core.common.AwsException;
+import io.github.hectorvent.floci.services.codebuild.model.Project;
+import io.github.hectorvent.floci.services.codebuild.model.ProjectArtifacts;
+import io.github.hectorvent.floci.services.codebuild.model.ProjectEnvironment;
+import io.github.hectorvent.floci.services.codebuild.model.ProjectSource;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+
+class CodeBuildListProjectsTest {
+
+ private static final String REGION = "us-east-1";
+ private static final String ACCOUNT = "000000000000";
+ private final ObjectMapper mapper = new ObjectMapper();
+ private final CodeBuildService service = new CodeBuildService(
+ mock(CodeBuildRunner.class), mock(EmulatorConfig.class), null);
+ private final CodeBuildJsonHandler handler = new CodeBuildJsonHandler(service, mapper);
+
+ @ParameterizedTest
+ @CsvSource({
+ "NAME, ASCENDING, alpha:mu:zeta",
+ "NAME, DESCENDING, zeta:mu:alpha",
+ "CREATED_TIME, ASCENDING, zeta:alpha:mu",
+ "CREATED_TIME, DESCENDING, mu:alpha:zeta",
+ "LAST_MODIFIED_TIME, ASCENDING, mu:zeta:alpha",
+ "LAST_MODIFIED_TIME, DESCENDING, alpha:zeta:mu"
+ })
+ void sortsByEveryRequestedCriterionAndDirection(String sortBy, String sortOrder, String expected)
+ throws Exception {
+ createProject(REGION, "zeta", 1.0, 2.0);
+ createProject(REGION, "alpha", 2.0, 3.0);
+ createProject(REGION, "mu", 3.0, 1.0);
+ createProject("eu-west-1", "other-region", 0.0, 0.0);
+
+ assertEquals(List.of(expected.split(":")), list(Map.of("sortBy", sortBy, "sortOrder", sortOrder)));
+ }
+
+ @ParameterizedTest
+ @CsvSource({"sortBy, UNKNOWN", "sortBy, name", "sortBy, ''", "sortOrder, UNKNOWN", "sortOrder, ascending"})
+ void rejectsInvalidSortOptionsEvenWhenThereAreNoProjects(String parameter, String value) {
+ AwsException error = assertThrows(AwsException.class, () -> list(Map.of(parameter, value)));
+ assertEquals("InvalidInputException", error.getErrorCode());
+ assertEquals(400, error.getHttpStatus());
+ }
+
+ @Test
+ void retainsUnspecifiedOrderAndHandlesOneSortOption() throws Exception {
+ createProject(REGION, "zeta", 1.0, 2.0);
+ createProject(REGION, "alpha", 2.0, 3.0);
+ assertEquals(service.listProjects(REGION), list(Map.of()));
+ assertEquals(List.of("alpha", "zeta"), list(Map.of("sortBy", "NAME")));
+ assertEquals(List.of("zeta", "alpha"), list(Map.of("sortOrder", "DESCENDING")));
+ }
+
+ @Test
+ void sortsEmptyLists() throws Exception {
+ assertEquals(List.of(), list(Map.of("sortBy", "CREATED_TIME", "sortOrder", "DESCENDING")));
+ }
+
+ @ParameterizedTest
+ @CsvSource({"CREATED_TIME", "LAST_MODIFIED_TIME"})
+ void toleratesMissingTimestampsInStoredProjects(String sortBy) throws Exception {
+ createProject(REGION, "zeta", 1.0, 1.0);
+ createProject(REGION, "alpha", null, null);
+ assertEquals(List.of("alpha", "zeta"), list(Map.of("sortBy", sortBy, "sortOrder", "ASCENDING")));
+ }
+
+ @SuppressWarnings("unchecked")
+ private List<String> list(Map<String, String> request) throws Exception {
+ try (Response response = handler.handle("ListProjects", mapper.valueToTree(request), REGION, ACCOUNT)) {
+ assertEquals(200, response.getStatus());
+ return (List<String>) ((Map<?, ?>) response.getEntity()).get("projects");
+ }
+ }
+
+ private void createProject(String region, String name, Double created, Double modified) {
+ ProjectSource source = new ProjectSource();
+ source.setType("NO_SOURCE");
+ ProjectArtifacts artifacts = new ProjectArtifacts();
+ artifacts.setType("NO_ARTIFACTS");
+ Project project = service.createProject(region, ACCOUNT, name, null, source, null, null,
+ artifacts, null, new ProjectEnvironment(), "arn:aws:iam::000000000000:role/codebuild",
+ null, null, null, null, null, null, null);
+ project.setCreated(created);
+ project.setLastModified(modified);
+ }
+}