Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(lambda): support path-style ECR URIs for image functions (#1135)

shrimptails-f2a14f35c2d9b
diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.java b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.java
index 104c873ffb..aaa43c2cdd 100644
--- a/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.java
+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncher.java
@@ -108,8 +108,7 @@ public class ContainerLauncher {
String region = m.group(2);
String repoAndTag = m.group(3);
ecrRegistryManager.ensureStarted();
- int port = ecrRegistryManager.effectivePort();
- String rewritten = account + ".dkr.ecr." + region + ".localhost:" + port + "/" + repoAndTag;
+ String rewritten = ecrRegistryManager.getRepositoryUri(account, region, repoAndTag);
LOG.infov("Rewriting ECR image URI {0} -> {1}", image, rewritten);
return rewritten;
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherTest.java
index b55e170521..8c5cf1c53a 100644
--- a/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/launcher/ContainerLauncherTest.java
@@ -95,7 +95,7 @@ class ContainerLauncherTest {
// prevent the background PipedOutputStream writer thread from blocking
// when the pipe buffer fills.
capturedRemotePaths.clear();
- when(dockerClient.copyArchiveToContainerCmd(any())).thenAnswer(inv -> {
+ lenient().when(dockerClient.copyArchiveToContainerCmd(any())).thenAnswer(inv -> {
CopyArchiveToContainerCmd cmd = mock(CopyArchiveToContainerCmd.class);
final java.io.InputStream[] captured = {null};
when(cmd.withRemotePath(any())).thenAnswer(pathInv -> {
@@ -307,6 +307,46 @@ class ContainerLauncherTest {
"AWS_SESSION_TOKEN should retain its default exactly once");
}
+ @Test
+ void launchImageFunction_rewritesAwsEcrUriUsingRegistryManagerHostnameStyle() {
+ LambdaFunction fn = new LambdaFunction();
+ fn.setFunctionName("image-fn");
+ fn.setPackageType("Image");
+ fn.setImageUri("123456789012.dkr.ecr.us-east-1.amazonaws.com/backend-user:1");
+
+ when(ecrRegistryManager.getRepositoryUri("123456789012", "us-east-1", "backend-user:1"))
+ .thenReturn("123456789012.dkr.ecr.us-east-1.localhost:5100/backend-user:1");
+
+ launcher.launch(fn);
+
+ ArgumentCaptor<ContainerSpec> specCaptor = ArgumentCaptor.forClass(ContainerSpec.class);
+ verify(lifecycleManager).create(specCaptor.capture());
+ verify(ecrRegistryManager).ensureStarted();
+ verify(ecrRegistryManager).getRepositoryUri("123456789012", "us-east-1", "backend-user:1");
+ assertEquals("123456789012.dkr.ecr.us-east-1.localhost:5100/backend-user:1",
+ specCaptor.getValue().image());
+ }
+
+ @Test
+ void launchImageFunction_rewritesAwsEcrUriUsingRegistryManagerPathStyle() {
+ LambdaFunction fn = new LambdaFunction();
+ fn.setFunctionName("image-path-fn");
+ fn.setPackageType("Image");
+ fn.setImageUri("123456789012.dkr.ecr.us-east-1.amazonaws.com/backend-user:1");
+
+ when(ecrRegistryManager.getRepositoryUri("123456789012", "us-east-1", "backend-user:1"))
+ .thenReturn("localhost:5100/123456789012/us-east-1/backend-user:1");
+
+ launcher.launch(fn);
+
+ ArgumentCaptor<ContainerSpec> specCaptor = ArgumentCaptor.forClass(ContainerSpec.class);
+ verify(lifecycleManager).create(specCaptor.capture());
+ verify(ecrRegistryManager).ensureStarted();
+ verify(ecrRegistryManager).getRepositoryUri("123456789012", "us-east-1", "backend-user:1");
+ assertEquals("localhost:5100/123456789012/us-east-1/backend-user:1",
+ specCaptor.getValue().image());
+ }
+
@Test
void launchProvidedRuntime_copiesBootstrapBeforeStart() throws Exception {
Path codePath = Files.createDirectory(tempDir.resolve("provided-code"));