Merge pull request #50 from vijayg10/feature/parameterize-fspids-in-p…

…rovisioning fix: changed the hardcoded fspIds to environment variables
mojaloop · Sep 16, 2021 · 25f4ced · 25f4ced
2 parents 37d2642 + 0db193f
commit 25f4ced
Show file tree

Hide file tree

Showing 45 changed files with 532 additions and 518 deletions.
diff --git a/collections/hub/golden_path/api-tests/Quotes/quotes-negative-scenarios.json b/collections/hub/golden_path/api-tests/Quotes/quotes-negative-scenarios.json
@@ -30,7 +30,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -273,7 +273,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -516,7 +516,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -630,7 +630,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -868,7 +868,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -1112,7 +1112,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "tests": {
             "assertions": [
@@ -1235,7 +1235,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -1352,7 +1352,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -1469,7 +1469,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -1586,7 +1586,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -1701,7 +1701,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -1816,7 +1816,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -1931,7 +1931,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -2046,7 +2046,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",

diff --git a/collections/hub/golden_path/api-tests/SettlementWindows/settlementadmin.json b/collections/hub/golden_path/api-tests/SettlementWindows/settlementadmin.json
@@ -28,7 +28,7 @@
           },
           "headers": {
             "FSPIOP-Source": "{$inputs.fromFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "tests": {
             "assertions": [
@@ -78,7 +78,7 @@
           "url": "{$inputs.HOST_CENTRAL_SETTLEMENT}",
           "headers": {
             "FSPIOP-Source": "{$inputs.fromFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "tests": {
             "assertions": [
@@ -112,7 +112,7 @@
           "url": "{$inputs.HOST_CENTRAL_SETTLEMENT}",
           "headers": {
             "FSPIOP-Source": "{$inputs.fromFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "tests": {
             "assertions": [
@@ -150,7 +150,7 @@
           },
           "headers": {
             "FSPIOP-Source": "{$inputs.fromFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "tests": {
             "assertions": [

diff --git a/collections/hub/golden_path/api-tests/admin-api-tests/Admintests-20201221.json b/collections/hub/golden_path/api-tests/admin-api-tests/Admintests-20201221.json
@@ -92,7 +92,7 @@
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
-           "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "tests": {

diff --git a/collections/hub/golden_path/bug fixes/Test for 4 decimal points #949.json b/collections/hub/golden_path/bug fixes/Test for 4 decimal points #949.json
@@ -28,7 +28,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "FSPIOP-Destination": "{$inputs.toFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "quoteId": "{$function.generic.generateUUID}",
@@ -188,7 +188,7 @@
             "Content-Type": "application/vnd.interoperability.transfers+json;version=1.0",
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
-			"Authorization": "{$inputs.TTK_BEARER_TOKEN}"
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {
             "transferId": "{$prev.3.request.body.transactionId}",

diff --git a/collections/hub/golden_path/bug fixes/Test for Bugfix #1378 - extension list missing.json b/collections/hub/golden_path/bug fixes/Test for Bugfix #1378 - extension list missing.json
@@ -27,7 +27,7 @@
             "Content-Type": "application/vnd.interoperability.quotes+json;version=3.2",
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
-			 "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Destination": "{$inputs.toFspId}"
           },
           "body": {
@@ -131,7 +131,7 @@
             "Content-Type": "application/vnd.interoperability.quotes+json;version=1.0",
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.fromFspId}",
-			 "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
+            "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Destination": "{$inputs.toFspId}"
           },
           "body": {

diff --git a/collections/hub/golden_path/bug fixes/Test for Bugfix #742 - Error code check.json b/collections/hub/golden_path/bug fixes/Test for Bugfix #742 - Error code check.json
@@ -25,7 +25,7 @@
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
             "Content-Type": "application/json",
-			 "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "ignoreCallbacks": true,
@@ -80,12 +80,12 @@
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
             "Content-Type": "application/json",
-			 "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "ignoreCallbacks": true,
           "body": {
-            "name": "payerfsp",
+            "name": "{$inputs.SIMPAYER_NAME}",
             "currency": "XOF"
           },
           "scriptingEngine": "javascript",
@@ -138,7 +138,7 @@
             "Accept": "application/vnd.interoperability.transfers+json;version=1.0",
             "Content-Type": "application/vnd.interoperability.transfers+json;version=1.0",
             "Date": "{$function.generic.curDate}",
-             "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "body": {

diff --git a/...hub/golden_path/bug fixes/Test for Bugfix #849 - missing ID for transfers and quotes.json b/...hub/golden_path/bug fixes/Test for Bugfix #849 - missing ID for transfers and quotes.json
@@ -99,8 +99,7 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Source": "{$inputs.NORESPONSE_SIMPAYEE_NAME}",
             "FSPIOP-Destination": "{$inputs.payeefsp}",
-			 "Authorization": "{$inputs.NORESPONSE_BEARER_TOKEN}"
-
+            "Authorization": "{$inputs.NORESPONSE_BEARER_TOKEN}"
           },
           "body": {
             "fulfilment": "{$inputs.validFulfillment}",

diff --git a/...ts for Bugfix #1009 - ML Adapter and ALS service health should include broker status.json b/...ts for Bugfix #1009 - ML Adapter and ALS service health should include broker status.json
@@ -57,7 +57,7 @@
           },
           "ignoreCallbacks": true,
           "scriptingEngine": "javascript",
-		  "headers": {
+          "headers": {
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
@@ -122,7 +122,7 @@
           },
           "ignoreCallbacks": true,
           "scriptingEngine": "javascript",
-		  "headers": {
+          "headers": {
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
@@ -187,7 +187,7 @@
           },
           "ignoreCallbacks": true,
           "scriptingEngine": "javascript",
-		  "headers": {
+          "headers": {
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
@@ -252,7 +252,7 @@
           },
           "ignoreCallbacks": true,
           "scriptingEngine": "javascript",
-		  "headers": {
+          "headers": {
             "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },

diff --git a/...s/hub/golden_path/bug fixes/Tests for Bugfix #981 - Fix 500 http code instead of 400.json b/...s/hub/golden_path/bug fixes/Tests for Bugfix #981 - Fix 500 http code instead of 400.json
@@ -25,7 +25,7 @@
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
             "Content-Type": "application/json",
-			 "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "ignoreCallbacks": true,
@@ -126,7 +126,7 @@
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
             "Content-Type": "application/json",
-			 "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}"
           },
           "ignoreCallbacks": true,

diff --git a/collections/hub/golden_path/bug fixes/Tests for Bugfix #990 and #1016 - Quotes.json b/collections/hub/golden_path/bug fixes/Tests for Bugfix #990 and #1016 - Quotes.json
@@ -26,7 +26,7 @@
             "Accept": "application/vnd.interoperability.quotes+json;version=1.0",
             "Content-Type": "application/vnd.interoperability.quotes+json;version=1.0",
             "Date": "{$function.generic.curDate}",
-             "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Destination": "{$inputs.toFspId}"
           },
@@ -191,7 +191,7 @@
             "Accept": "application/vnd.interoperability.quotes+json;version=1.0",
             "Content-Type": "application/vnd.interoperability.quotes+json;version=1.0",
             "Date": "{$function.generic.curDate}",
-             "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Destination": "{$inputs.toFspId}"
           },
@@ -301,7 +301,7 @@
             "Accept": "application/vnd.interoperability.quotes+json;version=1.0",
             "Content-Type": "application/vnd.interoperability.quotes+json;version=1.0",
             "Date": "{$function.generic.curDate}",
-             "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Destination": "{$inputs.toFspId}"
           },
@@ -421,7 +421,7 @@
             "Accept": "application/vnd.interoperability.quotes+json;version=1.0",
             "Content-Type": "application/vnd.interoperability.quotes+json;",
             "Date": "{$function.generic.curDate}",
-             "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Destination": "{$inputs.toFspId}"
           },
@@ -508,7 +508,7 @@
             "Accept": "application/vnd.interoperability.quotes+json;version=1.0",
             "Content-Type": "application/json",
             "Date": "{$function.generic.curDate}",
-             "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Destination": "{$inputs.toFspId}"
           },
@@ -682,7 +682,7 @@
             "Accept": "application/vnd.interoperability.quotes+json;version=1.0",
             "Content-Type": "application/vnd.interoperability.quotes+json;version=1.0",
             "Date": "{$function.generic.curDate}",
-             "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Destination": "payeefspNOTFOUND"
           },
@@ -863,7 +863,7 @@
             "Accept": "application/vnd.interoperability.quotes+json;version=1.0",
             "Content-Type": "application/vnd.interoperability.quotes+json;version=9.0",
             "Date": "{$function.generic.curDate}",
-             "FSPIOP-Source": "{$inputs.fromFspId}",
+            "FSPIOP-Source": "{$inputs.fromFspId}",
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Destination": "{$inputs.payeefsp}"
           },
@@ -1068,9 +1068,9 @@
             "Date": "{$function.generic.curDate}",
             "FSPIOP-Destination": "{$inputs.payeefsp}",
             "Accept": "application/vnd.interoperability.quotes+json;version=1.0",
-			"Authorization": "{$inputs.PAYER_BEARER_TOKEN}"
+            "Authorization": "{$inputs.PAYER_BEARER_TOKEN}"
           },
-          "tests":  {
+          "tests": {
             "assertions": [
               {
                 "id": 1,
@@ -1142,7 +1142,7 @@
             "Content-Type": "application/vnd.interoperability.quotes+json;version=1.0",
             "FSPIOP-Destination": "{$inputs.payeefsp}",
             "Accept": "application/vnd.interoperability.quotes+json;version=1.0",
-             "FSPIOP-Source": "{$inputs.SIMPAYER_NAME}",
+            "FSPIOP-Source": "{$inputs.SIMPAYER_NAME}",
             "Authorization": "{$inputs.PAYER_BEARER_TOKEN}"
           },
           "tests": {