Skip to content

Commit 18e5d31

Browse files
prajjwalkumar17prajjwalkumar17
authored
Merge branch 'main' into feat/block_paymentmethod
2 parents 947d197 + 8626bda commit 18e5d31

File tree

74 files changed

+47024
-46924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+47024
-46924
lines changed

‎.github/workflows/release-nightly-version-reusable.yml‎

Lines changed: 19 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@ name: Create a nightly tag
33
on:
44
workflow_call:
55
secrets:
6-
app_id:
7-
description: App ID for the GitHub app
8-
required: true
9-
app_private_key:
10-
description: Private key for the GitHub app
6+
token:
7+
description: GitHub token for authenticating with GitHub
118
required: true
129
outputs:
1310
tag:
@@ -31,23 +28,17 @@ jobs:
3128
runs-on: ubuntu-latest
3229

3330
steps:
34-
- name: Generate GitHub app token
35-
id: generate_app_token
36-
uses: actions/create-github-app-token@v1
37-
with:
38-
app-id: ${{ secrets.app_id }}
39-
private-key: ${{ secrets.app_private_key }}
40-
4131
- name: Checkout repository
4232
uses: actions/checkout@v4
4333
with:
4434
fetch-depth: 0
35+
token: ${{ secrets.token }}
4536

4637
- name: Check if the workflow is run on an allowed branch
4738
shell: bash
4839
run: |
49-
if [[ "${{github.ref}}" != "refs/heads/${ALLOWED_BRANCH_NAME}" ]]; then
50-
echo "::error::This workflow is expected to be run from the '${ALLOWED_BRANCH_NAME}' branch. Current branch: '${{github.ref}}'"
40+
if [[ "${{ github.ref }}" != "refs/heads/${ALLOWED_BRANCH_NAME}" ]]; then
41+
echo "::error::This workflow is expected to be run from the '${ALLOWED_BRANCH_NAME}' branch. Current branch: '${{ github.ref }}'"
5142
exit 1
5243
fi
5344
@@ -139,62 +130,22 @@ jobs:
139130
}' CHANGELOG.md
140131
rm release-notes.md
141132
142-
# We make use of GitHub API calls to commit and tag the changelog instead of the simpler
143-
# `git commit`, `git tag` and `git push` commands to have signed commits and tags
144-
- name: Commit generated changelog and create tag
133+
- name: Set git configuration
134+
shell: bash
135+
run: |
136+
git config --local user.name 'github-actions'
137+
git config --local user.email '41898282+github-actions[bot]@users.noreply.github.com'
138+
139+
- name: Commit, tag and push generated changelog
145140
shell: bash
146-
env:
147-
GH_TOKEN: ${{ steps.generate_app_token.outputs.token }}
148141
run: |
149-
HEAD_COMMIT="$(git rev-parse 'HEAD^{commit}')"
150-
151-
# Create a tree based on the HEAD commit of the current branch and updated changelog file
152-
TREE_SHA="$(
153-
gh api \
154-
--method POST \
155-
--header 'Accept: application/vnd.github+json' \
156-
--header 'X-GitHub-Api-Version: 2022-11-28' \
157-
'/repos/{owner}/{repo}/git/trees' \
158-
--raw-field base_tree="${HEAD_COMMIT}" \
159-
--raw-field 'tree[][path]=CHANGELOG.md' \
160-
--raw-field 'tree[][mode]=100644' \
161-
--raw-field 'tree[][type]=blob' \
162-
--field 'tree[][content][email protected]' \
163-
--jq '.sha'
164-
)"
165-
166-
# Create a commit to point to the above created tree
167-
NEW_COMMIT_SHA="$(
168-
gh api \
169-
--method POST \
170-
--header 'Accept: application/vnd.github+json' \
171-
--header 'X-GitHub-Api-Version: 2022-11-28' \
172-
'/repos/{owner}/{repo}/git/commits' \
173-
--raw-field "message=chore(version): ${NEXT_TAG}" \
174-
--raw-field "parents[]=${HEAD_COMMIT}" \
175-
--raw-field "tree=${TREE_SHA}" \
176-
--jq '.sha'
177-
)"
178-
179-
# Update the current branch to point to the above created commit
180-
# We disable forced update so that the workflow will fail if the branch has been updated since the workflow started
181-
# (for example, new commits were pushed to the branch after the workflow execution started).
182-
gh api \
183-
--method PATCH \
184-
--header 'Accept: application/vnd.github+json' \
185-
--header 'X-GitHub-Api-Version: 2022-11-28' \
186-
"/repos/{owner}/{repo}/git/refs/heads/${ALLOWED_BRANCH_NAME}" \
187-
--raw-field "sha=${NEW_COMMIT_SHA}" \
188-
--field 'force=false'
189-
190-
# Create a lightweight tag to point to the above created commit
191-
gh api \
192-
--method POST \
193-
--header 'Accept: application/vnd.github+json' \
194-
--header 'X-GitHub-Api-Version: 2022-11-28' \
195-
'/repos/{owner}/{repo}/git/refs' \
196-
--raw-field "ref=refs/tags/${NEXT_TAG}" \
197-
--raw-field "sha=${NEW_COMMIT_SHA}"
142+
git add CHANGELOG.md
143+
git commit --message "chore(version): ${NEXT_TAG}"
144+
145+
git tag "${NEXT_TAG}" HEAD
146+
147+
git push origin "${ALLOWED_BRANCH_NAME}"
148+
git push origin "${NEXT_TAG}"
198149
199150
- name: Set job outputs
200151
shell: bash

