VDX-308: env var support in agent configs fix

sanderPostma · sanderPostma · commit 52e40fc88cc0 · 2023-11-15T11:30:36.000+01:00
diff --git a/packages/agent/conf/demos/energy-shr/oid4vci_metadata/energyshr.json b/packages/agent/conf/demos/energy-shr/oid4vci_metadata/energyshr.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}/issuer",
+  "correlationId": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}/issuer",
-    "credential_endpoint": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}/issuer/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "EnergySHR",
diff --git a/packages/agent/conf/demos/energy-shr/oid4vci_options/energyshr.json b/packages/agent/conf/demos/energy-shr/oid4vci_options/energyshr.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "energySHR",
-  "correlationId": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}/issuer",
+  "correlationId": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"
diff --git a/packages/agent/conf/demos/fmdm/oid4vci_metadata/fmdm.json b/packages/agent/conf/demos/fmdm/oid4vci_metadata/fmdm.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}/issuer",
+  "correlationId": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}/issuer",
-    "credential_endpoint": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}/issuer/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Future Mobility Alliance",
diff --git a/packages/agent/conf/demos/fmdm/oid4vci_options/fmdm.json b/packages/agent/conf/demos/fmdm/oid4vci_options/fmdm.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "fmdm2023",
-  "correlationId": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}/issuer",
+  "correlationId": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"
diff --git a/packages/agent/conf/demos/knb/auckland/oid4vci_metadata/knb_van_auckland.json b/packages/agent/conf/demos/knb/auckland/oid4vci_metadata/knb_van_auckland.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | 'http://localhost:5000'}/agent",
+  "correlationId": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | 'http://localhost:5000'}/agent",
-    "credential_endpoint": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | 'http://localhost:5000'}/agent/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Van Auckland notaries",
diff --git a/packages/agent/conf/demos/knb/auckland/oid4vci_options/knb_van_auckland.json b/packages/agent/conf/demos/knb/auckland/oid4vci_options/knb_van_auckland.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "knb-auckland",
-  "correlationId": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | 'http://localhost:5000'}/agent",
+  "correlationId": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"
diff --git a/packages/agent/conf/demos/knb/bank/oid4vci_metadata/knb_bank.json b/packages/agent/conf/demos/knb/bank/oid4vci_metadata/knb_bank.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | 'http://localhost:5000'}/agent",
+  "correlationId": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | 'http://localhost:5000'}/agent",
-    "credential_endpoint": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | 'http://localhost:5000'}/agent/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Babylon Bank",
diff --git a/packages/agent/conf/demos/knb/bank/oid4vci_options/knb_bank.json b/packages/agent/conf/demos/knb/bank/oid4vci_options/knb_bank.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "knb-bank",
-  "correlationId": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | 'http://localhost:5000'}/agent",
+  "correlationId": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"
diff --git a/packages/agent/conf/demos/knb/bank/oid4vp_options/knb_bank.json b/packages/agent/conf/demos/knb/bank/oid4vp_options/knb_bank.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "knb-bank",
-  "correlationId": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | 'http://localhost:5000'}/agent",
+  "correlationId": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"
diff --git a/packages/agent/conf/demos/knb/kvk/oid4vci_metadata/knb_kvk.json b/packages/agent/conf/demos/knb/kvk/oid4vci_metadata/knb_kvk.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | 'http://localhost:5000'}/agent",
+  "correlationId": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | 'http://localhost:5000'}/agent",
-    "credential_endpoint": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | 'http://localhost:5000'}/agent/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Kamer van koophandel",
diff --git a/packages/agent/conf/demos/knb/kvk/oid4vci_options/knb_kvk.json b/packages/agent/conf/demos/knb/kvk/oid4vci_options/knb_kvk.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "knb-kvk",
-  "correlationId": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | 'http://localhost:5000'}/agent",
+  "correlationId": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`		`- "correlationId": "${AGENT_ENDPOINT_ESHR \| AGENT_ENDPOINT \| 'http://localhost:5000'}/issuer",`
	`2`	`+ "correlationId": "${AGENT_ENDPOINT_ESHR \| AGENT_ENDPOINT \| 'http://localhost:5000'}",`
`3`	`3`	`"overwriteExisting": true,`
`4`	`4`	`"metadata": {`
`5`		`- "credential_issuer": "${AGENT_ENDPOINT_ESHR \| AGENT_ENDPOINT \| 'http://localhost:5000'}/issuer",`
`6`		`- "credential_endpoint": "${AGENT_ENDPOINT_ESHR \| AGENT_ENDPOINT \| 'http://localhost:5000'}/issuer/credentials",`
	`5`	`+ "credential_issuer": "${AGENT_ENDPOINT_ESHR \| AGENT_ENDPOINT \| 'http://localhost:5000'}",`
	`6`	`+ "credential_endpoint": "${AGENT_ENDPOINT_ESHR \| AGENT_ENDPOINT \| 'http://localhost:5000'}/credentials",`
`7`	`7`	`"display": [`
`8`	`8`	`{`
`9`	`9`	`"name": "EnergySHR",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"definitionId": "energySHR",`
`3`		`- "correlationId": "${AGENT_ENDPOINT_ESHR \| AGENT_ENDPOINT \| 'http://localhost:5000'}/issuer",`
	`3`	`+ "correlationId": "${AGENT_ENDPOINT_ESHR \| AGENT_ENDPOINT \| 'http://localhost:5000'}",`
`4`	`4`	`"issuerOpts": {`
`5`	`5`	`"didOpts": {`
`6`	`6`	`"checkLinkedDomains": "if_present"`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`		`- "correlationId": "${AGENT_ENDPOINT_FMDM \| AGENT_ENDPOINT \| 'http://localhost:5000'}/issuer",`
	`2`	`+ "correlationId": "${AGENT_ENDPOINT_FMDM \| AGENT_ENDPOINT \| 'http://localhost:5000'}",`
`3`	`3`	`"overwriteExisting": true,`
`4`	`4`	`"metadata": {`
`5`		`- "credential_issuer": "${AGENT_ENDPOINT_FMDM \| AGENT_ENDPOINT \| 'http://localhost:5000'}/issuer",`
`6`		`- "credential_endpoint": "${AGENT_ENDPOINT_FMDM \| AGENT_ENDPOINT \| 'http://localhost:5000'}/issuer/credentials",`
	`5`	`+ "credential_issuer": "${AGENT_ENDPOINT_FMDM \| AGENT_ENDPOINT \| 'http://localhost:5000'}",`
	`6`	`+ "credential_endpoint": "${AGENT_ENDPOINT_FMDM \| AGENT_ENDPOINT \| 'http://localhost:5000'}/credentials",`
`7`	`7`	`"display": [`
`8`	`8`	`{`
`9`	`9`	`"name": "Future Mobility Alliance",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"definitionId": "fmdm2023",`
`3`		`- "correlationId": "${AGENT_ENDPOINT_FMDM \| AGENT_ENDPOINT \| 'http://localhost:5000'}/issuer",`
	`3`	`+ "correlationId": "${AGENT_ENDPOINT_FMDM \| AGENT_ENDPOINT \| 'http://localhost:5000'}",`
`4`	`4`	`"issuerOpts": {`
`5`	`5`	`"didOpts": {`
`6`	`6`	`"checkLinkedDomains": "if_present"`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`		`- "correlationId": "${AGENT_ENDPOINT_NOTARY \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent",`
	`2`	`+ "correlationId": "${AGENT_ENDPOINT_NOTARY \| AGENT_ENDPOINT \| http://localhost:5000'}",`
`3`	`3`	`"overwriteExisting": true,`
`4`	`4`	`"metadata": {`
`5`		`- "credential_issuer": "${AGENT_ENDPOINT_NOTARY \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent",`
`6`		`- "credential_endpoint": "${AGENT_ENDPOINT_NOTARY \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent/credentials",`
	`5`	`+ "credential_issuer": "${AGENT_ENDPOINT_NOTARY \| AGENT_ENDPOINT \| http://localhost:5000'}",`
	`6`	`+ "credential_endpoint": "${AGENT_ENDPOINT_NOTARY \| AGENT_ENDPOINT \| http://localhost:5000'}/credentials",`
`7`	`7`	`"display": [`
`8`	`8`	`{`
`9`	`9`	`"name": "Van Auckland notaries",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"definitionId": "knb-auckland",`
`3`		`- "correlationId": "${AGENT_ENDPOINT_NOTARY \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent",`
	`3`	`+ "correlationId": "${AGENT_ENDPOINT_NOTARY \| AGENT_ENDPOINT \| http://localhost:5000'}",`
`4`	`4`	`"issuerOpts": {`
`5`	`5`	`"didOpts": {`
`6`	`6`	`"checkLinkedDomains": "if_present"`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`		`- "correlationId": "${AGENT_ENDPOINT_BANK \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent",`
	`2`	`+ "correlationId": "${AGENT_ENDPOINT_BANK \| AGENT_ENDPOINT \| http://localhost:5000'}",`
`3`	`3`	`"overwriteExisting": true,`
`4`	`4`	`"metadata": {`
`5`		`- "credential_issuer": "${AGENT_ENDPOINT_BANK \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent",`
`6`		`- "credential_endpoint": "${AGENT_ENDPOINT_BANK \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent/credentials",`
	`5`	`+ "credential_issuer": "${AGENT_ENDPOINT_BANK \| AGENT_ENDPOINT \| http://localhost:5000'}",`
	`6`	`+ "credential_endpoint": "${AGENT_ENDPOINT_BANK \| AGENT_ENDPOINT \| http://localhost:5000'}/credentials",`
`7`	`7`	`"display": [`
`8`	`8`	`{`
`9`	`9`	`"name": "Babylon Bank",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"definitionId": "knb-bank",`
`3`		`- "correlationId": "${AGENT_ENDPOINT_BANK \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent",`
	`3`	`+ "correlationId": "${AGENT_ENDPOINT_BANK \| AGENT_ENDPOINT \| http://localhost:5000'}",`
`4`	`4`	`"issuerOpts": {`
`5`	`5`	`"didOpts": {`
`6`	`6`	`"checkLinkedDomains": "if_present"`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`		`- "correlationId": "${AGENT_ENDPOINT_KVK \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent",`
	`2`	`+ "correlationId": "${AGENT_ENDPOINT_KVK \| AGENT_ENDPOINT \| http://localhost:5000'}",`
`3`	`3`	`"overwriteExisting": true,`
`4`	`4`	`"metadata": {`
`5`		`- "credential_issuer": "${AGENT_ENDPOINT_KVK \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent",`
`6`		`- "credential_endpoint": "${AGENT_ENDPOINT_KVK \| AGENT_ENDPOINT \| 'http://localhost:5000'}/agent/credentials",`
	`5`	`+ "credential_issuer": "${AGENT_ENDPOINT_KVK \| AGENT_ENDPOINT \| http://localhost:5000'}",`
	`6`	`+ "credential_endpoint": "${AGENT_ENDPOINT_KVK \| AGENT_ENDPOINT \| http://localhost:5000'}/credentials",`
`7`	`7`	`"display": [`
`8`	`8`	`{`
`9`	`9`	`"name": "Kamer van koophandel",`