diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5ce0e958da..26696fa470 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -189,7 +189,7 @@ jobs: - name: Cargo hack router if: env.router_changes_exist == 'true' - run: cargo hack check --each-feature --skip kms,basilisk,production,kv_store,accounts_cache,openapi --no-dev-deps -p router + run: cargo hack check --each-feature --skip kms,basilisk,kv_store,accounts_cache,openapi --no-dev-deps -p router - name: Cargo hack router_derive if: env.router_derive_changes_exist == 'true' @@ -361,7 +361,7 @@ jobs: - name: Cargo hack router if: env.router_changes_exist == 'true' - run: cargo hack check --each-feature --skip kms,basilisk,production,kv_store,accounts_cache,openapi --no-dev-deps -p router + run: cargo hack check --each-feature --skip kms,basilisk,kv_store,accounts_cache,openapi --no-dev-deps -p router - name: Cargo hack router_derive if: env.router_derive_changes_exist == 'true' @@ -374,7 +374,7 @@ jobs: - name: Cargo hack storage_models if: env.storage_models_changes_exist == 'true' run: cargo hack check --each-feature --no-dev-deps -p storage_models - + typos: name: Spell check runs-on: ubuntu-latest diff --git a/Dockerfile b/Dockerfile index 2805ee1832..fb92bd3acb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM rust:slim as builder -ARG RUN_ENV=sandbox ARG EXTRA_FEATURES="" RUN apt-get update \ @@ -33,7 +32,7 @@ ENV RUST_BACKTRACE="short" ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse" COPY . . -RUN cargo build --release --features ${RUN_ENV} ${EXTRA_FEATURES} +RUN cargo build --release --features release ${EXTRA_FEATURES} diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 3f29ca2408..76aa16a1d0 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -16,8 +16,7 @@ kms = ["external_services/kms","dep:aws-config"] email = ["external_services/email","dep:aws-config"] basilisk = ["kms"] stripe = ["dep:serde_qs"] -sandbox = ["kms", "stripe", "basilisk", "s3", "email"] -production = ["kms", "stripe", "basilisk", "s3", "email"] +release = ["kms", "stripe", "basilisk", "s3", "email"] olap = [] oltp = [] kv_store = [] diff --git a/crates/router/src/core/payment_methods/transformers.rs b/crates/router/src/core/payment_methods/transformers.rs index e65ee980c0..69fa59f906 100644 --- a/crates/router/src/core/payment_methods/transformers.rs +++ b/crates/router/src/core/payment_methods/transformers.rs @@ -241,11 +241,7 @@ pub async fn mk_add_card_request_hs( customer_id: &str, merchant_id: &str, ) -> CustomResult { - let merchant_customer_id = if cfg!(feature = "sandbox") { - format!("{customer_id}::{merchant_id}") - } else { - customer_id.to_owned() - }; + let merchant_customer_id = customer_id.to_owned(); let card = Card { card_number: card.card_number.to_owned(), name_on_card: card.card_holder_name.to_owned(), @@ -359,7 +355,7 @@ pub fn mk_add_card_request( locker_id: &str, merchant_id: &str, ) -> CustomResult { - let customer_id = if cfg!(feature = "sandbox") { + let customer_id = if cfg!(feature = "release") { format!("{customer_id}::{merchant_id}") } else { customer_id.to_owned() @@ -398,11 +394,7 @@ pub async fn mk_get_card_request_hs( merchant_id: &str, card_reference: &str, ) -> CustomResult { - let merchant_customer_id = if cfg!(feature = "sandbox") { - format!("{customer_id}::{merchant_id}") - } else { - customer_id.to_owned() - }; + let merchant_customer_id = customer_id.to_owned(); let card_req_body = CardReqBody { merchant_id, merchant_customer_id, @@ -482,11 +474,7 @@ pub async fn mk_delete_card_request_hs( merchant_id: &str, card_reference: &str, ) -> CustomResult { - let merchant_customer_id = if cfg!(feature = "sandbox") { - format!("{customer_id}::{merchant_id}") - } else { - customer_id.to_owned() - }; + let merchant_customer_id = customer_id.to_owned(); let card_req_body = CardReqBody { merchant_id, merchant_customer_id,