Further tweaks to rust-server HTTPS feature flagging

Author: dsteeley

modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache

@@ -32,7 +32,7 @@ homepage = "{{.}}"
 {{/homePageUrl}}
 
 [features]
-default = ["client", "server"]
+default = ["client", "server", "client-tls"]
 client = [
 {{#apiUsesMultipartFormData}}
     "multipart", "multipart/client", "swagger/multipart_form",
@@ -69,6 +69,7 @@ server = [
     "mime_multipart", "swagger/multipart_related",
 {{/apiUsesMultipartRelated}}
 {{#hasCallbacks}}
+    "hyper-util/http1", "hyper-util/http2",
 {{/hasCallbacks}}
 {{! Anything added to the list below, should probably be added to the callbacks list above }}
    "serde_ignored", "hyper", "percent-encoding", "url",
@@ -136,12 +137,6 @@ serde_urlencoded = { version = "0.7.1", optional = true }
 {{/usesUrlEncodedForm}}
 tower-service = "0.3.3"
 
-# TLS support - all listed here, actual usage determined by cfg attributes in code
-native-tls = { version = "0.2", optional = true }
-hyper-tls = { version = "0.6", optional = true }
-openssl = { version = "0.10", optional = true }
-hyper-openssl = { version = "0.10", optional = true }
-
 # Server, and client callback-specific
 {{^apiUsesByteArray}}
 lazy_static = { version = "1.5", optional = true }
@@ -166,19 +161,32 @@ frunk_core = { version = "0.4.3", optional = true }
 frunk-enum-derive = { version = "0.3.0", optional = true }
 frunk-enum-core = { version = "0.3.0", optional = true }
 
+# TLS dependencies - platform-specific backends
+# On macOS/Windows/iOS, use native-tls via hyper-tls
+[target.'cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))'.dependencies]
+native-tls = { version = "0.2", optional = true }
+hyper-tls = { version = "0.6", optional = true }
+
+# On other platforms (Linux, etc.), use OpenSSL via hyper-openssl
+[target.'cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))'.dependencies]
+openssl = { version = "0.10", optional = true }
+hyper-openssl = { version = "0.10", optional = true }
+
 [dev-dependencies]
 always_send = "0.1.1"
 clap = "4.5"
 env_logger = "0.11"
 tokio = { version = "1.49", features = ["full"] }
 native-tls = "0.2"
-openssl = "0.10"
-tokio-openssl = "0.6"
 pin-project = "1.1.10"
 
 # Bearer authentication, used in examples
 jsonwebtoken = {version = "10.0.0", features = ["rust_crypto"]}
 
+[target.'cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))'.dev-dependencies]
+openssl = "0.10"
+tokio-openssl = "0.6"
+
 [[example]]
 name = "client"
 required-features = ["client"]

modules/openapi-generator/src/main/resources/rust-server/README.mustache

@@ -127,10 +127,9 @@ The generated library has a few optional features that can be activated through
     * This defaults to enabled and creates the basic skeleton of a client implementation based on hyper
     * The constructed client implements the API trait by making remote API call.
 * `client-tls`
-    * Optional feature that provides HTTPS support with automatic TLS backend selection:
+    * This default to enabled and provides HTTPS support with automatic TLS backend selection:
         - macOS/Windows/iOS: native-tls + hyper-tls
         - Linux/Unix/others: OpenSSL + hyper-openssl
-    * Not enabled by default to minimize dependencies.
 * `conversions`
     * This defaults to disabled and creates extra derives on models to allow "transmogrification" between objects of structurally similar types.
 * `cli`
@@ -139,13 +138,13 @@ The generated library has a few optional features that can be activated through
     * This defaults to disabled and allows JSON Schema validation of received data using `MakeService::set_validation` or `Service::set_validation`.
     * Note, enabling validation will have a performance penalty, especially if the API heavily uses regex based checks.
 
-### Enabling HTTPS/TLS Support
+### HTTPS/TLS Support
 
-By default, only HTTP support is included. To enable HTTPS, add the `client-tls` feature:
+HTTPS support is included by default. To disable it (for example, to reduce dependencies), you can:
 
 ```toml
 [dependencies]
-{{{packageName}}} = { version = "{{{packageVersion}}}", features = ["client-tls"] }
+{{{packageName}}} = { version = "{{{packageVersion}}}", default-features = false, features = ["client", "server"] }
 ```
 
 **For server with callbacks that need HTTPS:**
@@ -158,8 +157,6 @@ The TLS backend is automatically selected based on your target platform:
 - **macOS, Windows, iOS**: Uses `native-tls` (system TLS libraries)
 - **Linux, Unix, other platforms**: Uses `openssl`
 
-This ensures the best compatibility and native integration on each platform.
-
 See https://doc.rust-lang.org/cargo/reference/manifest.html#the-features-section for how to use features in your `Cargo.toml`.
 
 ## Documentation for API Endpoints

modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache

@@ -241,7 +241,7 @@ impl<C> Client<
 > where
     C: Clone + Send + Sync + 'static
 {
-    /// Create a client with a TLS connection to the server using native-tls.
+    /// Create a client with a TLS connection to the server.
     ///
     /// # Arguments
     /// * `base_path` - base path of the client API, i.e. "<https://www.my-api-implementation.com>"
@@ -255,7 +255,7 @@ impl<C> Client<
         Self::try_new_with_connector(base_path, Some("https"), https_connector)
     }
 
-    /// Create a client with a TLS connection to the server using OpenSSL.
+    /// Create a client with a TLS connection to the server using OpenSSL via swagger.
     ///
     /// # Arguments
     /// * `base_path` - base path of the client API, i.e. "<https://www.my-api-implementation.com>"
@@ -269,7 +269,7 @@ impl<C> Client<
         Self::try_new_with_connector(base_path, Some("https"), https_connector)
     }
 
-    /// Create a client with a TLS connection to the server using a pinned certificate
+    /// Create a client with a TLS connection to the server using a pinned certificate.
     ///
     /// # Arguments
     /// * `base_path` - base path of the client API, i.e. "<https://www.my-api-implementation.com>"

samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml

@@ -8,7 +8,7 @@ license = "Unlicense"
 edition = "2018"
 
 [features]
-default = ["client", "server"]
+default = ["client", "server", "client-tls"]
 client = [
     "multipart", "multipart/client", "swagger/multipart_form",
     "mime_multipart", "swagger/multipart_related",
@@ -76,12 +76,6 @@ url = { version = "2.5", optional = true }
 # Client-specific
 tower-service = "0.3.3"
 
-# TLS support - all listed here, actual usage determined by cfg attributes in code
-native-tls = { version = "0.2", optional = true }
-hyper-tls = { version = "0.6", optional = true }
-openssl = { version = "0.10", optional = true }
-hyper-openssl = { version = "0.10", optional = true }
-
 # Server, and client callback-specific
 percent-encoding = { version = "2.3.2", optional = true }
 
@@ -99,19 +93,32 @@ frunk_core = { version = "0.4.3", optional = true }
 frunk-enum-derive = { version = "0.3.0", optional = true }
 frunk-enum-core = { version = "0.3.0", optional = true }
 
+# TLS dependencies - platform-specific backends
+# On macOS/Windows/iOS, use native-tls via hyper-tls
+[target.'cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))'.dependencies]
+native-tls = { version = "0.2", optional = true }
+hyper-tls = { version = "0.6", optional = true }
+
+# On other platforms (Linux, etc.), use OpenSSL via hyper-openssl
+[target.'cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))'.dependencies]
+openssl = { version = "0.10", optional = true }
+hyper-openssl = { version = "0.10", optional = true }
+
 [dev-dependencies]
 always_send = "0.1.1"
 clap = "4.5"
 env_logger = "0.11"
 tokio = { version = "1.49", features = ["full"] }
 native-tls = "0.2"
-openssl = "0.10"
-tokio-openssl = "0.6"
 pin-project = "1.1.10"
 
 # Bearer authentication, used in examples
 jsonwebtoken = {version = "10.0.0", features = ["rust_crypto"]}
 
+[target.'cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))'.dev-dependencies]
+openssl = "0.10"
+tokio-openssl = "0.6"
+
 [[example]]
 name = "client"
 required-features = ["client"]

samples/server/petstore/rust-server/output/multipart-v3/README.md

@@ -112,10 +112,9 @@ The generated library has a few optional features that can be activated through
     * This defaults to enabled and creates the basic skeleton of a client implementation based on hyper
     * The constructed client implements the API trait by making remote API call.
 * `client-tls`
-    * Optional feature that provides HTTPS support with automatic TLS backend selection:
+    * This default to enabled and provides HTTPS support with automatic TLS backend selection:
         - macOS/Windows/iOS: native-tls + hyper-tls
         - Linux/Unix/others: OpenSSL + hyper-openssl
-    * Not enabled by default to minimize dependencies.
 * `conversions`
     * This defaults to disabled and creates extra derives on models to allow "transmogrification" between objects of structurally similar types.
 * `cli`
@@ -124,13 +123,13 @@ The generated library has a few optional features that can be activated through
     * This defaults to disabled and allows JSON Schema validation of received data using `MakeService::set_validation` or `Service::set_validation`.
     * Note, enabling validation will have a performance penalty, especially if the API heavily uses regex based checks.
 
-### Enabling HTTPS/TLS Support
+### HTTPS/TLS Support
 
-By default, only HTTP support is included. To enable HTTPS, add the `client-tls` feature:
+HTTPS support is included by default. To disable it (for example, to reduce dependencies), you can:
 
 ```toml
 [dependencies]
-multipart-v3 = { version = "1.0.7", features = ["client-tls"] }
+multipart-v3 = { version = "1.0.7", default-features = false, features = ["client", "server"] }
 ```
 
 **For server with callbacks that need HTTPS:**
@@ -143,8 +142,6 @@ The TLS backend is automatically selected based on your target platform:
 - **macOS, Windows, iOS**: Uses `native-tls` (system TLS libraries)
 - **Linux, Unix, other platforms**: Uses `openssl`
 
-This ensures the best compatibility and native integration on each platform.
-
 See https://doc.rust-lang.org/cargo/reference/manifest.html#the-features-section for how to use features in your `Cargo.toml`.
 
 ## Documentation for API Endpoints

samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs

@@ -283,7 +283,7 @@ impl<C> Client<
 > where
     C: Clone + Send + Sync + 'static
 {
-    /// Create a client with a TLS connection to the server using native-tls.
+    /// Create a client with a TLS connection to the server.
     ///
     /// # Arguments
     /// * `base_path` - base path of the client API, i.e. "<https://www.my-api-implementation.com>"
@@ -297,7 +297,7 @@ impl<C> Client<
         Self::try_new_with_connector(base_path, Some("https"), https_connector)
     }
 
-    /// Create a client with a TLS connection to the server using OpenSSL.
+    /// Create a client with a TLS connection to the server using OpenSSL via swagger.
     ///
     /// # Arguments
     /// * `base_path` - base path of the client API, i.e. "<https://www.my-api-implementation.com>"
@@ -311,7 +311,7 @@ impl<C> Client<
         Self::try_new_with_connector(base_path, Some("https"), https_connector)
     }
 
-    /// Create a client with a TLS connection to the server using a pinned certificate
+    /// Create a client with a TLS connection to the server using a pinned certificate.
     ///
     /// # Arguments
     /// * `base_path` - base path of the client API, i.e. "<https://www.my-api-implementation.com>"

samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml

@@ -8,7 +8,7 @@ license = "Unlicense"
 edition = "2018"
 
 [features]
-default = ["client", "server"]
+default = ["client", "server", "client-tls"]
 client = [
     "hyper", "percent-encoding", "hyper-util/http1", "hyper-util/http2", "url"
 ]
@@ -68,12 +68,6 @@ url = { version = "2.5", optional = true }
 # Client-specific
 tower-service = "0.3.3"
 
-# TLS support - all listed here, actual usage determined by cfg attributes in code
-native-tls = { version = "0.2", optional = true }
-hyper-tls = { version = "0.6", optional = true }
-openssl = { version = "0.10", optional = true }
-hyper-openssl = { version = "0.10", optional = true }
-
 # Server, and client callback-specific
 lazy_static = { version = "1.5", optional = true }
 regex = { version = "1.12", optional = true }
@@ -93,19 +87,32 @@ frunk_core = { version = "0.4.3", optional = true }
 frunk-enum-derive = { version = "0.3.0", optional = true }
 frunk-enum-core = { version = "0.3.0", optional = true }
 
+# TLS dependencies - platform-specific backends
+# On macOS/Windows/iOS, use native-tls via hyper-tls
+[target.'cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))'.dependencies]
+native-tls = { version = "0.2", optional = true }
+hyper-tls = { version = "0.6", optional = true }
+
+# On other platforms (Linux, etc.), use OpenSSL via hyper-openssl
+[target.'cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))'.dependencies]
+openssl = { version = "0.10", optional = true }
+hyper-openssl = { version = "0.10", optional = true }
+
 [dev-dependencies]
 always_send = "0.1.1"
 clap = "4.5"
 env_logger = "0.11"
 tokio = { version = "1.49", features = ["full"] }
 native-tls = "0.2"
-openssl = "0.10"
-tokio-openssl = "0.6"
 pin-project = "1.1.10"
 
 # Bearer authentication, used in examples
 jsonwebtoken = {version = "10.0.0", features = ["rust_crypto"]}
 
+[target.'cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))'.dev-dependencies]
+openssl = "0.10"
+tokio-openssl = "0.6"
+
 [[example]]
 name = "client"
 required-features = ["client"]

samples/server/petstore/rust-server/output/no-example-v3/README.md

@@ -109,10 +109,9 @@ The generated library has a few optional features that can be activated through
     * This defaults to enabled and creates the basic skeleton of a client implementation based on hyper
     * The constructed client implements the API trait by making remote API call.
 * `client-tls`
-    * Optional feature that provides HTTPS support with automatic TLS backend selection:
+    * This default to enabled and provides HTTPS support with automatic TLS backend selection:
         - macOS/Windows/iOS: native-tls + hyper-tls
         - Linux/Unix/others: OpenSSL + hyper-openssl
-    * Not enabled by default to minimize dependencies.
 * `conversions`
     * This defaults to disabled and creates extra derives on models to allow "transmogrification" between objects of structurally similar types.
 * `cli`
@@ -121,13 +120,13 @@ The generated library has a few optional features that can be activated through
     * This defaults to disabled and allows JSON Schema validation of received data using `MakeService::set_validation` or `Service::set_validation`.
     * Note, enabling validation will have a performance penalty, especially if the API heavily uses regex based checks.
 
-### Enabling HTTPS/TLS Support
+### HTTPS/TLS Support
 
-By default, only HTTP support is included. To enable HTTPS, add the `client-tls` feature:
+HTTPS support is included by default. To disable it (for example, to reduce dependencies), you can:
 
 ```toml
 [dependencies]
-no-example-v3 = { version = "0.0.1", features = ["client-tls"] }
+no-example-v3 = { version = "0.0.1", default-features = false, features = ["client", "server"] }
 ```
 
 **For server with callbacks that need HTTPS:**
@@ -140,8 +139,6 @@ The TLS backend is automatically selected based on your target platform:
 - **macOS, Windows, iOS**: Uses `native-tls` (system TLS libraries)
 - **Linux, Unix, other platforms**: Uses `openssl`
 
-This ensures the best compatibility and native integration on each platform.
-
 See https://doc.rust-lang.org/cargo/reference/manifest.html#the-features-section for how to use features in your `Cargo.toml`.
 
 ## Documentation for API Endpoints

samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs

@@ -276,7 +276,7 @@ impl<C> Client<
 > where
     C: Clone + Send + Sync + 'static
 {
-    /// Create a client with a TLS connection to the server using native-tls.
+    /// Create a client with a TLS connection to the server.
     ///
     /// # Arguments
     /// * `base_path` - base path of the client API, i.e. "<https://www.my-api-implementation.com>"
@@ -290,7 +290,7 @@ impl<C> Client<
         Self::try_new_with_connector(base_path, Some("https"), https_connector)
     }
 
-    /// Create a client with a TLS connection to the server using OpenSSL.
+    /// Create a client with a TLS connection to the server using OpenSSL via swagger.
     ///
     /// # Arguments
     /// * `base_path` - base path of the client API, i.e. "<https://www.my-api-implementation.com>"
@@ -304,7 +304,7 @@ impl<C> Client<
         Self::try_new_with_connector(base_path, Some("https"), https_connector)
     }
 
-    /// Create a client with a TLS connection to the server using a pinned certificate
+    /// Create a client with a TLS connection to the server using a pinned certificate.
     ///
     /// # Arguments
     /// * `base_path` - base path of the client API, i.e. "<https://www.my-api-implementation.com>"