build: Rename with_ssl feature to ssl (#684)

Cargo.toml

@@ -23,8 +23,8 @@ exclude = [
 [workspace]
 
 [features]
-default = []
-with_ssl = ["relay-server/with_ssl"]
+default = ["ssl"]
+ssl = ["relay-server/ssl"]
 processing = ["relay-server/processing"]
 
 [profile.release]

Dockerfile

@@ -63,7 +63,7 @@ RUN echo "Building OpenSSL" \
 FROM getsentry/sentry-cli:1 AS sentry-cli
 FROM relay-deps AS relay-builder
 
-ARG RELAY_FEATURES=with_ssl,processing
+ARG RELAY_FEATURES=ssl,processing
 ENV RELAY_FEATURES=${RELAY_FEATURES}
 
 COPY --from=sentry-cli /bin/sentry-cli /bin/sentry-cli

Makefile

@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 export RELAY_PYTHON_VERSION := python3.7
-export RELAY_FEATURES := with_ssl
+export RELAY_FEATURES := ssl
 
 all: check test
 .PHONY: all

README.md

@@ -99,7 +99,7 @@ used for Relays operating as proxys. There are two optional features:
   into a Kafka topic instead of forwarding to the configured upstream. Also, it
   will perform full event normalization, filtering, and rate limiting.
 
-- **`with_ssl`**: Enables SSL support in the Server.
+- **`ssl`**: Enables SSL support in the Server.
 
 To enable a feature, pass it to the cargo invocation. For example, to run tests
 across all workspace crates with the `processing` feature enabled, run:

relay-server/Cargo.toml

@@ -11,8 +11,8 @@ license-file = "../LICENSE"
 publish = false
 
 [features]
-default = ["with_ssl"]
-with_ssl = ["native-tls", "actix-web/tls"]
+default = []
+ssl = ["native-tls", "actix-web/tls"]
 processing = [
     "minidump",
     "rdkafka",

relay-server/src/service.rs

@@ -46,7 +46,7 @@ pub enum ServerErrorKind {
     TlsInitFailed,
 
     /// TLS support was not compiled in.
-    #[fail(display = "compile with the `with_ssl` feature to enable SSL support")]
+    #[fail(display = "compile with the `ssl` feature to enable SSL support")]
     TlsNotSupported,
 
     /// GeoIp construction failed.
@@ -235,7 +235,7 @@ where
     )
 }
 
-#[cfg(feature = "with_ssl")]
+#[cfg(feature = "ssl")]
 fn listen_ssl<H, F>(
     mut server: server::HttpServer<H, F>,
     config: &Config,
@@ -271,7 +271,7 @@ where
     Ok(server)
 }
 
-#[cfg(not(feature = "with_ssl"))]
+#[cfg(not(feature = "ssl"))]
 fn listen_ssl<H>(
     server: server::HttpServer<H>,
     config: &Config,