Fix peer fill feature matrix checks

Author: eldryoth

src/cli.rs

@@ -2268,6 +2268,9 @@ fn run_cache_key_command(options: CacheKeyOptions<'_>) -> Result<(), Box<dyn Err
         expect_namespace,
         expect_key_namespace,
         expect_user_tag,
+        expect_peer_fill_enabled,
+        expect_peer_fill_peers,
+        expect_peer_fill_max_concurrent_requests,
     } = options;
     let _ = (
         config_path,
@@ -2291,6 +2294,9 @@ fn run_cache_key_command(options: CacheKeyOptions<'_>) -> Result<(), Box<dyn Err
         expect_namespace,
         expect_key_namespace,
         expect_user_tag,
+        expect_peer_fill_enabled,
+        expect_peer_fill_peers,
+        expect_peer_fill_max_concurrent_requests,
     );
     Err("cache-key requires the proxy and cache features".into())
 }
@@ -2333,6 +2339,9 @@ fn run_cache_lookup_command(
         expect_user_tag,
         expect_serve_stale_if_error,
         expect_serve_stale_while_revalidate,
+        expect_peer_fill_enabled,
+        expect_peer_fill_peers,
+        expect_peer_fill_max_concurrent_requests,
     } = options;
     let _ = (config_path, host, headers, method, path, query);
     let _ = (
@@ -2363,6 +2372,9 @@ fn run_cache_lookup_command(
         expect_user_tag,
         expect_serve_stale_if_error,
         expect_serve_stale_while_revalidate,
+        expect_peer_fill_enabled,
+        expect_peer_fill_peers,
+        expect_peer_fill_max_concurrent_requests,
     );
     Err("cache-lookup requires the proxy and cache features".into())
 }

src/config.rs

@@ -7382,14 +7382,15 @@ mod tests {
     use super::{
         AdminConfig, AdminHealthConfig, AdminHealthResponseMode, AdminRemoteTransportMode,
         AdminSelfHealingConfig, AdminTransportConfig, ByteSize, CacheConfig, CacheDiskBackend,
-        CacheDiskEncryptionProvider, CacheKeyPart, CachePeerConfig, CachePeerFillConfig,
-        CachePurgerConfig, CacheStaleErrorKind, Config, ConfigError, ConfigLoadError,
-        HeaderPolicyConfig, LoggingConfig, MetricsConfig, ProxyConfig, ServerConfig,
-        ServerLimitsConfig, StaticCertificateConfig, TlsAlpnPolicy, TlsCipherSuite,
-        TlsCurvePreference, TlsPolicyProfile, TlsProtocolVersion, TracingConfig, VhostConfig,
-        VhostHeaderPolicyConfig, VhostTlsConfig, WebConfig, normalize_host, normalize_host_pattern,
-        valid_dynamic_header_variable, validate_dynamic_header_template,
+        CacheDiskEncryptionProvider, CacheKeyPart, CachePurgerConfig, CacheStaleErrorKind, Config,
+        ConfigError, ConfigLoadError, HeaderPolicyConfig, LoggingConfig, MetricsConfig,
+        ProxyConfig, ServerConfig, ServerLimitsConfig, StaticCertificateConfig, TlsAlpnPolicy,
+        TlsCipherSuite, TlsCurvePreference, TlsPolicyProfile, TlsProtocolVersion, TracingConfig,
+        VhostConfig, VhostHeaderPolicyConfig, VhostTlsConfig, WebConfig, normalize_host,
+        normalize_host_pattern, valid_dynamic_header_variable, validate_dynamic_header_template,
     };
+    #[cfg(feature = "cache")]
+    use super::{CachePeerConfig, CachePeerFillConfig};
     use crate::test_support::{safe_child_path, safe_relative_path, unique_temp_path};
     #[cfg(unix)]
     use crate::test_support::{unique_group_writable_child, unique_world_writable_child};
@@ -9820,6 +9821,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "cache")]
     fn rejects_cache_peer_fill_without_enabled_cache_policy() {
         let config: Config = toml::from_str(
             r#"
@@ -9844,6 +9846,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "cache")]
     fn rejects_unsafe_cache_peer_fill_peers() {
         let config: Config = toml::from_str(
             r#"