Remove the panics from the SecretRuleApiMatchValidation.try_from code path

abrooksv · abrooksv · commit 492a0264be88 · 2026-04-28T12:44:28.000-07:00
diff --git a/crates/cli/src/model/datadog_api.rs b/crates/cli/src/model/datadog_api.rs
@@ -323,10 +323,10 @@ impl TryFrom<SecretRuleApiMatchValidation> for SecretRuleMatchValidation {
             }
             SecretRuleApiMatchValidation::CUSTOM_HTTP_STRING => Ok(
                 SecretRuleMatchValidation::CustomHttp(SecretRuleMatchValidationHttp {
-                    endpoint: value.endpoint.expect("no endpoint"),
+                    endpoint: value.endpoint.ok_or("missing endpoint")?,
                     hosts: value.hosts.unwrap_or_default(),
                     request_headers: value.request_headers.unwrap_or_default(),
-                    http_method: value.http_method.expect("missing http method").into(),
+                    http_method: value.http_method.ok_or("missing http method")?.into(),
                     timeout_seconds: value.timeout_seconds,
                     valid_http_status_code: value
                         .valid_http_status_code
diff --git a/crates/secrets/src/model/secret_rule.rs b/crates/secrets/src/model/secret_rule.rs
@@ -144,7 +144,10 @@ impl TryFrom<&SecretRuleMatchValidation> for MatchValidationType {
                     request_headers: custom_http.request_headers.clone(),
                     valid_http_status_code: valid_ports,
                     invalid_http_status_code: invalid_ports,
-                    timeout_seconds: custom_http.timeout_seconds.unwrap() as u32,
+                    timeout_seconds: custom_http
+                        .timeout_seconds
+                        .ok_or("missing timeout_seconds")?
+                        as u32,
                 }))
             }
             SecretRuleMatchValidation::CustomHttpV2(custom_http_v2) => {
