Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into core-changes-for-exte…
Browse files Browse the repository at this point in the history
…nded-authorization
  • Loading branch information
hrithikesh026 committed Feb 25, 2025
2 parents 4c3ac18 + 9f334c1 commit b72bba6
Show file tree
Hide file tree
Showing 800 changed files with 48,627 additions and 16,078 deletions.
2 changes: 1 addition & 1 deletion .deepsource.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ name = "rust"
enabled = true

[analyzers.meta]
msrv = "1.78.0"
msrv = "1.80.0"
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ crates/router/src/services/ @juspay/hyperswitch-framework
crates/router/src/db/ @juspay/hyperswitch-framework
crates/router/src/routes/ @juspay/hyperswitch-framework
migrations/ @juspay/hyperswitch-framework
v2_migrations/ @juspay/hyperswitch-framework
api-reference/ @juspay/hyperswitch-framework
api-reference-v2/ @juspay/hyperswitch-framework
Cargo.toml @juspay/hyperswitch-framework
Expand Down Expand Up @@ -66,6 +67,9 @@ crates/router/src/core/routing @juspay/hyperswitch-routing
crates/router/src/core/routing.rs @juspay/hyperswitch-routing
crates/router/src/core/payments/routing @juspay/hyperswitch-routing
crates/router/src/core/payments/routing.rs @juspay/hyperswitch-routing
crates/external_services/src/grpc_client/dynamic_routing.rs @juspay/hyperswitch-routing
crates/external_services/src/grpc_client/dynamic_routing/ @juspay/hyperswitch-routing
crates/external_services/src/grpc_client/health_check_client.rs @juspay/hyperswitch-routing

crates/api_models/src/payment_methods.rs @juspay/hyperswitch-routing
crates/router/src/core/payment_methods.rs @juspay/hyperswitch-routing
Expand Down
1 change: 1 addition & 0 deletions .github/data/cards_info.csv
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ card_iin,card_issuer,card_network,card_type,card_subtype,card_issuing_country,ba
491761,BANKPOLSKAKASAOPIEKIS.A.(BANKPEKAOSA),Visa,CREDIT,BUSINESS,POLAND,,,,2015-09-07 12:58:50,,
510510,BANKOFHAWAII,Mastercard,CREDIT,,UNITEDSTATES,,,,2015-07-30 05:18:28,,
520474,MASTERCARD INTERNATIONAL,Visa,DEBIT,,UNITEDSTATES,,,840,2016-05-12 18:51:16,2022-12-12 15:17:33,Visa
378282,AmericanExpress,AmericanExpress,CREDIT,SMALLCORPORATE,INDIA,107,JP_AMEX,,2015-07-25 06:22:06,2021-02-23 07:37:55,
40 changes: 26 additions & 14 deletions .github/workflows/CI-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:

env:
# Use `sccache` for caching compilation artifacts
RUSTC_WRAPPER: sccache
# RUSTC_WRAPPER: sccache
RUSTFLAGS: "-D warnings"

strategy:
Expand Down Expand Up @@ -126,11 +126,16 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install sccache
uses: taiki-e/[email protected]
with:
tool: sccache
checksum: true
# - name: Install sccache
# uses: taiki-e/[email protected]
# with:
# tool: sccache
# checksum: true

- name: Install rust cache
uses: Swatinem/[email protected]
with:
save-if: false

- name: Install cargo-hack
uses: taiki-e/[email protected]
Expand Down Expand Up @@ -181,7 +186,7 @@ jobs:

env:
# Use `sccache` for caching compilation artifacts
RUSTC_WRAPPER: sccache
# RUSTC_WRAPPER: sccache
RUSTFLAGS: "-D warnings"

strategy:
Expand Down Expand Up @@ -229,11 +234,16 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install sccache
uses: taiki-e/[email protected]
with:
tool: sccache
checksum: true
# - name: Install sccache
# uses: taiki-e/[email protected]
# with:
# tool: sccache
# checksum: true

- name: Install rust cache
uses: Swatinem/[email protected]
with:
save-if: false

- name: Install cargo-hack
uses: taiki-e/[email protected]
Expand All @@ -259,7 +269,7 @@ jobs:

- name: Run clippy
shell: bash
run: just clippy --jobs 2
run: just clippy

- name: Check Cargo.lock changed
if: ${{ (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) }}
Expand Down Expand Up @@ -315,7 +325,9 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install rust cache
uses: Swatinem/[email protected]
uses: Swatinem/[email protected]
with:
save-if: false

- name: Install just
uses: taiki-e/[email protected]
Expand Down
40 changes: 20 additions & 20 deletions .github/workflows/CI-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

env:
# Use `sccache` for caching compilation artifacts
RUSTC_WRAPPER: sccache
# RUSTC_WRAPPER: sccache
RUSTFLAGS: "-D warnings"

strategy:
Expand Down Expand Up @@ -78,15 +78,15 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install sccache
uses: taiki-e/[email protected]
with:
tool: sccache
checksum: true

# - uses: Swatinem/[email protected]
# - name: Install sccache
# uses: taiki-e/[email protected]
# with:
# save-if: ${{ github.event_name == 'push' }}
# tool: sccache
# checksum: true

- uses: Swatinem/[email protected]
with:
save-if: ${{ github.event_name == 'push' }}

- name: Install cargo-hack
uses: baptiste0928/[email protected]
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:

env:
# Use `sccache` for caching compilation artifacts
RUSTC_WRAPPER: sccache
# RUSTC_WRAPPER: sccache
RUSTFLAGS: "-D warnings"

