Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(codebuild): honor build list sort order (#6125)

Jimmy Liu Jiad2ee9f46a027
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 a18a488757..90277f96d6 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
@@ -50,7 +50,7 @@ public class CodeBuildJsonHandler {
case "ListCuratedEnvironmentImages" -> listCuratedEnvironmentImages();
case "StartBuild" -> startBuild(request, region, account);
case "BatchGetBuilds" -> batchGetBuilds(request, region, account);
- case "ListBuilds" -> listBuilds(region, account);
+ case "ListBuilds" -> listBuilds(request, region, account);
case "ListBuildsForProject" -> listBuildsForProject(request, region, account);
case "StopBuild" -> stopBuild(request, region, account);
case "RetryBuild" -> retryBuild(request, region, account);
@@ -249,13 +249,15 @@ public class CodeBuildJsonHandler {
return Response.ok(Map.of("builds", found, "buildsNotFound", notFound)).build();
}
- private Response listBuilds(String region, String account) {
- return Response.ok(Map.of("ids", service.listBuilds(region, account))).build();
+ private Response listBuilds(JsonNode req, String region, String account) {
+ return Response.ok(Map.of("ids", service.listBuilds(region, account,
+ req.path("sortOrder").asText(null)))).build();
}
private Response listBuildsForProject(JsonNode req, String region, String account) {
String projectName = req.path("projectName").asText(null);
- return Response.ok(Map.of("ids", service.listBuildsForProject(region, account, projectName))).build();
+ return Response.ok(Map.of("ids", service.listBuildsForProject(region, account, projectName,
+ req.path("sortOrder").asText(null)))).build();
}
private Response stopBuild(JsonNode req, String region, String account) {
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 53764ef55c..b2c01ed81d 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
@@ -262,10 +262,7 @@ public class CodeBuildService {
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)) {
+ if (isDescendingSortOrder(sortOrder, false)) {
comparator = comparator.reversed();
}
return projectsFor(region).values().stream()
@@ -522,23 +519,35 @@ public class CodeBuildService {
.collect(Collectors.toList());
}
- public List<String> listBuilds(String region, String account) {
- return buildsFor(account, region).values().stream()
- .sorted((a, b) -> Double.compare(
- b.getStartTime() != null ? b.getStartTime() : 0,
- a.getStartTime() != null ? a.getStartTime() : 0))
- .map(Build::getId)
- .collect(Collectors.toList());
+ public List<String> listBuilds(String region, String account, String sortOrder) {
+ Comparator<String> comparator = Comparator.naturalOrder();
+ if (isDescendingSortOrder(sortOrder, true)) {
+ comparator = comparator.reversed();
+ }
+ return buildsFor(account, region).keySet().stream()
+ .sorted(comparator)
+ .toList();
}
- public List<String> listBuildsForProject(String region, String account, String projectName) {
+ public List<String> listBuildsForProject(String region, String account, String projectName,
+ String sortOrder) {
+ Comparator<Build> comparator = Comparator.comparing(Build::getBuildNumber)
+ .thenComparing(Build::getId);
+ if (isDescendingSortOrder(sortOrder, true)) {
+ comparator = comparator.reversed();
+ }
return buildsFor(account, region).values().stream()
.filter(b -> projectName.equals(b.getProjectName()))
- .sorted((a, b) -> Double.compare(
- b.getStartTime() != null ? b.getStartTime() : 0,
- a.getStartTime() != null ? a.getStartTime() : 0))
+ .sorted(comparator)
.map(Build::getId)
- .collect(Collectors.toList());
+ .toList();
+ }
+
+ private boolean isDescendingSortOrder(String sortOrder, boolean defaultDescending) {
+ if (sortOrder != null && !"ASCENDING".equals(sortOrder) && !"DESCENDING".equals(sortOrder)) {
+ throw new AwsException("InvalidInputException", "Invalid sortOrder: " + sortOrder, 400);
+ }
+ return sortOrder == null ? defaultDescending : "DESCENDING".equals(sortOrder);
}
public void stopBuild(String region, String account, String buildId) {
diff --git a/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildBuildListSortingIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildBuildListSortingIntegrationTest.java
new file mode 100644
index 0000000000..22060d5a22
--- /dev/null
+++ b/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildBuildListSortingIntegrationTest.java
@@ -0,0 +1,127 @@
+package io.github.hectorvent.floci.services.codebuild;
+
+import io.github.hectorvent.floci.services.codebuild.model.Build;
+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 io.github.hectorvent.floci.testing.RestAssuredJsonUtils;
+import io.quarkus.test.InjectMock;
+import io.quarkus.test.junit.QuarkusTest;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.IntStream;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@QuarkusTest
+class CodeBuildBuildListSortingIntegrationTest {
+
+ private static final String CONTENT_TYPE = "application/x-amz-json-1.1";
+ private static final String REGION = "us-east-1";
+ private static final String ACCOUNT = "000000000000";
+
+ @Inject CodeBuildService service;
+ @InjectMock CodeBuildRunner runner;
+
+ private String projectName;
+
+ @BeforeAll
+ static void configureRestAssured() {
+ RestAssuredJsonUtils.configureAwsContentTypes();
+ }
+
+ @BeforeEach
+ void createBuilds() {
+ projectName = "sort-builds-" + UUID.randomUUID();
+ ProjectSource source = new ProjectSource();
+ source.setType("NO_SOURCE");
+ ProjectArtifacts artifacts = new ProjectArtifacts();
+ artifacts.setType("NO_ARTIFACTS");
+ service.createProject(REGION, ACCOUNT, projectName, null, source, null, null,
+ artifacts, null, new ProjectEnvironment(), "arn:aws:iam::000000000000:role/codebuild",
+ null, null, null, null, null, null, null);
+ for (int number = 1; number <= 12; number++) {
+ Build build = service.startBuild(REGION, ACCOUNT, projectName, null,
+ null, null, null, null, null, null);
+ service.getBuild(REGION, ACCOUNT, build.getId()).setStartTime(1000.0 + number);
+ }
+ }
+
+ @AfterEach
+ void deleteProject() {
+ service.deleteProject(REGION, projectName);
+ }
+
+ @Test
+ void listBuildsSortsByBuildIdOverTheWire() {
+ List<String> expected = IntStream.rangeClosed(1, 12)
+ .mapToObj(number -> projectName + ":" + number)
+ .sorted()
+ .toList();
+
+ assertEquals(expected, listBuilds("ASCENDING"));
+ assertEquals(expected.reversed(), listBuilds("DESCENDING"));
+ assertEquals(expected.reversed(), listBuilds(null));
+ }
+
+ @Test
+ void listBuildsForProjectSortsNumericallyOverTheWire() {
+ List<String> expected = IntStream.rangeClosed(1, 12)
+ .mapToObj(number -> projectName + ":" + number)
+ .toList();
+
+ assertEquals(expected, listBuildsForProject("ASCENDING"));
+ assertEquals(expected.reversed(), listBuildsForProject("DESCENDING"));
+ assertEquals(expected.reversed(), listBuildsForProject(null));
+ }
+
+ @Test
+ void invalidSortOrderIsRejectedWithoutChangingBuilds() {
+ List<String> allBuilds = listBuilds("DESCENDING");
+ List<String> projectBuilds = listBuildsForProject("DESCENDING");
+
+ given().header("X-Amz-Target", "CodeBuild_20161006.ListBuilds")
+ .contentType(CONTENT_TYPE).body("{\"sortOrder\":\"UNKNOWN\"}")
+ .post("/").then().statusCode(400)
+ .body("__type", equalTo("InvalidInputException"))
+ .body("message", containsString("Invalid sortOrder"));
+ assertEquals(allBuilds, listBuilds("DESCENDING"));
+ assertEquals(projectBuilds, listBuildsForProject("DESCENDING"));
+
+ given().header("X-Amz-Target", "CodeBuild_20161006.ListBuildsForProject")
+ .contentType(CONTENT_TYPE)
+ .body("{\"projectName\":\"" + projectName + "\",\"sortOrder\":\"UNKNOWN\"}")
+ .post("/").then().statusCode(400)
+ .body("__type", equalTo("InvalidInputException"))
+ .body("message", containsString("Invalid sortOrder"));
+ assertEquals(allBuilds, listBuilds("DESCENDING"));
+ assertEquals(projectBuilds, listBuildsForProject("DESCENDING"));
+ }
+
+ private List<String> listBuilds(String sortOrder) {
+ List<String> ids = given().header("X-Amz-Target", "CodeBuild_20161006.ListBuilds")
+ .contentType(CONTENT_TYPE)
+ .body(sortOrder == null ? "{}" : "{\"sortOrder\":\"" + sortOrder + "\"}")
+ .post("/").then().statusCode(200)
+ .extract().jsonPath().getList("ids", String.class);
+ return ids.stream().filter(id -> id.startsWith(projectName + ":")).toList();
+ }
+
+ private List<String> listBuildsForProject(String sortOrder) {
+ return given().header("X-Amz-Target", "CodeBuild_20161006.ListBuildsForProject")
+ .contentType(CONTENT_TYPE)
+ .body("{\"projectName\":\"" + projectName + "\""
+ + (sortOrder == null ? "" : ",\"sortOrder\":\"" + sortOrder + "\"") + "}")
+ .post("/").then().statusCode(200)
+ .extract().jsonPath().getList("ids", String.class);
+ }
+}
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
index 82042ddd0c..5836f4e22d 100644
--- a/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildListProjectsTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/codebuild/CodeBuildListProjectsTest.java
@@ -53,6 +53,7 @@ class CodeBuildListProjectsTest {
AwsException error = assertThrows(AwsException.class, () -> list(Map.of(parameter, value)));
assertEquals("InvalidInputException", error.getErrorCode());
assertEquals(400, error.getHttpStatus());
+ assertEquals("Invalid " + parameter + ": " + value, error.getMessage());
}
@Test
@@ -61,6 +62,7 @@ class CodeBuildListProjectsTest {
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("alpha", "zeta"), list(Map.of("sortOrder", "ASCENDING")));
assertEquals(List.of("zeta", "alpha"), list(Map.of("sortOrder", "DESCENDING")));
}