Skip to content

Commit 8426942

Browse files
committed
bridge: Remove incomplete conditional compilation for queue plugin
There were a lot of cfg attributes missing for the codebase to compile without one of the queue features, and they didn't actually independently toggle different queue support either.
1 parent b18a5c3 commit 8426942

File tree

2 files changed

+2
-26
lines changed

2 files changed

+2
-26
lines changed

bridge/svix-bridge/Cargo.toml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ serde = { version = "1", features = ["derive"] }
1919
serde_json = "1"
2020
serde_yaml = "0.9"
2121
svix-ksuid = "0.7.0"
22-
svix-bridge-plugin-queue = { optional=true, path = "../svix-bridge-plugin-queue" }
22+
svix-bridge-plugin-queue = { path = "../svix-bridge-plugin-queue" }
2323
svix-bridge-types = { path = "../svix-bridge-types" }
2424
tokio = { version = "1", features = ["full"] }
2525
tracing = "0.1"
@@ -41,11 +41,5 @@ chrono = "0.4"
4141
tower = "0.4"
4242

4343
[features]
44-
default = ["gcp-pubsub", "rabbitmq", "redis", "sqs", "jemalloc"]
45-
46-
gcp-pubsub = ["generic-queue"]
47-
generic-queue = ["dep:svix-bridge-plugin-queue"]
48-
rabbitmq = ["generic-queue"]
49-
redis = ["generic-queue"]
50-
sqs = ["generic-queue"]
44+
default = ["jemalloc"]
5145
jemalloc = ["tikv-jemallocator", "tikv-jemalloc-ctl"]

bridge/svix-bridge/src/config/mod.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,6 @@ pub enum LogFormat {
147147
#[derive(Deserialize)]
148148
#[serde(untagged)]
149149
pub enum WebhookSenderConfig {
150-
#[cfg(any(
151-
feature = "gcp-pubsub",
152-
feature = "rabbitmq",
153-
feature = "redis",
154-
feature = "sqs"
155-
))]
156150
Queue(QueueSenderConfig),
157151
}
158152

@@ -173,12 +167,6 @@ impl TryFrom<WebhookSenderConfig> for Box<dyn SenderInput> {
173167
type Error = &'static str;
174168
fn try_from(value: WebhookSenderConfig) -> Result<Self, Self::Error> {
175169
match value {
176-
#[cfg(any(
177-
feature = "gcp-pubsub",
178-
feature = "rabbitmq",
179-
feature = "redis",
180-
feature = "sqs"
181-
))]
182170
WebhookSenderConfig::Queue(backend) => backend.into_sender_input(),
183171
}
184172
}
@@ -197,12 +185,6 @@ pub struct WebhookReceiverConfig {
197185
#[derive(Deserialize)]
198186
#[serde(untagged)]
199187
pub enum ReceiverOut {
200-
#[cfg(any(
201-
feature = "gcp-pubsub",
202-
feature = "rabbitmq",
203-
feature = "redis",
204-
feature = "sqs"
205-
))]
206188
Queue(QueueOutOpts),
207189
}
208190

0 commit comments

Comments
 (0)