rename components

crates/external_services/src/aws_kms.rs

@@ -163,7 +163,7 @@ impl SecretManagementInterface for AwsKmsClient {
     ) -> CustomResult<Secret<String>, SecretsManagementError> {
         self.decrypt(input.peek())
             .await
-            .change_context(SecretsManagementError::DecryptionFailed)
+            .change_context(SecretsManagementError::FetchSecretFailed)
             .map(Into::into)
     }
 }

crates/external_services/src/hashicorp_vault.rs

@@ -238,7 +238,7 @@ impl SecretManagementInterface for HashiCorpVault {
         self.fetch::<Kv2, Secret<String>>(input.expose())
             .await
             .map(|val| val.expose().to_owned())
-            .change_context(SecretsManagementError::DecryptionFailed)
+            .change_context(SecretsManagementError::FetchSecretFailed)
             .map(Into::into)
     }
 }

crates/external_services/src/no_encryption.rs

@@ -44,6 +44,6 @@ impl SecretManagementInterface for NoEncryption {
         String::from_utf8(self.decrypt(input.expose()))
             .map(Into::into)
             .into_report()
-            .change_context(SecretsManagementError::DecryptionFailed)
+            .change_context(SecretsManagementError::FetchSecretFailed)
     }
 }

crates/external_services/src/secrets_management.rs

@@ -55,16 +55,12 @@ impl SecretsManagementConfig {
     ) -> CustomResult<Box<dyn SecretManagementInterface>, SecretsManagementError> {
         match self {
             #[cfg(feature = "aws_kms")]
-            Self::AwsKms { aws_kms } => Ok::<_, error_stack::Report<SecretsManagementError>>(
-                Box::new(aws_kms::AwsKmsClient::new(aws_kms).await),
-            ),
+            Self::AwsKms { aws_kms } => Ok(Box::new(aws_kms::AwsKmsClient::new(aws_kms).await)),
             #[cfg(feature = "hashicorp-vault")]
             Self::HashiCorpVault { hc_vault } => hashicorp_vault::HashiCorpVault::new(hc_vault)
                 .change_context(SecretsManagementError::ClientCreationFailed)
                 .map(|inner| -> Box<dyn SecretManagementInterface> { Box::new(inner) }),
-            Self::NoEncryption => {
-                Ok::<_, error_stack::Report<SecretsManagementError>>(Box::new(NoEncryption))
-            }
+            Self::NoEncryption => Ok(Box::new(NoEncryption)),
         }
     }
 }

crates/secrets_interface/src/lib.rs

@@ -2,9 +2,9 @@
 
 #![warn(missing_docs, missing_debug_implementations)]
 
-pub mod decryption;
+pub mod secret_handler;
 
-pub mod type_state;
+pub mod secret_state;
 
 use common_utils::errors::CustomResult;
 use masking::Secret;
@@ -28,15 +28,11 @@ pub trait SecretManagementInterface: Send + Sync {
 /// Errors that may occur during secret management
 #[derive(Debug, thiserror::Error)]
 pub enum SecretsManagementError {
-    /// An error occurred when decrypting input data.
-    #[error("Failed to decrypt input data")]
-    DecryptionFailed,
-
-    /// An error occurred when encrypting input data.
-    #[error("Failed to encrypt input data")]
-    EncryptionFailed,
+    /// An error occurred when retrieving raw data.
+    #[error("Failed to fetch the raw data")]
+    FetchSecretFailed,
 
     /// Failed while creating kms client
-    #[error("Failed while creating a new client")]
+    #[error("Failed while creating a secrets management client")]
     ClientCreationFailed,
 }

crates/secrets_interface/src/decryption.rs → crates/secrets_interface/src/secret_handler.rs

@@ -3,7 +3,7 @@
 use common_utils::errors::CustomResult;
 
 use crate::{
-    type_state::{RawSecret, SecretStateContainer, SecuredSecret},
+    secret_state::{RawSecret, SecretStateContainer, SecuredSecret},
     SecretManagementInterface, SecretsManagementError,
 };
 
@@ -13,8 +13,8 @@ pub trait SecretsHandler
 where
     Self: Sized,
 {
-    /// Retrieve the raw value and transitions its type to `Decrypted`
-    async fn decrypt(
+    /// Construct `Self` with raw secret value and transitions its type from `SecuredSecret` to `RawSecret`
+    async fn convert_to_raw_secret(
         value: SecretStateContainer<Self, SecuredSecret>,
         kms_client: Box<dyn SecretManagementInterface>,
     ) -> CustomResult<SecretStateContainer<Self, RawSecret>, SecretsManagementError>;

crates/secrets_interface/src/type_state.rs → crates/secrets_interface/src/secret_state.rs

@@ -4,7 +4,7 @@ use std::marker::PhantomData;
 
 use serde::{Deserialize, Deserializer};
 
-/// Trait defining encryption states
+/// Trait defining the states of a secret
 pub trait SecretState {}
 
 /// Decrypted state
@@ -57,8 +57,8 @@ impl<'de, T: Deserialize<'de>, S: SecretState> Deserialize<'de> for SecretStateC
 }
 
 impl<T> SecretStateContainer<T, SecuredSecret> {
-    /// Decrypts the inner value using the provided decryption function
-    pub fn decrypt(
+    /// Transition the secret state from `SecuredSecret` to `RawSecret`
+    pub fn transition_state(
         mut self,
         decryptor_fn: impl FnOnce(T) -> T,
     ) -> SecretStateContainer<T, RawSecret> {