remove duplication with error messages

Author: zfarrell

src/http/error.rs

@@ -89,33 +89,17 @@ impl From<anyhow::Error> for ApiError {
 impl From<crate::secrets::SecretError> for ApiError {
     fn from(e: crate::secrets::SecretError) -> Self {
         use crate::secrets::SecretError;
-        match e {
-            SecretError::NotFound(name) => {
-                ApiError::not_found(format!("Secret '{}' not found", name))
+        let constructor = match &e {
+            SecretError::NotFound(_) => ApiError::not_found,
+            SecretError::AlreadyExists(_) | SecretError::CreationInProgress(_) => {
+                ApiError::conflict
             }
-            SecretError::AlreadyExists(name) => {
-                ApiError::conflict(format!("Secret '{}' already exists", name))
+            SecretError::NotConfigured => ApiError::service_unavailable,
+            SecretError::InvalidName(_) => ApiError::bad_request,
+            SecretError::Backend(_) | SecretError::InvalidUtf8 | SecretError::Database(_) => {
+                ApiError::internal_error
             }
-            SecretError::CreationInProgress(name) => {
-                ApiError::conflict(format!(
-                    "Secret '{}' is being created by another process; delete it first if you want to retry",
-                    name
-                ))
-            }
-            SecretError::NotConfigured => {
-                ApiError::service_unavailable("Secret manager not configured")
-            }
-            SecretError::InvalidName(name) => ApiError::bad_request(format!(
-                "Invalid secret name '{}': must be 1-128 characters, alphanumeric with _ and - only",
-                name
-            )),
-            SecretError::Backend(msg) => {
-                ApiError::internal_error(format!("Backend error: {}", msg))
-            }
-            SecretError::InvalidUtf8 => ApiError::internal_error("Invalid UTF-8 in secret"),
-            SecretError::Database(msg) => {
-                ApiError::internal_error(format!("Database error: {}", msg))
-            }
-        }
+        };
+        constructor(e.to_string())
     }
 }

src/secrets/mod.rs

@@ -8,7 +8,7 @@ pub use encrypted_catalog_backend::{
     EncryptedCatalogBackend, PROVIDER_TYPE as ENCRYPTED_PROVIDER_TYPE,
 };
 pub use encryption::{decrypt, encrypt, DecryptError, EncryptError};
-pub use validation::{validate_and_normalize_name, ValidationError};
+pub use validation::validate_and_normalize_name;
 
 use crate::catalog::CatalogManager;
 use chrono::Utc;
@@ -94,14 +94,6 @@ pub enum SecretError {
     Database(String),
 }
 
-impl From<ValidationError> for SecretError {
-    fn from(e: ValidationError) -> Self {
-        match e {
-            ValidationError::InvalidSecretName(name) => SecretError::InvalidName(name),
-        }
-    }
-}
-
 impl From<BackendError> for SecretError {
     fn from(e: BackendError) -> Self {
         match e {

src/secrets/validation.rs

@@ -1,28 +1,22 @@
+use super::SecretError;
+
 /// Validates a secret name and returns the normalized (lowercase) form.
 /// Returns an error if the name doesn't match the allowed pattern.
 ///
 /// Valid names: 1-128 characters, alphanumeric with _ and - only.
-pub fn validate_and_normalize_name(name: &str) -> Result<String, ValidationError> {
+pub fn validate_and_normalize_name(name: &str) -> Result<String, SecretError> {
     if name.is_empty() || name.len() > 128 {
-        return Err(ValidationError::InvalidSecretName(name.to_string()));
+        return Err(SecretError::InvalidName(name.to_string()));
     }
     if !name
         .chars()
         .all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
     {
-        return Err(ValidationError::InvalidSecretName(name.to_string()));
+        return Err(SecretError::InvalidName(name.to_string()));
     }
     Ok(name.to_lowercase())
 }
 
-#[derive(Debug, thiserror::Error)]
-pub enum ValidationError {
-    #[error(
-        "Invalid secret name '{0:.128}': must be 1-128 characters, alphanumeric with _ and - only"
-    )]
-    InvalidSecretName(String),
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;