Merge branch 'main' of github.com:juspay/hyperswitch into pm-v2-domain

.github/workflows/CI-pr.yml

@@ -302,25 +302,13 @@ jobs:
       - name: Install rust cache
         uses: Swatinem/[email protected]
 
-      - name: Install cargo-hack
-        uses: taiki-e/[email protected]
-        with:
-          tool: cargo-hack
-          checksum: true
 
       - name: Install just
         uses: taiki-e/[email protected]
         with:
           tool: just
           checksum: true
 
-      - name: Run cargo-hack on v2 features in select crates
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-          RUSTFLAGS: "-D warnings -A clippy::todo"
-        run: just hack_v2
-
       - name: Run cargo check with v2 features enabled
         shell: bash
         # env:

Dockerfile

@@ -1,6 +1,7 @@
 FROM rust:bookworm as builder
 
 ARG EXTRA_FEATURES=""
+ARG VERSION_FEATURE_SET="v1"
 
 RUN apt-get update \
     && apt-get install -y libpq-dev libssl-dev pkg-config
@@ -32,7 +33,12 @@ ENV RUST_BACKTRACE="short"
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse"
 
 COPY . .
-RUN cargo build --release --features release ${EXTRA_FEATURES}
+RUN cargo build \
+    --release \
+    --no-default-features \
+    --features release \
+    --features ${VERSION_FEATURE_SET} \
+    ${EXTRA_FEATURES}
 
 
 

Makefile

@@ -112,4 +112,4 @@ precommit : fmt clippy test
 
 
 hack:
-	cargo hack check --workspace --each-feature --all-targets --exclude-features 'v2 merchant_account_v2 payment_v2'
+	cargo hack check --workspace --each-feature --all-targets --exclude-features 'v2 payment_v2'

crates/analytics/Cargo.toml

@@ -7,7 +7,6 @@ rust-version.workspace = true
 license.workspace = true
 
 [features]
-default = ["v1"]
 v1 = ["api_models/v1", "diesel_models/v1", "hyperswitch_domain_models/v1", "storage_impl/v1"]
 v2 = ["api_models/v2", "diesel_models/v2", "hyperswitch_domain_models/v2", "storage_impl/v2"]
 

crates/api_models/Cargo.toml

@@ -8,7 +8,6 @@ readme = "README.md"
 license.workspace = true
 
 [features]
-default = ["v1"]
 errors = ["dep:actix-web", "dep:reqwest"]
 dummy_connector = ["euclid/dummy_connector", "common_enums/dummy_connector"]
 detailed_errors = []
@@ -18,14 +17,10 @@ olap = []
 openapi = ["common_enums/openapi", "olap", "recon", "dummy_connector", "olap"]
 recon = []
 v1 = ["common_utils/v1"]
-v2 = ["common_utils/v2"]
-business_profile_v2 = []
+v2 = ["common_utils/v2", "customer_v2"]
 customer_v2 = ["common_utils/customer_v2"]
-merchant_account_v2 = []
-merchant_connector_account_v2 = []
 payment_v2 = []
 payment_methods_v2 = []
-routing_v2 = []
 
 [dependencies]
 actix-web = { version = "4.5.1", optional = true }