refactor: rename kms feature flag to aws_kms (#3249)

Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
This commit is contained in:
Chethan Rao
2024-02-02 15:48:29 +05:30
committed by GitHub
parent d283053e5e
commit 91519d8462
40 changed files with 507 additions and 486 deletions

View File

@ -4,10 +4,10 @@ use api_models::enums;
use common_utils::{date_time, errors::CustomResult, events::ApiEventMetric, ext_traits::AsyncExt};
use currency_conversion::types::{CurrencyFactors, ExchangeRates};
use error_stack::{IntoReport, ResultExt};
#[cfg(feature = "aws_kms")]
use external_services::aws_kms;
#[cfg(feature = "hashicorp-vault")]
use external_services::hashicorp_vault::{self, decrypt::VaultFetch};
#[cfg(feature = "kms")]
use external_services::kms;
use masking::PeekInterface;
use once_cell::sync::Lazy;
use redis_interface::DelReply;
@ -65,8 +65,8 @@ pub enum ForexCacheError {
LocalWriteError,
#[error("Json Parsing error")]
ParsingError,
#[error("Kms decryption error")]
KmsDecryptionFailed,
#[error("Aws Kms decryption error")]
AwsKmsDecryptionFailed,
#[error("Error connecting to redis")]
RedisConnectionError,
#[error("Not able to release write lock")]
@ -128,7 +128,7 @@ async fn waited_fetch_and_update_caches(
state: &AppState,
local_fetch_retry_delay: u64,
local_fetch_retry_count: u64,
#[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
#[cfg(feature = "aws_kms")] aws_kms_config: &aws_kms::AwsKmsConfig,
#[cfg(feature = "hashicorp-vault")]
hc_config: &external_services::hashicorp_vault::HashiCorpVaultConfig,
) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
@ -151,8 +151,8 @@ async fn waited_fetch_and_update_caches(
successive_fetch_and_save_forex(
state,
None,
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -192,7 +192,7 @@ pub async fn get_forex_rates(
call_delay: i64,
local_fetch_retry_delay: u64,
local_fetch_retry_count: u64,
#[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
#[cfg(feature = "aws_kms")] aws_kms_config: &aws_kms::AwsKmsConfig,
#[cfg(feature = "hashicorp-vault")]
hc_config: &external_services::hashicorp_vault::HashiCorpVaultConfig,
) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
@ -203,8 +203,8 @@ pub async fn get_forex_rates(
state,
call_delay,
local_rates,
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -220,8 +220,8 @@ pub async fn get_forex_rates(
call_delay,
local_fetch_retry_delay,
local_fetch_retry_count,
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -234,7 +234,7 @@ async fn handler_local_no_data(
call_delay: i64,
_local_fetch_retry_delay: u64,
_local_fetch_retry_count: u64,
#[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
#[cfg(feature = "aws_kms")] aws_kms_config: &aws_kms::AwsKmsConfig,
#[cfg(feature = "hashicorp-vault")]
hc_config: &external_services::hashicorp_vault::HashiCorpVaultConfig,
) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
@ -244,8 +244,8 @@ async fn handler_local_no_data(
state,
data,
call_delay,
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -256,8 +256,8 @@ async fn handler_local_no_data(
Ok(successive_fetch_and_save_forex(
state,
None,
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -268,8 +268,8 @@ async fn handler_local_no_data(
Ok(successive_fetch_and_save_forex(
state,
None,
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -281,7 +281,7 @@ async fn handler_local_no_data(
async fn successive_fetch_and_save_forex(
state: &AppState,
stale_redis_data: Option<FxExchangeRatesCacheEntry>,
#[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
#[cfg(feature = "aws_kms")] aws_kms_config: &aws_kms::AwsKmsConfig,
#[cfg(feature = "hashicorp-vault")]
hc_config: &external_services::hashicorp_vault::HashiCorpVaultConfig,
) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
@ -292,8 +292,8 @@ async fn successive_fetch_and_save_forex(
}
let api_rates = fetch_forex_rates(
state,
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -305,8 +305,8 @@ async fn successive_fetch_and_save_forex(
logger::error!(?err);
let secondary_api_rates = fallback_fetch_forex_rates(
state,
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -351,7 +351,7 @@ async fn fallback_forex_redis_check(
state: &AppState,
redis_data: FxExchangeRatesCacheEntry,
call_delay: i64,
#[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
#[cfg(feature = "aws_kms")] aws_kms_config: &aws_kms::AwsKmsConfig,
#[cfg(feature = "hashicorp-vault")]
hc_config: &external_services::hashicorp_vault::HashiCorpVaultConfig,
) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
@ -367,8 +367,8 @@ async fn fallback_forex_redis_check(
successive_fetch_and_save_forex(
state,
Some(redis_data),
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -381,7 +381,7 @@ async fn handler_local_expired(
state: &AppState,
call_delay: i64,
local_rates: FxExchangeRatesCacheEntry,
#[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
#[cfg(feature = "aws_kms")] aws_kms_config: &aws_kms::AwsKmsConfig,
#[cfg(feature = "hashicorp-vault")]
hc_config: &external_services::hashicorp_vault::HashiCorpVaultConfig,
) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
@ -400,8 +400,8 @@ async fn handler_local_expired(
successive_fetch_and_save_forex(
state,
Some(local_rates),
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -415,8 +415,8 @@ async fn handler_local_expired(
successive_fetch_and_save_forex(
state,
Some(local_rates),
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)
@ -427,7 +427,7 @@ async fn handler_local_expired(
async fn fetch_forex_rates(
state: &AppState,
#[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
#[cfg(feature = "aws_kms")] aws_kms_config: &aws_kms::AwsKmsConfig,
#[cfg(feature = "hashicorp-vault")]
hc_config: &external_services::hashicorp_vault::HashiCorpVaultConfig,
@ -436,7 +436,7 @@ async fn fetch_forex_rates(
#[cfg(feature = "hashicorp-vault")]
let client = hashicorp_vault::get_hashicorp_client(hc_config)
.await
.change_context(ForexCacheError::KmsDecryptionFailed)?;
.change_context(ForexCacheError::AwsKmsDecryptionFailed)?;
#[cfg(not(feature = "hashicorp-vault"))]
let output = state.conf.forex_api.api_key.clone();
@ -448,19 +448,19 @@ async fn fetch_forex_rates(
.clone()
.fetch_inner::<hashicorp_vault::Kv2>(client)
.await
.change_context(ForexCacheError::KmsDecryptionFailed)?;
.change_context(ForexCacheError::AwsKmsDecryptionFailed)?;
Ok::<_, error_stack::Report<ForexCacheError>>(output)
}
.await?;
#[cfg(feature = "kms")]
let forex_api_key = kms::get_kms_client(kms_config)
#[cfg(feature = "aws_kms")]
let forex_api_key = aws_kms::get_aws_kms_client(aws_kms_config)
.await
.decrypt(forex_api_key.peek())
.await
.change_context(ForexCacheError::KmsDecryptionFailed)?;
.change_context(ForexCacheError::AwsKmsDecryptionFailed)?;
#[cfg(not(feature = "kms"))]
#[cfg(not(feature = "aws_kms"))]
let forex_api_key = forex_api_key.peek();
let forex_url: String = format!("{}{}{}", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);
@ -516,7 +516,7 @@ async fn fetch_forex_rates(
pub async fn fallback_fetch_forex_rates(
state: &AppState,
#[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
#[cfg(feature = "aws_kms")] aws_kms_config: &aws_kms::AwsKmsConfig,
#[cfg(feature = "hashicorp-vault")]
hc_config: &external_services::hashicorp_vault::HashiCorpVaultConfig,
) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {
@ -524,7 +524,7 @@ pub async fn fallback_fetch_forex_rates(
#[cfg(feature = "hashicorp-vault")]
let client = hashicorp_vault::get_hashicorp_client(hc_config)
.await
.change_context(ForexCacheError::KmsDecryptionFailed)?;
.change_context(ForexCacheError::AwsKmsDecryptionFailed)?;
#[cfg(not(feature = "hashicorp-vault"))]
let output = state.conf.forex_api.fallback_api_key.clone();
@ -536,19 +536,19 @@ pub async fn fallback_fetch_forex_rates(
.clone()
.fetch_inner::<hashicorp_vault::Kv2>(client)
.await
.change_context(ForexCacheError::KmsDecryptionFailed)?;
.change_context(ForexCacheError::AwsKmsDecryptionFailed)?;
Ok::<_, error_stack::Report<ForexCacheError>>(output)
}
.await?;
#[cfg(feature = "kms")]
let fallback_forex_api_key = kms::get_kms_client(kms_config)
#[cfg(feature = "aws_kms")]
let fallback_forex_api_key = aws_kms::get_aws_kms_client(aws_kms_config)
.await
.decrypt(fallback_api_key.peek())
.await
.change_context(ForexCacheError::KmsDecryptionFailed)?;
.change_context(ForexCacheError::AwsKmsDecryptionFailed)?;
#[cfg(not(feature = "kms"))]
#[cfg(not(feature = "aws_kms"))]
let fallback_forex_api_key = fallback_api_key.peek();
let fallback_forex_url: String =
@ -691,7 +691,7 @@ pub async fn convert_currency(
amount: i64,
to_currency: String,
from_currency: String,
#[cfg(feature = "kms")] kms_config: &kms::KmsConfig,
#[cfg(feature = "aws_kms")] aws_kms_config: &aws_kms::AwsKmsConfig,
#[cfg(feature = "hashicorp-vault")]
hc_config: &external_services::hashicorp_vault::HashiCorpVaultConfig,
) -> CustomResult<api_models::currency::CurrencyConversionResponse, ForexCacheError> {
@ -700,8 +700,8 @@ pub async fn convert_currency(
state.conf.forex_api.call_delay,
state.conf.forex_api.local_fetch_retry_delay,
state.conf.forex_api.local_fetch_retry_count,
#[cfg(feature = "kms")]
kms_config,
#[cfg(feature = "aws_kms")]
aws_kms_config,
#[cfg(feature = "hashicorp-vault")]
hc_config,
)