refactor: remove basilisk related variables

config/config.example.toml

@@ -139,12 +139,6 @@ connectors_with_delayed_session_response = "trustpay,payme" # List of connectors
 connectors_with_webhook_source_verification_call = "paypal" # List of connectors which has additional source verification api-call
 
 [jwekey] # 4 priv/pub key pair
-locker_key_identifier1 = ""     # key identifier for key rotation , should be same as basilisk
-locker_key_identifier2 = ""     # key identifier for key rotation , should be same as basilisk
-locker_encryption_key1 = ""     # public key 1 in pem format, corresponding private key in basilisk
-locker_encryption_key2 = ""     # public key 2 in pem format, corresponding private key in basilisk
-locker_decryption_key1 = ""     # private key 1 in pem format, corresponding public key in basilisk
-locker_decryption_key2 = ""     # private key 2 in pem format, corresponding public key in basilisk
 vault_encryption_key = ""       # public key in pem format, corresponding private key in basilisk-hs
 rust_locker_encryption_key = "" # public key in pem format, corresponding private key in rust locker
 vault_private_key = ""          # private key in pem format, corresponding public key in basilisk-hs

config/development.toml

@@ -80,12 +80,6 @@ fallback_api_key = "YOUR API KEY HERE"
 redis_lock_timeout = 26000
 
 [jwekey]
-locker_key_identifier1 = ""
-locker_key_identifier2 = ""
-locker_encryption_key1 = ""
-locker_encryption_key2 = ""
-locker_decryption_key1 = ""
-locker_decryption_key2 = ""
 vault_encryption_key = ""
 rust_locker_encryption_key = ""
 vault_private_key = ""

config/docker_compose.toml

@@ -58,12 +58,6 @@ mock_locker = true
 basilisk_host = ""
 
 [jwekey]
-locker_key_identifier1 = ""
-locker_key_identifier2 = ""
-locker_encryption_key1 = ""
-locker_encryption_key2 = ""
-locker_decryption_key1 = ""
-locker_decryption_key2 = ""
 vault_encryption_key = ""
 rust_locker_encryption_key = ""
 vault_private_key = ""

crates/router/src/configs/kms.rs

@@ -13,19 +13,11 @@ impl KmsDecrypt for settings::Jwekey {
         kms_client: &KmsClient,
     ) -> CustomResult<Self::Output, KmsError> {
         (
-            self.locker_encryption_key1,
-            self.locker_encryption_key2,
-            self.locker_decryption_key1,
-            self.locker_decryption_key2,
             self.vault_encryption_key,
             self.rust_locker_encryption_key,
             self.vault_private_key,
             self.tunnel_private_key,
         ) = tokio::try_join!(
-            kms_client.decrypt(self.locker_encryption_key1),
-            kms_client.decrypt(self.locker_encryption_key2),
-            kms_client.decrypt(self.locker_decryption_key1),
-            kms_client.decrypt(self.locker_decryption_key2),
             kms_client.decrypt(self.vault_encryption_key),
             kms_client.decrypt(self.rust_locker_encryption_key),
             kms_client.decrypt(self.vault_private_key),

crates/router/src/configs/settings.rs

@@ -499,12 +499,6 @@ pub struct EphemeralConfig {
 #[derive(Debug, Deserialize, Clone, Default)]
 #[serde(default)]
 pub struct Jwekey {
-    pub locker_key_identifier1: String,
-    pub locker_key_identifier2: String,
-    pub locker_encryption_key1: String,
-    pub locker_encryption_key2: String,
-    pub locker_decryption_key1: String,
-    pub locker_decryption_key2: String,
     pub vault_encryption_key: String,
     pub rust_locker_encryption_key: String,
     pub vault_private_key: String,

loadtest/config/development.toml

@@ -51,12 +51,6 @@ max_attempts = 10
 max_age = 365
 
 [jwekey]
-locker_key_identifier1 = ""
-locker_key_identifier2 = ""
-locker_encryption_key1 = ""
-locker_encryption_key2 = ""
-locker_decryption_key1 = ""
-locker_decryption_key2 = ""
 vault_encryption_key = ""
 rust_locker_encryption_key = ""
 vault_private_key = ""