chore: address comments and fix cargo hack

juspay · Nov 2, 2023 · 88ca5ee · 88ca5ee
1 parent f8d7ac0
commit 88ca5ee
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 27 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-release = ["middleware", "key_custodian"]
 default = []
+release = ["kms", "middleware", "key_custodian"]
 kms = ["dep:aws-config", "dep:aws-sdk-kms"]
 middleware = []
 key_custodian = []

diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
-
+docker-build:
+	docker build -t locker .
 
 docker-run:
 	docker run -v `pwd`/config/docker-configuration.toml:/local/config/development.toml -p 8080:8080 -d locker

diff --git a/src/app.rs b/src/app.rs
@@ -137,31 +137,37 @@ impl AppState {
                 .change_context(error::ConfigurationError::KmsDecryptError("master_key"))?;
             config.secrets.master_key = kms_decrypted_master_key.data;
 
-            let tenant_public_key_kms_input: KmsData<Base64Encoded> =
-                KmsData::new(config.secrets.tenant_public_key.peek().clone());
-            let kms_decrypted_tenant_public_key: KmsData<Raw> = kms_client
-                .decrypt(tenant_public_key_kms_input)
-                .await
-                .change_context(error::ConfigurationError::KmsDecryptError(
-                    "tenant_public_key",
-                ))?;
-            config.secrets.tenant_public_key =
-                String::from_utf8(kms_decrypted_tenant_public_key.data)
-                    .expect("Failed while converting bytes to String")
-                    .into();
-
-            let locker_private_key_kms_input: KmsData<Base64Encoded> =
-                KmsData::new(config.secrets.locker_private_key.peek().clone());
-            let kms_decrypted_locker_private_key: KmsData<Raw> = kms_client
-                .decrypt(locker_private_key_kms_input)
-                .await
-                .change_context(error::ConfigurationError::KmsDecryptError(
-                    "locker_private_key",
-                ))?;
-            config.secrets.locker_private_key =
-                String::from_utf8(kms_decrypted_locker_private_key.data)
-                    .expect("Failed while converting bytes to String")
-                    .into();
+            #[cfg(feature = "middleware")]
+            {
+                let tenant_public_key_kms_input: KmsData<Base64Encoded> =
+                    KmsData::new(config.secrets.tenant_public_key.peek().clone());
+                let kms_decrypted_tenant_public_key: KmsData<Raw> = kms_client
+                    .decrypt(tenant_public_key_kms_input)
+                    .await
+                    .change_context(error::ConfigurationError::KmsDecryptError(
+                        "tenant_public_key",
+                    ))?;
+                config.secrets.tenant_public_key =
+                    String::from_utf8(kms_decrypted_tenant_public_key.data)
+                        .expect("Failed while converting bytes to String")
+                        .into();
+            }
+
+            #[cfg(feature = "middleware")]
+            {
+                let locker_private_key_kms_input: KmsData<Base64Encoded> =
+                    KmsData::new(config.secrets.locker_private_key.peek().clone());
+                let kms_decrypted_locker_private_key: KmsData<Raw> = kms_client
+                    .decrypt(locker_private_key_kms_input)
+                    .await
+                    .change_context(error::ConfigurationError::KmsDecryptError(
+                        "locker_private_key",
+                    ))?;
+                config.secrets.locker_private_key =
+                    String::from_utf8(kms_decrypted_locker_private_key.data)
+                        .expect("Failed while converting bytes to String")
+                        .into();
+            }
 
             let db_password_kms_input: KmsData<Base64Encoded> =
                 KmsData::new(config.database.password.peek().clone());