‎.github/workflows/release-nightly-version.yml‎

Lines changed: 16 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,17 @@ jobs:
2727
runs-on: ubuntu-latest
2828

2929
steps:
30-
- name: Generate GitHub app token
31-
id: generate_app_token
32-
uses: actions/create-github-app-token@v1
33-
with:
34-
app-id: ${{ secrets.HYPERSWITCH_BOT_APP_ID }}
35-
private-key: ${{ secrets.HYPERSWITCH_BOT_APP_PRIVATE_KEY }}
36-
3730
- name: Checkout repository
3831
uses: actions/checkout@v4
3932
with:
4033
fetch-depth: 0
34+
token: ${{ secrets.AUTO_RELEASE_PAT }}
4135

4236
- name: Check if the workflow is run on an allowed branch
4337
shell: bash
4438
run: |
45-
if [[ "${{github.ref}}" != "refs/heads/${ALLOWED_BRANCH_NAME}" ]]; then
46-
echo "::error::This workflow is expected to be run from the '${ALLOWED_BRANCH_NAME}' branch. Current branch: '${{github.ref}}'"
39+
if [[ "${{ github.ref }}" != "refs/heads/${ALLOWED_BRANCH_NAME}" ]]; then
40+
echo "::error::This workflow is expected to be run from the '${ALLOWED_BRANCH_NAME}' branch. Current branch: '${{ github.ref }}'"
4741
exit 1
4842
fi
4943
@@ -80,72 +74,26 @@ jobs:
8074
echo "Postman collection files have no modifications"
8175
fi
8276
83-
- name: Commit updated Postman collections if modified
77+
- name: Set git configuration
8478
shell: bash
85-
env:
86-
GH_TOKEN: ${{ steps.generate_app_token.outputs.token }}
8779
if: ${{ env.POSTMAN_COLLECTION_FILES_UPDATED == 'true' }}
8880
run: |
89-
# Obtain current HEAD commit SHA and use that as base tree SHA for creating a new tree
90-
HEAD_COMMIT="$(git rev-parse 'HEAD^{commit}')"
91-
UPDATED_TREE_SHA="${HEAD_COMMIT}"
92-
93-
# Obtain the flags to be passed to the GitHub CLI.
94-
# Each line contains the flags to be used corresponding to the file.
95-
lines="$(
96-
git ls-files \
97-
--format '--raw-field tree[][path]=%(path) --raw-field tree[][mode]=%(objectmode) --raw-field tree[][type]=%(objecttype) --field tree[][content]=@%(path)' \
98-
postman/collection-json
99-
)"
100-
101-
# Create a tree based on the HEAD commit of the current branch, using the contents of the updated Postman collections directory
102-
while IFS= read -r line; do
103-
# Split each line by space to obtain the flags passed to the GitHub CLI as an array
104-
IFS=' ' read -ra flags <<< "${line}"
105-
106-
# Create a tree by updating each collection JSON file.
107-
# The SHA of the created tree is used as the base tree SHA for updating the next collection file.
108-
UPDATED_TREE_SHA="$(
109-
gh api \
110-
--method POST \
111-
--header 'Accept: application/vnd.github+json' \
112-
--header 'X-GitHub-Api-Version: 2022-11-28' \
113-
'/repos/{owner}/{repo}/git/trees' \
114-
--raw-field base_tree="${UPDATED_TREE_SHA}" \
115-
"${flags[@]}" \
116-
--jq '.sha'
117-
)"
118-
done <<< "${lines}"
119-
120-
# Create a commit to point to the tree with all updated collections
121-
NEW_COMMIT_SHA="$(
122-
gh api \
123-
--method POST \
124-
--header 'Accept: application/vnd.github+json' \
125-
--header 'X-GitHub-Api-Version: 2022-11-28' \
126-
'/repos/{owner}/{repo}/git/commits' \
127-
--raw-field "message=chore(postman): update Postman collection files" \
128-
--raw-field "parents[]=${HEAD_COMMIT}" \
129-
--raw-field "tree=${UPDATED_TREE_SHA}" \
130-
--jq '.sha'
131-
)"
132-
133-
# Update the current branch to point to the above created commit.
134-
# We disable forced update so that the workflow will fail if the branch has been updated since the workflow started
135-
# (for example, new commits were pushed to the branch after the workflow execution started).
136-
gh api \
137-
--method PATCH \
138-
--header 'Accept: application/vnd.github+json' \
139-
--header 'X-GitHub-Api-Version: 2022-11-28' \
140-
"/repos/{owner}/{repo}/git/refs/heads/${ALLOWED_BRANCH_NAME}" \
141-
--raw-field "sha=${NEW_COMMIT_SHA}" \
142-
--field 'force=false'
81+
git config --local user.name 'github-actions'
82+
git config --local user.email '41898282+github-actions[bot]@users.noreply.github.com'
83+
84+
- name: Commit and push updated Postman collections if modified
85+
shell: bash
86+
if: ${{ env.POSTMAN_COLLECTION_FILES_UPDATED == 'true' }}
87+
run: |
88+
git add postman
89+
git commit --message 'chore(postman): update Postman collection files'
90+
91+
git push origin "${ALLOWED_BRANCH_NAME}"
14392
14493
create-nightly-tag:
14594
name: Create a nightly tag
14695
uses: ./.github/workflows/release-nightly-version-reusable.yml
14796
needs:
14897
- update-postman-collections
14998
secrets:
150-
app_id: ${{ secrets.HYPERSWITCH_BOT_APP_ID }}
151-
app_private_key: ${{ secrets.HYPERSWITCH_BOT_APP_PRIVATE_KEY }}
99+
token: ${{ secrets.AUTO_RELEASE_PAT }}

