Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(ec2): let dnf swap curl-minimal for curl when installing the IMDS proxy (#3284)

Sam Fakhreddine5648be79c46b
diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManager.java b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManager.java
index 68800d1d1f..a96159925d 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManager.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManager.java
@@ -1633,7 +1633,12 @@ public class Ec2ContainerManager {
" apt-get update -qq >/dev/null",
" DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iproute2 socat curl ca-certificates >/dev/null",
"elif command -v dnf >/dev/null 2>&1; then",
- " dnf install -y iproute socat curl ca-certificates >/dev/null",
+ // --allowerasing lets dnf swap the curl-minimal that
+ // public.ecr.aws/amazonlinux/amazonlinux:2023 ships by default for the full
+ // curl package this proxy needs. Without it, dnf aborts the whole transaction
+ // on a curl/curl-minimal conflict and iproute+socat never install either, even
+ // though neither of them conflicts with anything.
+ " dnf install -y --allowerasing iproute socat curl ca-certificates >/dev/null",
// Same gap as the sshd probe: Amazon Linux 2 has only yum, so on an instance
// launched from ami-amazonlinux2 this chain reached its else branch and exited 1
// with "No supported package manager found for IMDS proxy dependencies" --
diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManagerTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManagerTest.java
index 17daa0bd54..8a6fa051df 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManagerTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ContainerManagerTest.java
@@ -796,6 +796,22 @@ class Ec2ContainerManagerTest {
assertTrue(script.contains("yum install -y iproute socat curl ca-certificates"), script);
}
+ @Test
+ void metadataProxyInstallCommandLetsDnfReplaceCurlMinimalWithCurl() {
+ // public.ecr.aws/amazonlinux/amazonlinux:2023 -- the fallback image AmiImageResolver
+ // uses for any unrecognized AMI ID -- ships curl-minimal by default. Without
+ // --allowerasing, "dnf install -y iproute socat curl ca-certificates" fails the whole
+ // transaction on a curl/curl-minimal conflict (they both provide /usr/bin/curl), so
+ // iproute and socat never install either, even though neither of them conflicts with
+ // anything. Reproduced against the real image: dnf reported dozens of
+ // "package curl-minimal-... conflicts with curl provided by curl-..." lines and the
+ // instance was left with no link-local IMDS endpoint.
+ String script = Ec2ContainerManager.metadataProxyInstallCommand()[2];
+
+ assertTrue(script.contains("dnf install -y --allowerasing iproute socat curl ca-certificates"),
+ script);
+ }
+
@Test
void metadataProxyStartCommandBindsAwsLinkLocalMetadataAddress() {
String[] command = Ec2ContainerManager.metadataProxyStartCommand("floci", 9169);