fix(config): fix docker compose local setup (#1372)

Co-authored-by: Sanchith Hegde <22217505+SanchithHegde@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -70,7 +70,7 @@ body:
         If yes, please provide the value of the `x-request-id` response header for helping us debug your issue.
 
         If not (or if building/running locally), please provide the following details:
-        1. Operating System or Linux distribution: 
+        1. Operating System or Linux distribution:
         2. Rust version (output of `rustc --version`): ``
         3. App version (output of `cargo r -- --version`): ``
     validations:

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,7 +19,7 @@
 - [ ] This PR modifies the database schema
 - [ ] This PR modifies application configuration/environment variables
 
-<!-- 
+<!--
 Provide links to the files with corresponding changes.
 
 Following are the paths where you can find config files:

.github/workflows/CI.yml

@@ -384,4 +384,4 @@ jobs:
 
       - name: Spell check
         uses: crate-ci/typos@master
-      
+

CHANGELOG.md

@@ -326,7 +326,7 @@ All notable changes to HyperSwitch will be documented here.
 * **bank_redirects:**  modify api contract for sofort (#880) (fc2e4514)
   *  add template code for connector forte (#854) (7a581a6)
   *  add template code for connector nexinets (#852) (dee5f61)
-  
+
 ### Bug Fixes
 
 * **connector:**  [coinbase] make metadata as option parameter (#887) (f5728955)
@@ -335,7 +335,7 @@ All notable changes to HyperSwitch will be documented here.
 
 ### Enhancement
 
-* **payments:**  make TokenizationAction clonable (#895) 
+* **payments:**  make TokenizationAction clonable (#895)
 
 ### Integration
 

INSTALL_dependencies.sh

@@ -5,7 +5,7 @@
 #
 # Global config
 
-if [[ "${TRACE-0}" == "1" ]]; then 
+if [[ "${TRACE-0}" == "1" ]]; then
     set -o xtrace
 fi
 
@@ -44,8 +44,8 @@ else
     SUDO=""
 fi
 
-ver () { 
-    printf "%03d%03d%03d%03d" `echo "$1" | tr '.' ' '`; 
+ver () {
+    printf "%03d%03d%03d%03d" `echo "$1" | tr '.' ' '`;
 }
 
 PROGNAME=`basename $0`
@@ -59,7 +59,7 @@ err () {
 }
 
 need_cmd () {
-    if ! command -v $1 > /dev/null 
+    if ! command -v $1 > /dev/null
     then
         err "Command \"${1}\" not found. Bailing out"
     fi
@@ -187,7 +187,7 @@ if [[ ! -x "`command -v psql`" ]] || [[ ! -x "`command -v redis-server`" ]] ; th
        install_dep postgresql
        install_dep postgresql-contrib # not needed for macos?
        install_dep postgresql-devel # needed for diesel_cli in some linux distributions
-       install_dep postgresql-libs # needed for diesel_cli in some linux distributions 
+       install_dep postgresql-libs # needed for diesel_cli in some linux distributions
        init_start_postgres # installing libpq messes with initdb creating two copies. better to run it better libpq.
        install_dep libpq-dev || install_dep libpq
     else

config/config.example.toml

@@ -247,7 +247,7 @@ region = "" # The AWS region used by the KMS SDK for decrypting data.
 # EmailClient configuration. Only applicable when the `email` feature flag is enabled.
 [email]
 from_email = "notify@example.com" # Sender email
-aws_region = "" # AWS region used by AWS SES 
+aws_region = "" # AWS region used by AWS SES
 base_url = "" # Base url used when adding links that should redirect to self
 
 [dummy_connector]

config/redis.conf

@@ -909,10 +909,10 @@ replica-priority 100
 #               commands. For instance ~* allows all the keys. The pattern
 #               is a glob-style pattern like the one of KEYS.
 #               It is possible to specify multiple patterns.
-# %R~<pattern>  Add key read pattern that specifies which keys can be read 
+# %R~<pattern>  Add key read pattern that specifies which keys can be read
 #               from.
 # %W~<pattern>  Add key write pattern that specifies which keys can be
-#               written to. 
+#               written to.
 #  allkeys      Alias for ~*
 #  resetkeys    Flush the list of allowed keys patterns.
 #  &<pattern>   Add a glob-style pattern of Pub/Sub channels that can be
@@ -939,10 +939,10 @@ replica-priority 100
 #               -@all. The user returns to the same state it has immediately
 #               after its creation.
 # (<options>)   Create a new selector with the options specified within the
-#               parentheses and attach it to the user. Each option should be 
-#               space separated. The first character must be ( and the last 
+#               parentheses and attach it to the user. Each option should be
+#               space separated. The first character must be ( and the last
 #               character must be ).
-# clearselectors            Remove all of the currently attached selectors. 
+# clearselectors            Remove all of the currently attached selectors.
 #                           Note this does not change the "root" user permissions,
 #                           which are the permissions directly applied onto the
 #                           user (outside the parentheses).
@@ -968,7 +968,7 @@ replica-priority 100
 # Basically ACL rules are processed left-to-right.
 #
 # The following is a list of command categories and their meanings:
-# * keyspace - Writing or reading from keys, databases, or their metadata 
+# * keyspace - Writing or reading from keys, databases, or their metadata
 #     in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE,
 #     KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace,
 #     key or metadata will also have `write` category. Commands that only read
@@ -1589,8 +1589,8 @@ cluster-config-file nodes-6379.conf
 #
 cluster-node-timeout 15000
 
-# The cluster port is the port that the cluster bus will listen for inbound connections on. When set 
-# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires 
+# The cluster port is the port that the cluster bus will listen for inbound connections on. When set
+# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires
 # you to specify the cluster bus port when executing cluster meet.
 cluster-port 16379
 
@@ -1725,12 +1725,12 @@ cluster-allow-pubsubshard-when-down yes
 # PubSub message by default. (client-query-buffer-limit default value is 1gb)
 #
 cluster-link-sendbuf-limit 0
- 
-# Clusters can configure their announced hostname using this config. This is a common use case for 
+
+# Clusters can configure their announced hostname using this config. This is a common use case for
 # applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based
 # routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS
-# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is 
-# communicated along the clusterbus to all nodes, setting it to an empty string will remove 
+# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is
+# communicated along the clusterbus to all nodes, setting it to an empty string will remove
 # the hostname and also propagate the removal.
 #
 # cluster-announce-hostname ""
@@ -1739,13 +1739,13 @@ cluster-link-sendbuf-limit 0
 # a user defined hostname, or by declaring they have no endpoint. Which endpoint is
 # shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type
 # config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how
-# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. 
-# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' 
+# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS.
+# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?'
 # will be returned instead.
 #
 # When a cluster advertises itself as having an unknown endpoint, it's indicating that
-# the server doesn't know how clients can reach the cluster. This can happen in certain 
-# networking situations where there are multiple possible routes to the node, and the 
+# the server doesn't know how clients can reach the cluster. This can happen in certain
+# networking situations where there are multiple possible routes to the node, and the
 # server doesn't know which one the client took. In this case, the server is expecting
 # the client to reach out on the same endpoint it used for making the last request, but use
 # the port provided in the response.
@@ -2058,7 +2058,7 @@ client-output-buffer-limit pubsub 32mb 8mb 60
 # errors or data eviction. To avoid this we can cap the accumulated memory
 # used by all client connections (all pubsub and normal clients). Once we
 # reach that limit connections will be dropped by the server freeing up
-# memory. The server will attempt to drop the connections using the most 
+# memory. The server will attempt to drop the connections using the most
 # memory first. We call this mechanism "client eviction".
 #
 # Client eviction is configured using the maxmemory-clients setting as follows:

crates/router/src/connector/globalpay/requests.rs

@@ -351,7 +351,7 @@ pub struct Card {
 pub struct DigitalWallet {
     /// Identifies who provides the digital wallet for the Payer.
     pub provider: Option<DigitalWalletProvider>,
-    /// A token that represents, or is the payment method, stored with  the digital wallet.    
+    /// A token that represents, or is the payment method, stored with  the digital wallet.
     pub payment_token: Option<serde_json::Value>,
 }
 

docker-compose.yml

@@ -14,7 +14,6 @@ networks:
 
 
 services:
-
   promtail:
     image: grafana/promtail:latest
     volumes:
@@ -92,21 +91,9 @@ services:
     volumes:
       - ./:/app
 
-  hyperswitch-server-init:
-    image: rust:1.70
-    command: cargo build --bin router
-    working_dir: /app
-    networks:
-      - router_net
-    volumes:
-      - ./:/app
-      - cargo_cache:/cargo_cache
-      - cargo_build_cache:/cargo_build_cache
-    environment:
-      - CARGO_TARGET_DIR=/cargo_build_cache
   hyperswitch-server:
     image: rust:1.70
-    command: /cargo_build_cache/debug/router -f ./config/docker_compose.toml
+    command: cargo run -- -f ./config/docker_compose.toml
     working_dir: /app
     ports:
       - "8080:8080"
@@ -127,10 +114,6 @@ services:
       start_period: 20s
       timeout: 10s
 
-    depends_on:
-      hyperswitch-server-init:
-        condition: service_completed_successfully
-
   hyperswitch-producer:
     image: rust:1.70
     command: cargo run --bin scheduler -- -f ./config/docker_compose.toml

docs/rfcs/000-issuing-template.md

@@ -3,10 +3,10 @@
 ### I. Objective
 A clear and concise title for the RFC
 
-### II. Proposal 
+### II. Proposal
 A detailed description of the proposed changes, discussion time frame, technical details and potential drawbacks or alternative solutions that were considered
 
-### III. Open Questions 
+### III. Open Questions
 Any questions or concerns that are still open for discussion and debate within the community
 
 ### IV. Additional Context / Previous Improvements

docs/rfcs/guidelines.md

@@ -2,7 +2,7 @@
 
 Hyperswitch welcomes contributions from anyone in the open-source community. Although some contributions can be easily reviewed and implemented through regular GitHub pull requests, larger changes that require design decisions will require more discussion and collaboration within the community.
 
-To facilitate this process, Hyperswitch has adopted the RFC (Request for Comments) process from other successful open-source projects like Rust and React. The RFC process is designed to encourage community-driven change and ensure that everyone has a voice in the decision-making process, including both core and non-core contributors. 
+To facilitate this process, Hyperswitch has adopted the RFC (Request for Comments) process from other successful open-source projects like Rust and React. The RFC process is designed to encourage community-driven change and ensure that everyone has a voice in the decision-making process, including both core and non-core contributors.
 
 Here are the steps involved:
 1. Prepare an RFC Proposal
@@ -15,7 +15,7 @@ Here are the steps involved:
 
 **Prepare an RFC Proposal:** Anyone interested in proposing a change to Hyperswitch should first create an RFC(in the format given below) that outlines the proposed change. This document should describe the problem the proposal is trying to solve, the proposed solution, and any relevant technical details. The document should also include any potential drawbacks or alternative solutions that were considered.
 
-**Submit Proposal:** Once the RFC document is complete, the proposer should submit it to the Hyperswitch community for review. The proposal can be submitted either as a pull request to the RFC Documents folder or as a GitHub Issue. 
+**Submit Proposal:** Once the RFC document is complete, the proposer should submit it to the Hyperswitch community for review. The proposal can be submitted either as a pull request to the RFC Documents folder or as a GitHub Issue.
 
 **Complete Initial Review:** After the proposal is submitted, the Hyperswitch core team would review it and provide feedback. Feedback can include suggestions for improvements, questions about the proposal, or concerns about its potential impact.
 
@@ -33,35 +33,35 @@ This RFC process for Hyperswitch is intended to encourage collaboration and comm
 
 ### Issuing an RFC
 ```text
-**Title** 
+**Title**
 
 **Objective**
 A clear and concise title for the RFC
 
-**Proposal** 
+**Proposal**
 A detailed description of the proposed changes, discussion time frame, technical details and potential drawbacks or alternative solutions that were considered
 
-**Open Questions** 
+**Open Questions**
 Any questions or concerns that are still open for discussion and debate within the community
 
-**Additional Context / Previous Improvements** 
+**Additional Context / Previous Improvements**
 Any relevant external resources or references like slack / discord threads that support the proposal
 ```
 
 ### Resolving an RFC
 ```text
-**Title** 
+**Title**
 The title of the resolved RFC
 
-**Status** 
+**Status**
 The final status of the RFC (Accepted / Rejected)
 
-**Resolution** 
+**Resolution**
 A description of the final resolution of the RFC, including any modifications or adjustments made during the discussion and review process
 
-**Implementation** 
+**Implementation**
 A description of how the resolution will be implemented, including any relevant future scope for the solution
 
-**Acknowledgements** 
+**Acknowledgements**
 Any final thoughts or acknowledgements for the community and contributors who participated in the RFC process
 ```

generate_code_coverage.sh

@@ -13,4 +13,4 @@ export LLVM_PROFILE_FILE="$$-%p-%m.profraw"
 
 echo "Running 'cargo test' and generating grcov reports.. This may take some time.."
 
-cargo test && grcov . -s . -t html --branch --binary-path ./target/debug &&  rm -f $$*profraw &&  echo "starting server on localhost:$SERVER_PORT" && cd html && python3 -m http.server $SERVER_PORT 
+cargo test && grcov . -s . -t html --branch --binary-path ./target/debug &&  rm -f $$*profraw &&  echo "starting server on localhost:$SERVER_PORT" && cd html && python3 -m http.server $SERVER_PORT

loadtest/README.md

@@ -1,11 +1,11 @@
 ## Performance Benchmarking Setup
 
-The setup uses docker compose to get the required components up and running. It also handles running database migration 
-and starts [K6 load testing](https://k6.io/docs/) script at the end. The metrics are visible in the console as well as 
+The setup uses docker compose to get the required components up and running. It also handles running database migration
+and starts [K6 load testing](https://k6.io/docs/) script at the end. The metrics are visible in the console as well as
 through Grafana dashboard.
 
 We have added a callback at the end of the script to compare result with existing baseline values. The env variable
-`LOADTEST_RUN_NAME` can be used to change the name of the run which will be used to create json, result summary and diff 
+`LOADTEST_RUN_NAME` can be used to change the name of the run which will be used to create json, result summary and diff
 benchmark files. The default value is "baseline", and diff will be created by comparing new results against baseline.
 See 'How to run' section.
 
@@ -15,10 +15,10 @@ See 'How to run' section.
 
 `grafana`:  data source and dashboard files
 
-`k6`:       K6 load testing tool scripts. The `setup.js` contain common functions like creating merchant api key etc. 
+`k6`:       K6 load testing tool scripts. The `setup.js` contain common functions like creating merchant api key etc.
             Each js files will contain load testing scenario of each APIs. Currently, we have `health.js` and `payment-confirm.js`.
 
-`.env`:     It provide default value to docker compose file. Developer can specify which js script they want to run using env 
+`.env`:     It provide default value to docker compose file. Developer can specify which js script they want to run using env
             variable called `LOADTEST_K6_SCRIPT`. The default script is `health.js`. See 'How to run' section.
 
 ### How to run
@@ -33,7 +33,7 @@ Run default (`health.js`) script. It will generate baseline result.
 bash loadtest.sh
 ```
 
-The `loadtest.sh` script takes following flags, 
+The `loadtest.sh` script takes following flags,
 
 `-c`: _compare_ with baseline results [without argument]
       auto assign run name based on current commit number
@@ -42,7 +42,7 @@ The `loadtest.sh` script takes following flags,
 
 `-s`: _script name_ exists in `k6` directory without the file extension as argument (default: health)
 
-`-a`: run loadtest for _all scripts_ existing in `k6` directory [without argument] 
+`-a`: run loadtest for _all scripts_ existing in `k6` directory [without argument]
 
 For example, to run the baseline for `payment-confirm.js` script.
 ```bash
@@ -64,7 +64,7 @@ Assuming there is baseline files for all the script, following command will comp
 ```bash
 bash loadtest.sh -ca
 ```
-It uses `-c` compare flag and `-a` run loadtest using all the scripts. 
+It uses `-c` compare flag and `-a` run loadtest using all the scripts.
 
 Developer can observe live metrics using [K6 Load Testing Dashboard](http://localhost:3002/d/k6/k6-load-testing-results?orgId=1&refresh=5s&from=now-1m&to=now) in Grafana.
 The [Tempo datasource](http://localhost:3002/explore?orgId=1&left=%7B%22datasource%22:%22P214B5B846CF3925F%22,%22queries%22:%5B%7B%22refId%22:%22A%22,%22queryType%22:%22nativeSearch%22%7D%5D,%22range%22:%7B%22from%22:%22now-1m%22,%22to%22:%22now%22%7D%7D)
@@ -74,6 +74,6 @@ is available to inspect tracing of individual requests.
 
 1. The script will first "down" the already running docker compose to run loadtest on freshly created database.
 2. Make sure that the Rust compiler is happy with your changes before you start running a performance test. This will save a lot of your time.
-3. If the project image is available locally then `docker compose up` won't take your new changes into account. 
+3. If the project image is available locally then `docker compose up` won't take your new changes into account.
    Either first do `docker compose build` or `docker compose up --build k6`.
 4. For baseline, make sure you in the right branch and have build the image before running the loadtest script.

loadtest/grafana/grafana-dashboard.yaml

@@ -1,8 +1,8 @@
 apiVersion: 1
 providers:
-  - name: 'default'       
-    org_id: 1             
-    folder: ''            
-    type: 'file'          
+  - name: 'default'
+    org_id: 1
+    folder: ''
+    type: 'file'
     options:
       path: /var/lib/grafana/dashboards

migrations/2022-12-05-090521_single_use_mandate_fields/down.sql

@@ -1,4 +1,4 @@
 -- This file should undo anything in `up.sql`
-ALTER TABLE mandate 
+ALTER TABLE mandate
 DROP COLUMN IF EXISTS single_use_amount,
 DROP COLUMN IF EXISTS single_use_currency;

migrations/2022-12-05-090521_single_use_mandate_fields/up.sql

@@ -1,4 +1,4 @@
 -- Your SQL goes here
-ALTER TABLE mandate 
+ALTER TABLE mandate
 ADD IF NOT EXISTS single_use_amount INTEGER DEFAULT NULL,
 ADD IF NOT EXISTS single_use_currency "Currency" DEFAULT NULL;

migrations/2022-12-12-132936_reverse_lookup/up.sql

@@ -1,7 +1,7 @@
 CREATE TABLE reverse_lookup (
     lookup_id VARCHAR(255) NOT NULL PRIMARY KEY,
     sk_id VARCHAR(50) NOT NULL,
-    pk_id VARCHAR(255) NOT NULL, 
+    pk_id VARCHAR(255) NOT NULL,
     source VARCHAR(30) NOT NULL
 );
 

migrations/2023-02-07-070512_change_merchant_connector_id_data_type/down.sql

@@ -6,5 +6,5 @@ SET merchant_connector_id = id;
 ALTER TABLE merchant_connector_account
 ALTER COLUMN merchant_connector_id TYPE INTEGER USING (trim(merchant_connector_id)::integer);
 
-ALTER TABLE merchant_connector_account 
+ALTER TABLE merchant_connector_account
 ALTER COLUMN merchant_connector_id SET DEFAULT nextval('merchant_connector_id_seq');

migrations/2023-03-30-132338_add_start_end_date_for_mandates/down.sql

@@ -1,4 +1,4 @@
-ALTER TABLE mandate 
+ALTER TABLE mandate
 DROP COLUMN IF EXISTS start_date,
 DROP COLUMN IF EXISTS end_date,
 DROP COLUMN IF EXISTS metadata;

migrations/2023-03-30-132338_add_start_end_date_for_mandates/up.sql

@@ -1,4 +1,4 @@
-ALTER TABLE mandate 
+ALTER TABLE mandate
 ADD IF NOT EXISTS start_date TIMESTAMP NULL,
 ADD IF NOT EXISTS end_date TIMESTAMP NULL,
 ADD COLUMN metadata JSONB DEFAULT NULL;

migrations/2023-04-11-084958_pii-migration/down.sql

@@ -1,6 +1,6 @@
 -- This file should undo anything in `up.sql`
 
-ALTER TABLE merchant_connector_account 
+ALTER TABLE merchant_connector_account
     ALTER COLUMN connector_account_details TYPE JSON
     USING convert_from(connector_account_details, 'UTF8')::json;
 

migrations/2023-04-11-084958_pii-migration/up.sql

@@ -1,5 +1,5 @@
 -- Your SQL goes here
-ALTER TABLE merchant_connector_account 
+ALTER TABLE merchant_connector_account
     ALTER COLUMN connector_account_details TYPE bytea
     USING convert_to(connector_account_details::text, 'UTF8');
 

migrations/2023-04-19-072152_merchant_account_add_intent_fulfilment_time/down.sql

@@ -1 +1 @@
-ALTER TABLE merchant_account DROP COLUMN IF EXISTS intent_fulfillment_time; 
+ALTER TABLE merchant_account DROP COLUMN IF EXISTS intent_fulfillment_time;

migrations/2023-04-19-120503_update_customer_connector_customer/up.sql

@@ -1,3 +1,3 @@
 -- Your SQL goes here
-ALTER TABLE customers 
+ALTER TABLE customers
 ADD COLUMN connector_customer JSONB;

monitoring/docker-compose-ckh.yaml

@@ -140,7 +140,7 @@ services:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
       KAFKA_CLUSTERS_0_JMXPORT: 9997
-  
+
   clickhouse-server:
     image: clickhouse/clickhouse-server:latest
     networks:
@@ -154,7 +154,7 @@ services:
       nofile:
         soft: 262144
         hard: 262144
-  
+
   hyperswitch-server:
     image: rust:1.65
     command: cargo run -- -f ./config/docker_compose.toml
@@ -193,9 +193,9 @@ services:
       - POSTGRES_USER=db_user
       - POSTGRES_PASSWORD=db_pass
       - POSTGRES_DB=hyperswitch_db
-  
+
   redis-queue:
-    image: redis:7    
+    image: redis:7
     command: redis-server /usr/local/etc/redis/redis.conf
     volumes:
       - ../config/redis.conf:/usr/local/etc/redis/redis.conf

openapi/open_api_spec.yaml

@@ -2593,7 +2593,7 @@ components:
           type: string
           description: |
             Unique Identifier for the Payment. It is always recommended to provide this ID while creating a payment.
-            If the identifiers in not provided in the Payment Request, this filed shall be auto generated and provide in the API response. It is suggested to keep the payment_id length as a maximum of 30 alphanumeric characters irrespective of payment methods and gateways. 
+            If the identifiers in not provided in the Payment Request, this filed shall be auto generated and provide in the API response. It is suggested to keep the payment_id length as a maximum of 30 alphanumeric characters irrespective of payment methods and gateways.
             Sequential and only numeric characters are not recommended.
           maxLength: 30
           minLength: 30
@@ -2968,7 +2968,7 @@ components:
           type: string
           description: |
             Unique Identifier for the Payment. It is always recommended to provide this ID while creating a payment.
-            If the identifiers in not provided in the Payment Request, this filed shall be auto generated and provide in the API response. It is suggested to keep the payment_id length as a maximum of 30 alphanumeric characters irrespective of payment methods and gateways. 
+            If the identifiers in not provided in the Payment Request, this filed shall be auto generated and provide in the API response. It is suggested to keep the payment_id length as a maximum of 30 alphanumeric characters irrespective of payment methods and gateways.
             Sequential and only numeric characters are not recommended.
           maxLength: 30
           example: "pay_mbabizu24mvu3mela5njyhpit4"
@@ -3439,7 +3439,7 @@ components:
           type: string
           description: |
             Unique Identifier for the Payment. It is always recommended to provide this ID while creating a payment.
-            If the identifiers in not provided in the Payment Request, this filed shall be auto generated and provide in the API response. It is suggested to keep the payment_id length as a maximum of 30 alphanumeric characters irrespective of payment methods and gateways. 
+            If the identifiers in not provided in the Payment Request, this filed shall be auto generated and provide in the API response. It is suggested to keep the payment_id length as a maximum of 30 alphanumeric characters irrespective of payment methods and gateways.
             Sequential and only numeric characters are not recommended.
           maxLength: 30
           minLength: 30
@@ -3509,7 +3509,7 @@ components:
           type: string
           description: |
             Unique Identifier for the Payment. It is always recommended to provide this ID while creating a payment.
-            If the identifiers in not provided in the Payment Request, this filed shall be auto generated and provide in the API response. It is suggested to keep the payment_id length as a maximum of 30 alphanumeric characters irrespective of payment methods and gateways. 
+            If the identifiers in not provided in the Payment Request, this filed shall be auto generated and provide in the API response. It is suggested to keep the payment_id length as a maximum of 30 alphanumeric characters irrespective of payment methods and gateways.
             Sequential and only numeric characters are not recommended.
           maxLength: 30
           example: "pay_mbabizu24mvu3mela5njyhpit4"
@@ -3554,7 +3554,7 @@ components:
             type: string
             description: |
               Unique Identifier for the Payment. It is always recommended to provide this ID while creating a payment.
-              If the identifiers in not provided in the Payment Request, this filed shall be auto generated and provide in the API response. It is suggested to keep the payment_id length as a maximum of 30 alphanumeric characters irrespective of payment methods and gateways. 
+              If the identifiers in not provided in the Payment Request, this filed shall be auto generated and provide in the API response. It is suggested to keep the payment_id length as a maximum of 30 alphanumeric characters irrespective of payment methods and gateways.
               Sequential and only numeric characters are not recommended.
             maxLength: 30
             minLength: 30
@@ -4596,7 +4596,7 @@ components:
   securitySchemes:
     ApiSecretKey:
       description: >
-        Unless explicitly stated, all endpoints require authentication using your secret key. 
+        Unless explicitly stated, all endpoints require authentication using your secret key.
         You may generate your API keys from the Juspay Dashboard.
 
         #### Format

postman/portman-config.json

@@ -4023,7 +4023,7 @@
                 ]
             }
 
-            
+
 
         ]
     }

scripts/add_connector.sh

@@ -10,7 +10,7 @@ function find_prev_connector() {
     sed -i'' -e "s/^    connectors=.*/    connectors=($res \"\$1\")/" $self.tmp
     for i in "${!sorted[@]}"; do
     if [ "${sorted[$i]}" = "$1" ] && [ $i != "0" ]; then
-        # find and return the connector name where this new connector should be added next to it 
+        # find and return the connector name where this new connector should be added next to it
         eval "$2='${sorted[i-1]}'"
         mv $self.tmp $self
         rm $self.tmp-e
@@ -20,7 +20,7 @@ function find_prev_connector() {
     mv $self.tmp $self
     rm $self.tmp-e
     # if the new connector needs to be added in first place, add it after Aci, sorted order needs to be covered in code review
-    eval "$2='aci'" 
+    eval "$2='aci'"
 }
 pg=$1;
 base_url=$2;
@@ -33,7 +33,7 @@ RED='\033[0;31m'
 GREEN='\033[0;32m'
 ORANGE='\033[0;33m'
 
-if [ -z "$pg" ] || [ -z "$base_url" ]; then 
+if [ -z "$pg" ] || [ -z "$base_url" ]; then
     echo "$RED Connector name or base_url not present: try $GREEN\"sh add_connector.sh adyen https://test.adyen.com\""
     exit
 fi
@@ -48,7 +48,7 @@ prvc=''
 find_prev_connector $1 prvc
 prvcc="$(tr '[:lower:]' '[:upper:]' <<< ${prvc:0:1})${prvc:1}"
 sed -i'' -e "s|pub mod $prvc;|pub mod $prvc;\npub mod ${pg};|" $conn.rs
-sed -i'' -e "s/};/${pg}::${pgc},\n};/" $conn.rs 
+sed -i'' -e "s/};/${pg}::${pgc},\n};/" $conn.rs
 sed -i'' -e "s|\"$prvc\" \(.*\)|\"$prvc\" \1\n\t\t\t\"${pg}\" => Ok(Box::new(\&connector::${pgc})),|" $src/types/api.rs
 sed -i'' -e "s/pub $prvc: \(.*\)/pub $prvc: \1\n\tpub ${pg}: ConnectorParams,/" $src/configs/settings.rs
 sed -i'' -e "s|$prvc.base_url \(.*\)|$prvc.base_url \1\n${pg}.base_url = \"$base_url\"|" config/development.toml config/docker_compose.toml config/config.example.toml loadtest/config/development.toml
@@ -59,7 +59,7 @@ sed -i'' -e "s/^default_imp_for_\(.*\)/default_imp_for_\1\n\tconnector::${pgc},/
 
 # remove temporary files created in above step
 rm $conn.rs-e $src/types/api.rs-e $src/configs/settings.rs-e config/development.toml-e config/docker_compose.toml-e config/config.example.toml-e loadtest/config/development.toml-e crates/api_models/src/enums.rs-e $src/core/payments/flows.rs-e
-cd $conn/ 
+cd $conn/
 
 # generate template files for the connector
 cargo install cargo-generate
@@ -74,7 +74,7 @@ git checkout ${tests}/main.rs ${tests}/connector_auth.rs ${tests}/sample_auth.to
 
 # add enum for this connector in test folder
 sed -i'' -e "s/mod utils;/mod ${pg};\nmod utils;/" ${tests}/main.rs
-sed -i'' -e "s/    pub $prvc: \(.*\)/\tpub $prvc: \1\n\tpub ${pg}: Option<HeaderKey>,/; s/auth.toml/sample_auth.toml/" ${tests}/connector_auth.rs 
+sed -i'' -e "s/    pub $prvc: \(.*\)/\tpub $prvc: \1\n\tpub ${pg}: Option<HeaderKey>,/; s/auth.toml/sample_auth.toml/" ${tests}/connector_auth.rs
 echo "\n\n[${pg}]\napi_key=\"API Key\"" >> ${tests}/sample_auth.toml
 
 # remove temporary files created in above step