‎CHANGELOG.md‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,58 @@ All notable changes to HyperSwitch will be documented here.
44

55
- - -
66

7+
## 2024.01.11.0
8+
9+
### Features
10+
11+
- **core:** Add new payments webhook events ([#3212](https://github.com/juspay/hyperswitch/pull/3212)) ([`e0e28b8`](https://github.com/juspay/hyperswitch/commit/e0e28b87c0647252918ef110cd7614c46b5cf943))
12+
- **payment_link:** Add status page for payment link ([#3213](https://github.com/juspay/hyperswitch/pull/3213)) ([`50e4d79`](https://github.com/juspay/hyperswitch/commit/50e4d797da31b570b5920b33d77c24a21d9871e2))
13+
14+
### Bug Fixes
15+
16+
- **euclid_wasm:** Update braintree config prod ([#3288](https://github.com/juspay/hyperswitch/pull/3288)) ([`8830563`](https://github.com/juspay/hyperswitch/commit/8830563748ed20c40b7a21a66e9ad9fd02ddcf0e))
17+
18+
### Refactors
19+
20+
- **connector:** [bluesnap] add connector_txn_id fallback for webhook ([#3315](https://github.com/juspay/hyperswitch/pull/3315)) ([`a69e876`](https://github.com/juspay/hyperswitch/commit/a69e876f8212cb94202686e073005c23b1b2fc35))
21+
- Removed basilisk feature ([#3281](https://github.com/juspay/hyperswitch/pull/3281)) ([`612f8d9`](https://github.com/juspay/hyperswitch/commit/612f8d9d5f5bcba78aa64c3128cc72be0f2860ea))
22+
23+
### Miscellaneous Tasks
24+
25+
- Nits and small code improvements found during investigation of PR#3168 ([#3259](https://github.com/juspay/hyperswitch/pull/3259)) ([`fe3cf54`](https://github.com/juspay/hyperswitch/commit/fe3cf54781302c733c1682ded2c1735544407a5f))
26+
27+
**Full Changelog:** [`2024.01.10.0...2024.01.11.0`](https://github.com/juspay/hyperswitch/compare/2024.01.10.0...2024.01.11.0)
28+
29+
- - -
30+
31+
## 2024.01.10.0
32+
33+
### Features
34+
35+
- **Connector:** [VOLT] Add support for Payments Webhooks ([#3155](https://github.com/juspay/hyperswitch/pull/3155)) ([`eba7896`](https://github.com/juspay/hyperswitch/commit/eba789640b72cdfbc17d0994d16ce111a1788fe5))
36+
- **pm_list:** Add required fields for Ideal ([#3183](https://github.com/juspay/hyperswitch/pull/3183)) ([`1c3c5f6`](https://github.com/juspay/hyperswitch/commit/1c3c5f6b0cff9a0037175ba92c002cdf4249108d))
37+
38+
### Bug Fixes
39+
40+
- **connector:**
41+
- [BOA/CYB] Fix Metadata Error ([#3283](https://github.com/juspay/hyperswitch/pull/3283)) ([`71044a1`](https://github.com/juspay/hyperswitch/commit/71044a14ed87ac0cd7d2bb2009f0e59c79bd344c))
42+
- [BOA, Cybersource] capture error_code ([#3239](https://github.com/juspay/hyperswitch/pull/3239)) ([`ecf51b5`](https://github.com/juspay/hyperswitch/commit/ecf51b5e3a30f055634edfafcd36f64cef535a53))
43+
- **outgoingwebhookevents:** Throw an error when outgoing webhook events env var not found ([#3291](https://github.com/juspay/hyperswitch/pull/3291)) ([`ee044a0`](https://github.com/juspay/hyperswitch/commit/ee044a0be811a53842c69f64c27d9995d84b7040))
44+
- **users:** Added merchant name is list merchants ([#3289](https://github.com/juspay/hyperswitch/pull/3289)) ([`8a354f4`](https://github.com/juspay/hyperswitch/commit/8a354f42295a3167d0e846c9522bc091ebdca3f4))
45+
- **wasm:** Fix failing `wasm-pack build` for `euclid_wasm` ([#3284](https://github.com/juspay/hyperswitch/pull/3284)) ([`5eb6711`](https://github.com/juspay/hyperswitch/commit/5eb67114646674fe227f073e417f26beb97e9a43))
46+
47+
### Refactors
48+
49+
- Pass customer object to `make_pm_data` ([#3246](https://github.com/juspay/hyperswitch/pull/3246)) ([`36c32c3`](https://github.com/juspay/hyperswitch/commit/36c32c377ae788c96b578303eae5d029e3044b7c))
50+
51+
### Miscellaneous Tasks
52+
53+
- **postman:** Update Postman collection files ([`8fc68ad`](https://github.com/juspay/hyperswitch/commit/8fc68adc7fb6a23d4a2970a05f5739db6010a53d))
54+
55+
**Full Changelog:** [`2024.01.08.0...2024.01.10.0`](https://github.com/juspay/hyperswitch/compare/2024.01.08.0...2024.01.10.0)
56+
57+
- - -
58+
759
## 2024.01.08.0
860

961
### Features

0 commit comments

Comments
 (0)