Light, fluffy, and always free - The AWS Local Emulator alternative
fix(ecr): forward every Accept header to the backing registry (#5069)
Matheus Oliveira32f01ba13d4d
diff --git a/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlane.java b/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlane.javaindex 3d7bde18e7..d6093d20fb 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlane.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlane.java@@ -171,7 +171,7 @@ public class EcrRegistryDataPlane {context.request().headers().forEach(header -> {if (!HOP_BY_HOP_HEADERS.contains(header.getKey().toLowerCase())&& !"host".equalsIgnoreCase(header.getKey())) {- upstream.putHeader(header.getKey(), header.getValue());+ upstream.headers().add(header.getKey(), header.getValue());}});if (context.request().getHeader("Content-Length") == nulldiff --git a/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlaneTest.java b/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlaneTest.javaindex 0b74aaa391..9305cf9e6d 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlaneTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryDataPlaneTest.java@@ -16,6 +16,7 @@ import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import org.mockito.Mockito;+import java.util.List;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;@@ -313,6 +314,63 @@ class EcrRegistryDataPlaneTest {}}+ @Test+ void repeatedAcceptHeadersAllReachTheRegistry() throws Exception {+ AtomicReference<List<String>> received = new AtomicReference<>();+ HttpServer registry = vertx.createHttpServer()+ .requestHandler(request -> {+ received.set(request.headers().getAll("Accept"));+ request.response().setStatusCode(200).end();+ })+ .listen(0, "127.0.0.1")+ .toCompletionStage().toCompletableFuture().get(2, TimeUnit.SECONDS);++ HttpServer dataPlane = null;+ try {+ EcrRegistryManager registryManager = Mockito.mock(EcrRegistryManager.class);+ EcrService ecrService = Mockito.mock(EcrService.class);+ EmulatorConfig config = Mockito.mock(EmulatorConfig.class, Mockito.RETURNS_DEEP_STUBS);+ when(config.services().ecr().enabled()).thenReturn(true);+ when(config.services().ecr().uriStyle()).thenReturn("hostname");+ when(registryManager.httpClient())+ .thenReturn(new RegistryHttpClient("http://127.0.0.1:" + registry.actualPort()));+ when(ecrService.registryRepositoryName("platform/api", "000000000000", "us-east-1"))+ .thenReturn("legacy/platform-api");++ Router router = Router.router(vertx);+ new EcrRegistryDataPlane(registryManager, ecrService, config, vertx).register(router);+ dataPlane = vertx.createHttpServer().requestHandler(router)+ .listen(0, "127.0.0.1")+ .toCompletionStage().toCompletableFuture().get(2, TimeUnit.SECONDS);++ List<String> sent = List.of(+ "application/vnd.docker.distribution.manifest.v2+json",+ "application/vnd.docker.distribution.manifest.list.v2+json",+ "application/vnd.oci.image.manifest.v1+json",+ "application/vnd.oci.image.index.v1+json");+ int status = vertx.createHttpClient().request(new RequestOptions()+ .setHost("127.0.0.1")+ .setPort(dataPlane.actualPort())+ .setMethod(HttpMethod.GET)+ .setURI("/v2/platform/api/manifests/v1"))+ .compose(request -> {+ request.putHeader("Host", "000000000000.dkr.ecr.us-east-1.localhost:4566");+ sent.forEach(mediaType -> request.headers().add("Accept", mediaType));+ return request.send();+ })+ .map(response -> response.statusCode())+ .toCompletionStage().toCompletableFuture().get(2, TimeUnit.SECONDS);++ assertEquals(200, status);+ assertEquals(sent, received.get());+ } finally {+ if (dataPlane != null) {+ dataPlane.close().toCompletionStage().toCompletableFuture().get(2, TimeUnit.SECONDS);+ }+ registry.close().toCompletionStage().toCompletableFuture().get(2, TimeUnit.SECONDS);+ }+ }+private record ManifestResponse(int statusCode, String body) {}