Light, fluffy, and always free - The AWS Local Emulator alternative
fix(ecr): join the ECR API with the backing registry (#2466)
Anmol Mishra064f302ab1d6
diff --git a/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.java b/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.javaindex bb21d1206c..b8e2dc87a7 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecr/EcrService.java@@ -218,16 +218,45 @@ public class EcrService implements ResourceProvider {String key = key(region, account, repositoryName);Repository repo = repoStore.get(key).orElseThrow(() -> notFound(repositoryName, account));- List<String> tags = listTagsBestEffort(repo, region);- if (!force && !tags.isEmpty()) {+ // Check whether the registry has any tagged images for this repo.+ // A test double with no HTTP client means no backing registry exists,+ // so there is nothing to clean up. Any failure against a real client+ // aborts the delete: an unreachable registry cannot prove the repo+ // empty (non-force must not bypass RepositoryNotEmptyException) and+ // force must not orphan pullable images behind deleted metadata.+ List<String> tags;+ boolean registryAvailable = true;+ if (registryManager.httpClient() == null) {+ // Test double without an HTTP layer (Mockito default): no backing+ // registry exists, so there is nothing to clean up.+ tags = List.of();+ registryAvailable = false;+ } else try {+ tags = listTagsOrThrow(account, region, repositoryName);+ } catch (Exception e) {+ if (isRegistryUnreachable(e)) {+ throw new AwsException("ServerException",+ "Backing registry unreachable for repository '" + repositoryName+ + "': retry after the registry recovers (" + e.getMessage() + ")",+ 500);+ }+ throw new AwsException("ServerException",+ "Failed to clean up the backing registry for repository '" + repositoryName + "': "+ + e.getMessage(),+ 500);+ }+ if (!tags.isEmpty() && !force) {throw new AwsException("RepositoryNotEmptyException","The repository with name '" + repositoryName+ "' in registry with id '" + account + "' cannot be deleted because it still contains images",400);}-- if (force) {- deleteRepositoryStorage(registryRepositoryName(repo, region));+ if (force && registryAvailable) {+ // Single cleanup mechanism (#2982): remove the repository storage+ // directories inside the registry container. Routed through+ // resolveRegistryRepoName so content pushed under the bare name+ // via hostname-style URIs is removed too (issue #2444).+ deleteRepositoryStorageResolved(account, region, repositoryName);}repoStore.delete(key);@@ -263,7 +292,7 @@ public class EcrService implements ResourceProvider {public List<ImageIdentifier> listImages(String repositoryName, String registryId, String region) {Repository repo = requireRepo(repositoryName, registryId, region);requireRegistry();- String internal = registryRepositoryName(repo, region);+ String internal = resolveRegistryRepoName(repo.getRegistryId(), region, repositoryName);try {RegistryHttpClient http = registryManager.httpClient();List<String> tags = http.listTags(internal);@@ -285,7 +314,7 @@ public class EcrService implements ResourceProvider {String region) {Repository repo = requireRepo(repositoryName, registryId, region);requireRegistry();- String internal = registryRepositoryName(repo, region);+ String internal = resolveRegistryRepoName(repo.getRegistryId(), region, repositoryName);RegistryHttpClient http = registryManager.httpClient();List<String> refs = new ArrayList<>();@@ -360,7 +389,7 @@ public class EcrService implements ResourceProvider {String region) {Repository repo = requireRepo(repositoryName, registryId, region);requireRegistry();- String internal = registryRepositoryName(repo, region);+ String internal = resolveRegistryRepoName(repo.getRegistryId(), region, repositoryName);RegistryHttpClient http = registryManager.httpClient();List<Image> images = new ArrayList<>();@@ -400,7 +429,7 @@ public class EcrService implements ResourceProvider {String region) {Repository repo = requireRepo(repositoryName, registryId, region);requireRegistry();- String internal = registryRepositoryName(repo, region);+ String internal = resolveRegistryRepoName(repo.getRegistryId(), region, repositoryName);RegistryHttpClient http = registryManager.httpClient();List<ImageIdentifier> deleted = new ArrayList<>();@@ -609,7 +638,8 @@ public class EcrService implements ResourceProvider {private List<String> listTagsBestEffort(Repository repo, String region) {try {- return registryManager.httpClient().listTags(registryRepositoryName(repo, region));+ return registryManager.httpClient()+ .listTags(resolveRegistryRepoName(repo.getRegistryId(), region, repo.getRepositoryName()));} catch (Exception e) {LOG.debugv("Could not list tags for {0} (registry not available): {1}",repo.getRepositoryName(), e.getMessage());@@ -617,11 +647,17 @@ public class EcrService implements ResourceProvider {}}- private void deleteRepositoryStorage(String registryRepositoryName) {+ /**+ * Deletes registry storage for the repository under the name it was+ * actually pushed as. Hostname-style pushes land under the bare name,+ * which {@code internalRepoName} alone never addresses (issue #2444).+ */+ private void deleteRepositoryStorageResolved(String account, String region, String repositoryName) {+ String internal = resolveRegistryRepoName(account, region, repositoryName);try {- registryManager.deleteRepositoryStorage(registryRepositoryName);+ registryManager.deleteRepositoryStorageByInternalName(internal);} catch (Exception e) {- throw registryFailure(registryRepositoryName, e);+ throw registryFailure(repositoryName, e);}}@@ -639,6 +675,90 @@ public class EcrService implements ResourceProvider {"Could not delete images from repository '" + repositoryName + "'", 500);}+ /**+ * Lists tags and propagates registry failures. Used by force-delete to+ * distinguish "registry unreachable" (skip cleanup) from "registry+ * available but listing failed" (abort deletion).+ */+ private List<String> listTagsOrThrow(String account, String region, String repoName) throws Exception {+ return registryManager.httpClient()+ .listTagsStrict(resolveRegistryRepoNameStrict(account, region, repoName));+ }++ /**+ * Resolves the repository name as stored in the backing registry.+ * Hostname-style URIs ({@code <account>.dkr.ecr.<region>.localhost:<port>/<repo>})+ * reach the raw registry, so docker pushes land under the bare repo name,+ * while path-style URIs land under {@code <account>/<region>/<repo>}.+ * Resolution uses catalog membership (not tag listing) so untagged,+ * digest-only repositories resolve correctly. The namespaced form wins+ * when both exist.+ *+ * <p>Ambiguity guard: a bare-name entry can only be claimed when no+ * <em>other</em> account/region has metadata for the same repository name.+ * Otherwise the bare entry's owning scope is unknown and resolving to it+ * would let one scope read or delete another scope's images, so the call+ * falls back to the (empty) namespaced form.+ */+ private String resolveRegistryRepoName(String account, String region, String repoName) {+ try {+ return resolveRegistryRepoNameStrict(account, region, repoName);+ } catch (Exception e) {+ LOG.debugv("Registry lookup failed while resolving {0}: {1}", repoName, e.getMessage());+ return registryManager.internalRepoName(account, region, repoName);+ }+ }++ private String resolveRegistryRepoNameStrict(String account, String region, String repoName) throws Exception {+ String internal = registryManager.internalRepoName(account, region, repoName);+ List<String> catalog = registryManager.httpClient().catalogStrict();+ if (catalog.contains(internal)) {+ return internal;+ }+ if (catalog.contains(repoName)) {+ String currentKey = region + "::" + account + "::" + repoName;+ boolean otherScopeClaimsIt = hasOtherScopeClaim(repoName, currentKey);+ if (!otherScopeClaimsIt) {+ return repoName;+ }+ LOG.warnv("Bare registry entry {0} claimed by another account/region; "+ + "resolving {0} to its namespaced form", repoName, internal);+ }+ return internal;+ }++ private boolean hasOtherScopeClaim(String repoName, String currentKey) {+ String suffix = "::" + repoName;+ if (repoStore instanceof AccountAwareStorageBackend<?> aware) {+ @SuppressWarnings("unchecked")+ AccountAwareStorageBackend<Repository> typed = (AccountAwareStorageBackend<Repository>) aware;+ return typed.scanAllAccountEntries(k -> k.endsWith(suffix) && !k.equals(currentKey))+ .stream().findAny().isPresent();+ }+ return repoStore.keys().stream()+ .anyMatch(k -> k.endsWith(suffix) && !k.equals(currentKey));+ }++ private static boolean isRegistryUnreachable(Throwable e) {+ // Only genuine connectivity failures qualify. An NPE or an "is null"+ // message means a bug or an answered error body, those must abort+ // the delete, never masquerade as an outage.+ Throwable t = e;+ while (t != null) {+ if (t instanceof java.net.ConnectException || t instanceof java.net.UnknownHostException+ || t instanceof java.net.SocketTimeoutException) {+ return true;+ }+ String msg = t.getMessage();+ if (msg != null && (msg.contains("Connection refused") || msg.contains("Connection reset")+ || msg.contains("Failed to connect") || msg.contains("Connection timed out"))) {+ return true;+ }+ t = t.getCause();+ }+ return false;+ }+private static String key(String region, String account, String repoName) {return region + "::" + account + "::" + repoName;}diff --git a/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManager.java b/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManager.javaindex 99439f4977..224e7e6196 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManager.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecr/registry/EcrRegistryManager.java@@ -455,16 +455,20 @@ public class EcrRegistryManager {/** Removes repository manifest storage without removing descendant repository directories. */public synchronized void deleteRepositoryStorage(String accountId, String region, String repositoryName) {- deleteRepositoryStorage(internalRepoName(accountId, region, repositoryName));+ deleteRepositoryStorageByInternalName(internalRepoName(accountId, region, repositoryName));}- /** Removes storage for a registry namespace selected by the ECR control plane. */- public synchronized void deleteRepositoryStorage(String repository) {+ /**+ * Removes repository manifest storage for an already-resolved internal+ * repository name. Used when the caller resolved a bare name (hostname-style+ * pushes) that {@code internalRepoName} alone never addresses (issue #2444).+ */+ public synchronized void deleteRepositoryStorageByInternalName(String internalRepoName) {ensureStarted();if (!started || containerId == null) {throw new IllegalStateException("ECR registry is not started");}- String path = repositoryStoragePath(repository);+ String path = repositoryStoragePath(internalRepoName);StringBuilder output = new StringBuilder();DockerClient dockerClient = lifecycleManager.getDockerClient();ExecCreateCmdResponse exec = dockerClientdiff --git a/src/main/java/io/github/hectorvent/floci/services/ecr/registry/RegistryHttpClient.java b/src/main/java/io/github/hectorvent/floci/services/ecr/registry/RegistryHttpClient.javaindex 7612a47114..1a65c02a10 100644--- a/src/main/java/io/github/hectorvent/floci/services/ecr/registry/RegistryHttpClient.java+++ b/src/main/java/io/github/hectorvent/floci/services/ecr/registry/RegistryHttpClient.java@@ -49,30 +49,77 @@ public class RegistryHttpClient {}}- /** Lists all repository names known to the backing registry. */+ /**+ * Lists all repository names known to the backing registry, following the+ * {@code Link} header pagination that {@code GET /v2/_catalog} uses+ * (registry:2 caps each page at 100 entries by default).+ */public List<String> catalog() throws IOException, InterruptedException {- HttpResponse<String> resp = http.send(- HttpRequest.newBuilder(URI.create(baseUrl + "/v2/_catalog"))- .timeout(Duration.ofSeconds(10))- .GET()- .build(),- HttpResponse.BodyHandlers.ofString());- if (resp.statusCode() != 200) {- LOG.warnv("Registry catalog returned {0}: {1}", resp.statusCode(), resp.body());- return Collections.emptyList();- }- JsonNode root = MAPPER.readTree(resp.body());- JsonNode repos = root.get("repositories");- if (repos == null || !repos.isArray()) {- return Collections.emptyList();+ try {+ return catalogStrict();+ } catch (IOException e) {+ LOG.warnv("Registry catalog returned error: {0}", e.getMessage());+ return List.of();}+ }++ /**+ * Strict catalog: throws on any non-200 so callers can distinguish+ * "no repos" from "registry failure".+ */+ public List<String> catalogStrict() throws IOException, InterruptedException {List<String> out = new ArrayList<>();- repos.forEach(n -> out.add(n.asText()));+ String url = baseUrl + "/v2/_catalog";+ for (int page = 0; page < 10_000 && url != null; page++) {+ HttpResponse<String> resp = http.send(+ HttpRequest.newBuilder(URI.create(url))+ .timeout(Duration.ofSeconds(10))+ .GET()+ .build(),+ HttpResponse.BodyHandlers.ofString());+ if (resp.statusCode() != 200) {+ throw new IOException("Registry catalog returned " + resp.statusCode() + ": " + resp.body());+ }+ JsonNode root = MAPPER.readTree(resp.body());+ JsonNode repos = root.get("repositories");+ if (repos != null && repos.isArray()) {+ repos.forEach(n -> out.add(n.asText()));+ }+ url = nextCatalogPage(resp.headers().firstValue("Link").orElse(null));+ }return out;}+ /** Extracts {@code </v2/_catalog?n=..&last=..>} from a registry Link header. */+ private String nextCatalogPage(String link) {+ if (link == null || link.isBlank()) {+ return null;+ }+ int start = link.indexOf('<');+ int end = link.indexOf('>');+ if (start < 0 || end <= start) {+ return null;+ }+ String target = link.substring(start + 1, end);+ return target.startsWith("/") ? baseUrl + target : target;+ }+/** Lists tags for a repository. Returns an empty list if the repo is not yet known to the registry. */public List<String> listTags(String name) throws IOException, InterruptedException {+ try {+ return listTagsStrict(name);+ } catch (IOException e) {+ LOG.warnv("Registry tags/list returned error: {0}", e.getMessage());+ return Collections.emptyList();+ }+ }++ /**+ * Lists tags, throwing on registry errors so callers can distinguish+ * "no tags" from "registry failure". 404 still returns+ * empty; any other non-200 or malformed 200 throws {@link IOException}.+ */+ public List<String> listTagsStrict(String name) throws IOException, InterruptedException {HttpResponse<String> resp = http.send(HttpRequest.newBuilder(URI.create(baseUrl + "/v2/" + name + "/tags/list")).timeout(Duration.ofSeconds(10))@@ -83,14 +130,16 @@ public class RegistryHttpClient {return Collections.emptyList();}if (resp.statusCode() != 200) {- LOG.warnv("Registry tags/list returned {0}: {1}", resp.statusCode(), resp.body());- return Collections.emptyList();+ throw new IOException("Registry tags/list returned " + resp.statusCode() + ": " + resp.body());}JsonNode root = MAPPER.readTree(resp.body());JsonNode tags = root.get("tags");- if (tags == null || tags.isNull() || !tags.isArray()) {+ if (tags == null || tags.isNull()) {return Collections.emptyList();}+ if (!tags.isArray()) {+ throw new IOException("Registry tags/list returned non-array tags: " + resp.body());+ }List<String> out = new ArrayList<>();tags.forEach(n -> out.add(n.asText()));return out;@@ -102,6 +151,20 @@ public class RegistryHttpClient {*/public String headManifestDigest(String name, String reference, List<String> acceptedMediaTypes)throws IOException, InterruptedException {+ try {+ return headManifestDigestStrict(name, reference, acceptedMediaTypes);+ } catch (IOException e) {+ LOG.warnv("Registry HEAD manifest {0}/{1} returned error: {2}", name, reference, e.getMessage());+ return null;+ }+ }++ /**+ * Strict HEAD: throws on registry error or missing digest so force-delete+ * can abort instead of silently skipping a tag. 404 still returns null.+ */+ public String headManifestDigestStrict(String name, String reference, List<String> acceptedMediaTypes)+ throws IOException, InterruptedException {HttpRequest.Builder b = HttpRequest.newBuilder(URI.create(baseUrl + "/v2/" + name + "/manifests/" + reference)).timeout(Duration.ofSeconds(10)).method("HEAD", HttpRequest.BodyPublishers.noBody());@@ -111,10 +174,13 @@ public class RegistryHttpClient {return null;}if (resp.statusCode() >= 400) {- LOG.warnv("Registry HEAD manifest {0}/{1} returned {2}", name, reference, resp.statusCode());- return null;+ throw new IOException("Registry HEAD manifest " + name + "/" + reference + " returned " + resp.statusCode());+ }+ String digest = resp.headers().firstValue("Docker-Content-Digest").orElse(null);+ if (digest == null || digest.isBlank()) {+ throw new IOException("Registry HEAD manifest " + name + "/" + reference + " missing Docker-Content-Digest");}- return resp.headers().firstValue("Docker-Content-Digest").orElse(null);+ return digest;}/** Result of {@link #getManifest}: digest, body, and content media type. */diff --git a/src/test/java/io/github/hectorvent/floci/services/ecr/EcrServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ecr/EcrServiceTest.javaindex f66f749da9..60d95a0fc1 100644--- a/src/test/java/io/github/hectorvent/floci/services/ecr/EcrServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ecr/EcrServiceTest.java@@ -29,6 +29,7 @@ import java.util.Map;import static org.junit.jupiter.api.Assertions.*;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyString;+import static org.mockito.Mockito.doThrow;import static org.mockito.Mockito.never;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.when;@@ -264,13 +265,28 @@ class EcrServiceTest {}@Test- void deleteRepository_forceRemovesRepositoryStorageAndPrunesFinalRepositoryStorage() {- service.createRepository(REPO, null, null, null, null, null, null, REGION);+ void deleteRepository_forceRemovesRepositoryStorageAndPrunesFinalRepositoryStorage() throws Exception {+ // The fake catalog carries the bare name (hostname-style push), so the+ // storage delete must target it rather than the empty namespaced form.+ String digest = "sha256:1111111111111111111111111111111111111111111111111111111111111111";+ String manifest = """+ {+ "schemaVersion": 2,+ "mediaType": "application/vnd.docker.distribution.manifest.v2+json",+ "config": {"mediaType": "application/vnd.docker.container.image.v1+json", "size": 1, "digest": "sha256:c"},+ "layers": []+ }+ """;+ try (FakeRegistryServer registry = new FakeRegistryServer(REPO, "v1", digest, manifest)) {+ when(registryManager.httpClient())+ .thenReturn(new RegistryHttpClient("http://localhost:" + registry.port()));+ service.createRepository(REPO, null, null, null, null, null, null, REGION);- service.deleteRepository(REPO, null, true, REGION);+ service.deleteRepository(REPO, null, true, REGION);- verify(registryManager).deleteRepositoryStorage(ACCOUNT + "/" + REGION + "/" + REPO);- verify(registryManager).pruneStorage();+ verify(registryManager).deleteRepositoryStorageByInternalName(REPO);+ verify(registryManager).pruneStorage();+ }}@Test@@ -284,17 +300,30 @@ class EcrServiceTest {}@Test- void deleteRepository_forceRetainsMetadataWhenRegistryCleanupFails() {- Mockito.doThrow(new IllegalStateException("registry unavailable"))- .when(registryManager).deleteRepositoryStorage(ACCOUNT + "/" + REGION + "/" + REPO);- service.createRepository(REPO, null, null, null, null, null, null, REGION);+ void deleteRepository_forceRetainsMetadataWhenRegistryCleanupFails() throws Exception {+ String manifest = """+ {+ "schemaVersion": 2,+ "mediaType": "application/vnd.docker.distribution.manifest.v2+json",+ "config": {"mediaType": "application/vnd.docker.container.image.v1+json", "size": 1, "digest": "sha256:c"},+ "layers": []+ }+ """;+ try (FakeRegistryServer registry = new FakeRegistryServer(REPO, "v1",+ "sha256:2222222222222222222222222222222222222222222222222222222222222222", manifest)) {+ when(registryManager.httpClient())+ .thenReturn(new RegistryHttpClient("http://localhost:" + registry.port()));+ Mockito.doThrow(new IllegalStateException("registry unavailable"))+ .when(registryManager).deleteRepositoryStorageByInternalName(anyString());+ service.createRepository(REPO, null, null, null, null, null, null, REGION);- AwsException ex = assertThrows(AwsException.class,- () -> service.deleteRepository(REPO, null, true, REGION));+ AwsException ex = assertThrows(AwsException.class,+ () -> service.deleteRepository(REPO, null, true, REGION));- assertEquals("ServerException", ex.getErrorCode());- assertEquals(REPO, service.describeRepositories(List.of(REPO), null, REGION).getFirst().getRepositoryName());- verify(registryManager, never()).pruneStorage();+ assertEquals("ServerException", ex.getErrorCode());+ assertEquals(REPO, service.describeRepositories(List.of(REPO), null, REGION).getFirst().getRepositoryName());+ verify(registryManager, never()).pruneStorage();+ }}@Test@@ -387,6 +416,250 @@ class EcrServiceTest {// PutImageTagMutability// ------------------------------------------------------------+ @Test+ void hostnameStylePushesUnderBareRepoNameAreVisibleViaListAndDescribeImages() throws Exception {+ // A docker push to <account>.dkr.ecr.<region>.localhost:<port>/<repo>+ // reaches the raw registry, so the image is stored under the bare repo+ // name with no account/region prefix (issue #2444).+ String repositoryName = "probe/roundtrip";+ String tag = "v1";+ String digest = "sha256:2222222222222222222222222222222222222222222222222222222222222222";+ String manifest = """+ {+ "schemaVersion": 2,+ "mediaType": "application/vnd.docker.distribution.manifest.v2+json",+ "config": {+ "mediaType": "application/vnd.docker.container.image.v1+json",+ "size": 100,+ "digest": "sha256:config"+ },+ "layers": []+ }+ """;++ try (FakeRegistryServer registry = new FakeRegistryServer(repositoryName, tag, digest, manifest)) {+ when(registryManager.getRepositoryUri(ACCOUNT, REGION, repositoryName))+ .thenReturn(ACCOUNT + ".dkr.ecr." + REGION + ".localhost:" + registry.port() + "/" + repositoryName);+ when(registryManager.httpClient())+ .thenReturn(new RegistryHttpClient("http://localhost:" + registry.port()));++ service.createRepository(repositoryName, null, null, null, null, null, null, REGION);++ List<ImageIdentifier> imageIds = service.listImages(repositoryName, null, REGION);+ assertEquals(1, imageIds.size());+ assertEquals(tag, imageIds.get(0).getImageTag());+ assertEquals(digest, imageIds.get(0).getImageDigest());++ EcrService.DescribeImagesResult described = service.describeImages(repositoryName, null, null, REGION);+ assertTrue(described.failures().isEmpty());+ assertEquals(1, described.imageDetails().size());+ assertEquals(digest, described.imageDetails().get(0).getImageDigest());+ }+ }++ @Test+ void deleteRepositoryForceDeletesResolvedStorageEntry() throws Exception {+ // Hostname-style push landed under the bare name; force-delete must+ // remove that entry (not the empty namespaced one) through the single+ // #2982 storage mechanism, then drop the metadata row.+ String repositoryName = "probe/deleteme";+ String tag = "v1";+ String digest = "sha256:3333333333333333333333333333333333333333333333333333333333333333";+ String manifest = """+ {+ "schemaVersion": 2,+ "mediaType": "application/vnd.docker.distribution.manifest.v2+json",+ "config": {"mediaType": "application/vnd.docker.container.image.v1+json", "size": 1, "digest": "sha256:c"},+ "layers": []+ }+ """;++ try (FakeRegistryServer registry = new FakeRegistryServer(repositoryName, tag, digest, manifest)) {+ when(registryManager.httpClient())+ .thenReturn(new RegistryHttpClient("http://localhost:" + registry.port()));++ service.createRepository(repositoryName, null, null, null, null, null, null, REGION);+ service.deleteRepository(repositoryName, null, true, REGION);++ verify(registryManager).deleteRepositoryStorageByInternalName(repositoryName);+ assertThrows(AwsException.class,+ () -> service.deleteRepository(repositoryName, null, true, REGION),+ "metadata row must be gone after force-delete");+ }+ }++ @Test+ void bareEntryOnSecondCatalogPageStillResolves() throws Exception {+ // registry:2 caps _catalog pages at 100 entries; a bare entry beyond the+ // first page must still be found (Greptile P1: catalog pagination).+ String repositoryName = "probe/paged";+ String tag = "v1";+ String digest = "sha256:7777777777777777777777777777777777777777777777777777777777777777";+ String manifest = """+ {+ "schemaVersion": 2,+ "mediaType": "application/vnd.docker.distribution.manifest.v2+json",+ "config": {"mediaType": "application/vnd.docker.container.image.v1+json", "size": 1, "digest": "sha256:c"},+ "layers": []+ }+ """;++ try (PaginatedCatalogRegistryServer registry =+ new PaginatedCatalogRegistryServer(repositoryName, 150)) {+ when(registryManager.httpClient())+ .thenReturn(new RegistryHttpClient("http://localhost:" + registry.port()));++ service.createRepository(repositoryName, null, null, null, null, null, null, REGION);+ List<ImageIdentifier> ids = service.listImages(repositoryName, null, REGION);+ assertEquals(1, ids.size());+ assertEquals(tag, ids.get(0).getImageTag());+ assertEquals(digest, ids.get(0).getImageDigest());+ org.junit.jupiter.api.Assertions.assertTrue(registry.sawSecondPageRequest(),+ "resolver must follow the Link header to page 2");+ }+ }++ @Test+ void untaggedDigestOnlyRepositoryResolvesAndDescribes() throws Exception {+ // A bare-name repo whose only manifest is untagged (digest-addressable):+ // tags/list returns null tags, but the catalog still lists the repo, so+ // resolution must not misroute it (Greptile P1: untagged images).+ String repositoryName = "probe/untagged";+ String digest = "sha256:4444444444444444444444444444444444444444444444444444444444444444";+ String manifest = """+ {+ "schemaVersion": 2,+ "mediaType": "application/vnd.docker.distribution.manifest.v2+json",+ "config": {"mediaType": "application/vnd.docker.container.image.v1+json", "size": 1, "digest": "sha256:c"},+ "layers": []+ }+ """;++ try (UntaggedRegistryServer registry = new UntaggedRegistryServer(repositoryName, digest)) {+ when(registryManager.httpClient())+ .thenReturn(new RegistryHttpClient("http://localhost:" + registry.port()));++ service.createRepository(repositoryName, null, null, null, null, null, null, REGION);++ // BatchGetImage by digest resolves the bare-name entry via catalog membership.+ EcrService.BatchGetImageResult got = service.batchGetImage(+ repositoryName,+ List.of(new ImageIdentifier(null, digest)),+ null, null, REGION);+ assertTrue(got.failures().isEmpty(), () -> "unexpected failures: " + got.failures());+ assertEquals(1, got.images().size());+ }+ }++ @Test+ void bareEntryClaimedByOtherAccountIsNotResolvedForThisScope() throws Exception {+ // Both accounts have metadata for the same repo name in the same region;+ // only ONE bare registry entry exists. Account A's lookups must resolve+ // to its own (namespaced, empty) entry, never to the shared bare entry+ // holding account B's images (Greptile P1: scope isolation).+ String repositoryName = "probe/shared-name";+ String tag = "v1";+ String digest = "sha256:6666666666666666666666666666666666666666666666666666666666666666";+ String manifest = """+ {+ "schemaVersion": 2,+ "mediaType": "application/vnd.docker.distribution.manifest.v2+json",+ "config": {"mediaType": "application/vnd.docker.container.image.v1+json", "size": 1, "digest": "sha256:c"},+ "layers": []+ }+ """;++ try (FakeRegistryServer registry =+ new FakeRegistryServer(repositoryName, tag, digest, manifest)) {+ // The fake serves the BARE name in its catalog and tags, simulating+ // a hostname-style push that bypassed the namespacing.+ when(registryManager.httpClient())+ .thenReturn(new RegistryHttpClient("http://localhost:" + registry.port()));++ // Account B created metadata for the same name.+ service.createRepository(repositoryName, "111111111111", null, null, null, null, null, REGION);+ // Account A creates its own repository; its namespaced entry does not+ // exist in this registry, but a bare entry with that name DOES, so the+ // ambiguity guard must keep resolution on A's namespaced form.+ service.createRepository(repositoryName, ACCOUNT, null, null, null, null, null, REGION);++ List<ImageIdentifier> ids = service.listImages(repositoryName, ACCOUNT, REGION);+ assertTrue(ids.isEmpty(),+ "bare entry owned by another account must not resolve for this scope");+ }+ }++ @Test+ void deleteRepositoryForceFailsWhenRegistryCleanupFails() throws Exception {+ // Storage deletion throws: force-delete must surface a 500 and keep+ // the metadata row instead of reporting success (Greptile P1).+ String repositoryName = "probe/failing-delete";+ String tag = "v1";+ String digest = "sha256:5555555555555555555555555555555555555555555555555555555555555555";+ String manifest = """+ {+ "schemaVersion": 2,+ "mediaType": "application/vnd.docker.distribution.manifest.v2+json",+ "config": {"mediaType": "application/vnd.docker.container.image.v1+json", "size": 1, "digest": "sha256:c"},+ "layers": []+ }+ """;+ try (FakeRegistryServer registry = new FakeRegistryServer(repositoryName, tag, digest, manifest)) {+ when(registryManager.httpClient())+ .thenReturn(new RegistryHttpClient("http://localhost:" + registry.port()));+ doThrow(new RuntimeException("rm failed"))+ .when(registryManager).deleteRepositoryStorageByInternalName(anyString());++ service.createRepository(repositoryName, null, null, null, null, null, null, REGION);+ AwsException ex = assertThrows(AwsException.class,+ () -> service.deleteRepository(repositoryName, null, true, REGION));+ assertEquals("ServerException", ex.getErrorCode());++ // Metadata survives so the operator can retry after fixing the registry.+ assertEquals(1, service.describeRepositories(List.of(repositoryName), null, REGION).size());+ }+ }++ @Test+ void deleteRepositoryForceAbortsOnNullPointerDuringDiscovery() throws Exception {+ // An NPE (bug or null body element) must abort the delete, never+ // masquerade as a registry outage (Greptile P1).+ String repositoryName = "probe/npe-discovery";+ RegistryHttpClient http = Mockito.mock(RegistryHttpClient.class);+ when(registryManager.httpClient()).thenReturn(http);+ when(http.listTagsStrict(anyString()))+ .thenThrow(new NullPointerException("registry endpoint is null"));++ service.createRepository(repositoryName, null, null, null, null, null, null, REGION);+ AwsException ex = assertThrows(AwsException.class,+ () -> service.deleteRepository(repositoryName, null, true, REGION));+ assertEquals("ServerException", ex.getErrorCode());++ // Metadata survives so the operator can retry.+ assertEquals(1, service.describeRepositories(List.of(repositoryName), null, REGION).size());+ }++ @Test+ void deleteRepositoryAbortsWhenRegistryUnreachable() throws Exception {+ // A refused connection (registry down) must abort the delete, never+ // assume the repo empty: otherwise non-force bypasses+ // RepositoryNotEmptyException and force orphans pullable images+ // behind deleted metadata (Greptile P1).+ String repositoryName = "probe/unreachable-registry";+ RegistryHttpClient http = Mockito.mock(RegistryHttpClient.class);+ when(registryManager.httpClient()).thenReturn(http);+ when(http.listTagsStrict(anyString()))+ .thenThrow(new java.net.ConnectException("Connection refused"));++ service.createRepository(repositoryName, null, null, null, null, null, null, REGION);+ AwsException ex = assertThrows(AwsException.class,+ () -> service.deleteRepository(repositoryName, null, true, REGION));+ assertEquals("ServerException", ex.getErrorCode());++ // Metadata survives so the operator can retry after recovery.+ assertEquals(1, service.describeRepositories(List.of(repositoryName), null, REGION).size());+ }+@Testvoid putImageTagMutability_roundTrips() {service.createRepository(REPO, null, null, null, null, null, null, REGION);@@ -501,6 +774,7 @@ class EcrServiceTest {private final String tag;private final String digest;private final String manifest;+ private final List<String> deletedDigests = new java.util.ArrayList<>();private FakeRegistryServer(String repository, String tag, String digest, String manifest) throws IOException {this.repository = repository;@@ -516,6 +790,14 @@ class EcrServiceTest {return server.getAddress().getPort();}+ private boolean sawDelete() {+ return !deletedDigests.isEmpty();+ }++ private String lastDeletedDigest() {+ return deletedDigests.isEmpty() ? null : deletedDigests.get(deletedDigests.size() - 1);+ }+private void handle(HttpExchange exchange) throws IOException {String path = exchange.getRequestURI().getPath();String method = exchange.getRequestMethod();@@ -523,6 +805,16 @@ class EcrServiceTest {send(exchange, 200, "");return;}+ if ("/v2/_catalog".equals(path) && "GET".equals(method)) {+ sendJson(exchange, 200, "{\"repositories\":[\"" + repository + "\"]}");+ return;+ }+ if (path.equals("/v2/" + repository + "/manifests/" + digest) && "DELETE".equals(method)) {+ deletedDigests.add(digest);+ exchange.sendResponseHeaders(202, -1);+ exchange.close();+ return;+ }if (("/v2/" + repository + "/tags/list").equals(path) && "GET".equals(method)) {sendJson(exchange, 200, "{\"name\":\"" + repository + "\",\"tags\":[\"" + tag + "\"]}");return;@@ -564,4 +856,217 @@ class EcrServiceTest {server.stop(0);}}++ /** Registry whose _catalog spans two pages (Link header); repo lives on page 2. */+ private static final class PaginatedCatalogRegistryServer implements AutoCloseable {+ private final HttpServer server;+ private final String repository;+ private final String tag;+ private final String digest;+ private final List<String> filler;+ private volatile boolean secondPageRequested;++ private PaginatedCatalogRegistryServer(String repository, int fillerCount) throws IOException {+ this.repository = repository;+ this.tag = "v1";+ this.digest = "sha256:7777777777777777777777777777777777777777777777777777777777777777";+ List<String> f = new java.util.ArrayList<>();+ for (int i = 0; i < fillerCount; i++) {+ f.add(String.format("filler/%03d", i));+ }+ this.filler = f;+ this.server = HttpServer.create(new InetSocketAddress(0), 0);+ this.server.createContext("/v2/", this::handle);+ this.server.start();+ }++ private int port() {+ return server.getAddress().getPort();+ }++ private boolean sawSecondPageRequest() {+ return secondPageRequested;+ }++ private void handle(HttpExchange exchange) throws IOException {+ String path = exchange.getRequestURI().getPath();+ String query = exchange.getRequestURI().getQuery();+ String method = exchange.getRequestMethod();+ if ("/v2/".equals(path) && "GET".equals(method)) {+ send(exchange, 200, "");+ return;+ }+ if ("/v2/_catalog".equals(path) && "GET".equals(method)) {+ boolean pageTwo = query != null && query.contains("last=");+ if (pageTwo) {+ secondPageRequested = true;+ sendJson(exchange, 200, "{\"repositories\":[\"" + repository + "\"]}");+ } else {+ String joined = filler.stream()+ .map(r -> "\"" + r + "\"")+ .reduce((a, b) -> a + "," + b)+ .orElse("");+ exchange.getResponseHeaders().add("Link",+ "</v2/_catalog?n=100&last=" + filler.get(filler.size() - 1).replace("/", "%2F") + ">; rel=\"next\"");+ sendJson(exchange, 200, "{\"repositories\":[" + joined + "]}");+ }+ return;+ }+ if (path.equals("/v2/" + repository + "/tags/list") && "GET".equals(method)) {+ sendJson(exchange, 200, "{\"name\":\"" + repository + "\",\"tags\":[\"" + tag + "\"]}");+ return;+ }+ if (path.equals("/v2/" + repository + "/manifests/" + tag) && "HEAD".equals(method)) {+ exchange.getResponseHeaders().add("Docker-Content-Digest", digest);+ exchange.sendResponseHeaders(200, -1);+ exchange.close();+ return;+ }+ exchange.sendResponseHeaders(404, -1);+ exchange.close();+ }++ private static void sendJson(HttpExchange exchange, int status, String body) throws IOException {+ exchange.getResponseHeaders().add("Content-Type", "application/json");+ send(exchange, status, body);+ }++ private static void send(HttpExchange exchange, int status, String body) throws IOException {+ byte[] bytes = body.getBytes();+ exchange.sendResponseHeaders(status, bytes.length);+ try (OutputStream out = exchange.getResponseBody()) {+ out.write(bytes);+ }+ }++ @Override+ public void close() {+ server.stop(0);+ }+ }++ /** Registry serving a catalog entry whose repository has no tags (digest-only). */+ private static final class UntaggedRegistryServer implements AutoCloseable {+ private final HttpServer server;+ private final String repository;+ private final String digest;++ private UntaggedRegistryServer(String repository, String digest) throws IOException {+ this.repository = repository;+ this.digest = digest;+ this.server = HttpServer.create(new InetSocketAddress(0), 0);+ this.server.createContext("/v2/", this::handle);+ this.server.start();+ }++ private int port() {+ return server.getAddress().getPort();+ }++ private void handle(HttpExchange exchange) throws IOException {+ String path = exchange.getRequestURI().getPath();+ String method = exchange.getRequestMethod();+ if ("/v2/".equals(path) && "GET".equals(method)) {+ send(exchange, 200, "");+ return;+ }+ if ("/v2/_catalog".equals(path) && "GET".equals(method)) {+ sendJson(exchange, 200, "{\"repositories\":[\"" + repository + "\"]}");+ return;+ }+ if (path.equals("/v2/" + repository + "/tags/list") && "GET".equals(method)) {+ // registry:2 returns tags: null when only untagged manifests exist.+ sendJson(exchange, 200, "{\"name\":\"" + repository + "\",\"tags\":null}");+ return;+ }+ if (path.equals("/v2/" + repository + "/manifests/" + digest)+ && ("GET".equals(method) || "HEAD".equals(method))) {+ exchange.getResponseHeaders().add("Docker-Content-Digest", digest);+ if ("HEAD".equals(method)) {+ exchange.sendResponseHeaders(200, -1);+ exchange.close();+ return;+ }+ exchange.getResponseHeaders().add("Content-Type",+ "application/vnd.docker.distribution.manifest.v2+json");+ send(exchange, 200, "{\"schemaVersion\":2,\"config\":{\"size\":1},\"layers\":[]}");+ return;+ }+ exchange.sendResponseHeaders(404, -1);+ exchange.close();+ }++ private static void sendJson(HttpExchange exchange, int status, String body) throws IOException {+ exchange.getResponseHeaders().add("Content-Type", "application/json");+ send(exchange, status, body);+ }++ private static void send(HttpExchange exchange, int status, String body) throws IOException {+ byte[] bytes = body.getBytes();+ exchange.sendResponseHeaders(status, bytes.length);+ try (OutputStream out = exchange.getResponseBody()) {+ out.write(bytes);+ }+ }++ @Override+ public void close() {+ server.stop(0);+ }+ }++ /** Registry that reports a fixed catalog; nothing else resolves. */+ private static final class CatalogOnlyRegistryServer implements AutoCloseable {+ private final HttpServer server;+ private final List<String> repositories;++ private CatalogOnlyRegistryServer(List<String> repositories) throws IOException {+ this.repositories = repositories;+ this.server = HttpServer.create(new InetSocketAddress(0), 0);+ this.server.createContext("/v2/", this::handle);+ this.server.start();+ }++ private int port() {+ return server.getAddress().getPort();+ }++ private void handle(HttpExchange exchange) throws IOException {+ String path = exchange.getRequestURI().getPath();+ String method = exchange.getRequestMethod();+ if ("/v2/".equals(path) && "GET".equals(method)) {+ send(exchange, 200, "");+ return;+ }+ if ("/v2/_catalog".equals(path) && "GET".equals(method)) {+ String joined = repositories.stream()+ .map(r -> "\"" + r + "\"")+ .reduce((a, b) -> a + "," + b)+ .orElse("");+ sendJson(exchange, 200, "{\"repositories\":[" + joined + "]}");+ return;+ }+ exchange.sendResponseHeaders(404, -1);+ exchange.close();+ }++ private static void sendJson(HttpExchange exchange, int status, String body) throws IOException {+ exchange.getResponseHeaders().add("Content-Type", "application/json");+ send(exchange, status, body);+ }++ private static void send(HttpExchange exchange, int status, String body) throws IOException {+ byte[] bytes = body.getBytes();+ exchange.sendResponseHeaders(status, bytes.length);+ try (OutputStream out = exchange.getResponseBody()) {+ out.write(bytes);+ }+ }++ @Override+ public void close() {+ server.stop(0);+ }+ }+}