Statically link libsasl for kafka (#680)

ArroyoSystems · Jul 8, 2024 · b7e21d7 · b7e21d7
1 parent 3371ef6
commit b7e21d7
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/arroyo-api/Cargo.toml b/crates/arroyo-api/Cargo.toml
@@ -6,7 +6,6 @@ license = "MIT OR Apache-2.0"
 
 [features]
 default = []
-kafka-sasl = ["arroyo-connectors/kafka-sasl"]
 
 [dependencies]
 arroyo-types = { path = "../arroyo-types" }

diff --git a/crates/arroyo-connectors/Cargo.toml b/crates/arroyo-connectors/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 [features]
 default = []
-kafka-sasl = ["rdkafka/sasl", "rdkafka/ssl-vendored"]
 
 [dependencies]
 arroyo-types = { path = "../arroyo-types" }
@@ -48,8 +47,9 @@ regex = "1"
 ##########################
 
 # Kafka
-rdkafka = { version = "0.33", features = ["cmake-build", "tracing"] }
+rdkafka = { version = "0.33", features = ["cmake-build", "tracing", "sasl", "ssl-vendored"] }
 rdkafka-sys = "4.5.0"
+sasl2-sys = { version = "0.1.6", features = ["vendored"] }
 
 # SSE
 eventsource-client = "0.12.0"

diff --git a/crates/arroyo-controller/Cargo.toml b/crates/arroyo-controller/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 [features]
 default = []
-kafka-sasl = []
 
 [dependencies]
 arroyo-types = { path = "../arroyo-types" }

diff --git a/crates/arroyo-worker/Cargo.toml b/crates/arroyo-worker/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 [features]
 default = []
-kafka-sal = ["arroyo-connectors/kafka-sasl"]
 
 [dependencies]
 arroyo-types = { path = "../arroyo-types" }

diff --git a/crates/arroyo/Cargo.toml b/crates/arroyo/Cargo.toml
@@ -3,9 +3,6 @@ name = "arroyo"
 version = "0.11.0"
 edition = "2021"
 
-[features]
-kafka-sasl = ["arroyo-connectors/kafka-sasl", "arroyo-worker/kafka-sal"]
-
 [dependencies]
 arroyo-types = { path ="../arroyo-types" }
 arroyo-connectors = { path ="../arroyo-connectors" }

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -43,7 +43,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry,id=${TARGETPLATFORM}-${P
     sudo -u postgres psql -c "CREATE USER arroyo WITH PASSWORD 'arroyo' SUPERUSER;" && \
     sudo -u postgres createdb arroyo && \
     refinery migrate -c refinery.toml -p crates/arroyo-api/migrations && \
-    CARGO_NET_GIT_FETCH_WITH_CLI=true CARGO_PROFILE_RELEASE_DEBUG=false cargo build --profile ${PROFILE} --bin arroyo --all-features && \
+    CARGO_NET_GIT_FETCH_WITH_CLI=true CARGO_PROFILE_RELEASE_DEBUG=false cargo build --profile ${PROFILE} --bin arroyo && \
     mv target/*/arroyo /arroyo