strategy:
Expand Down Expand Up @@ -170,11 +170,11 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install sccache
uses: taiki-e/[email protected]
with:
tool: sccache
checksum: true
# - name: Install sccache
# uses: taiki-e/[email protected]
# with:
# tool: sccache
# checksum: true

- name: Install cargo-hack
uses: baptiste0928/[email protected]
Expand All @@ -196,13 +196,13 @@ jobs:
# with:
# crate: cargo-nextest

# - uses: Swatinem/[email protected].0
# with:
# save-if: ${{ github.event_name == 'push' }}
- uses: Swatinem/[email protected].7
with:
save-if: ${{ github.event_name == 'push' }}

- name: Run clippy
shell: bash
run: just clippy --jobs 2
run: just clippy

- name: Cargo hack
if: ${{ github.event_name == 'push' }}
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install rust cache
uses: Swatinem/[email protected].0
uses: Swatinem/[email protected].7

- name: Run cargo check enabling only the release and v2 features
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/connector-sanity-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ jobs:
with:
toolchain: stable 2 weeks ago

- uses: Swatinem/[email protected].0
with:
cache-bin: "false"
- uses: Swatinem/[email protected].7
with:
save-if: false

- name: Decrypt connector auth file
env:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/connector-ui-sanity-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ jobs:
toolchain: stable

- name: Build and Cache Rust Dependencies
uses: Swatinem/[email protected]
uses: Swatinem/[email protected]
with:
save-if: false

- name: Install Diesel CLI with Postgres Support
uses: baptiste0928/[email protected]
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/cypress-tests-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: "20"

- name: Install Cypress and dependencies
run: |
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
CONNECTOR_AUTH_PASSPHRASE: ${{ secrets.CONNECTOR_AUTH_PASSPHRASE }}
CONNECTOR_CREDS_S3_BUCKET_URI: ${{ secrets.CONNECTOR_CREDS_S3_BUCKET_URI}}
DESTINATION_FILE_NAME: "creds.json.gpg"
S3_SOURCE_FILE_NAME: "5b3ebdad-1067-421b-83e5-3ceb73c3eeeb.json.gpg"
S3_SOURCE_FILE_NAME: "57a07166-894a-4f43-b4b5-ee1155138ec9.json.gpg"
shell: bash
run: |
mkdir -p ".github/secrets" ".github/test"
Expand Down Expand Up @@ -189,8 +189,7 @@ jobs:
if: ${{ env.RUN_TESTS == 'true' }}
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
node-version: "20"

- name: Install Cypress and dependencies
if: ${{ env.RUN_TESTS == 'true' }}
Expand Down Expand Up @@ -377,8 +376,7 @@ jobs:
if: ${{ env.RUN_TESTS == 'true' }}
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
node-version: "20"

- name: Install Cypress and dependencies
if: ${{ env.RUN_TESTS == 'true' }}
Expand Down Expand Up @@ -466,4 +464,4 @@ jobs:
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ${{ env.CODECOV_FILE }}
disable_search: true
disable_search: true
2 changes: 1 addition & 1 deletion .github/workflows/nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
system: [x86_64-linux, aarch64-darwin]
steps:
- uses: actions/checkout@v4
- run: om ci --extra-access-tokens ${{ secrets.GITHUB_TOKEN }} run --systems "${{ matrix.system }}"
- run: om ci run --extra-access-tokens ${{ secrets.GITHUB_TOKEN }} --systems "${{ matrix.system }}"
4 changes: 3 additions & 1 deletion .github/workflows/postman-collection-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ jobs:

- name: Build and Cache Rust Dependencies
if: ${{ ((github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name)) || (github.event_name == 'merge_group')}}
uses: Swatinem/[email protected]
uses: Swatinem/[email protected]
with:
save-if: false

- name: Install Protoc
if: ${{ ((github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name)) || (github.event_name == 'merge_group')}}
Expand Down
20 changes: 20 additions & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,26 @@ ws2tcpip = "ws2tcpip" # WinSock Extension
ZAR = "ZAR" # South African Rand currency code
JOD = "JOD" # Jordan currency code
Payed = "Payed" # Paid status for digital virgo
Alo = "Alo" # Is iso representation of a state in France
alo = "alo" # Is iso representation of a state in France
BRE = "BRE" # Is iso representation of Brittany
VasCounty = "VasCounty" # Is a state in Hungary
StipMunicipality = "StipMunicipality" # Is a municipality in North Macedonia
HAV = "HAV" # Is iso representation of a state in UK
LEW = "LEW" # Is iso representation of a state in UK
THR = "THR" # Is iso representation of a state in UK
WLL = "WLL" # Is iso representation of a state in UK
WIL = "WIL" # Is iso representation of a state in UK
YOR = "YOR" # Is iso representation of a state in UK
OT = "OT" # Is iso representation of a state in Romania
OltCounty = "OltCounty" # Is a state in Romania
olt = "olt" # Is iso representation of a state in Romania
Vas = "Vas" # Is iso representation of a state in Hungary
vas = "vas" # Is iso representation of a state in Hungary
WHT = "WHT" # Is iso representation of a state in Belgium
CantonOfEschSurAlzette = "CantonOfEschSurAlzette" # Is a state in Luxembourg
GorenjaVasPoljane = "GorenjaVasPoljane" # Is a state in Slovenia
sur = "sur" # Is iso representation of a state in Luxembourg

[default.extend-words]
aci = "aci" # Name of a connector
Expand Down
Loading

0 comments on commit b72bba6

Please sign in to comment.