feat(mojaloop/#3984): parameterize switch id

account-lookup-service/chart-admin/configs/default.json

@@ -1,5 +1,9 @@
 {{- $centralServicesHost := ( .Values.config.central_services_host | replace "$release_name" .Release.Name ) -}}
 {
+  "HUB_PARTICIPANT": {
+    "ID": {{ .Values.config.hub_participant.id }},
+    "NAME": {{ .Values.config.hub_participant.name | quote }}
+  },
   "ADMIN_PORT":  {{ .Values.service.internalPort }},
   "API_PORT":  4002,
   "PROTOCOL_VERSIONS": {{ .Values.config.protocol_versions | toPrettyJson }},
@@ -67,7 +71,6 @@
   "ENDPOINT_SECURITY": {
     "JWS": {
       "JWS_SIGN": {{ .Values.config.endpointSecurity.jwsSign }},
-      "FSPIOP_SOURCE_TO_SIGN": {{ .Values.config.endpointSecurity.fspiopSourceSigningName | quote }},
       "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
     }
   },

account-lookup-service/chart-admin/values.yaml

@@ -122,6 +122,9 @@ metrics:
       serviceName: account-lookup-service-admin
 
 config:
+  hub_participant:
+    id: 1
+    name: Hub
   ## Central-Ledger config
   central_services_host: '$release_name-centralledger-service'
   central_services_port: 80
@@ -206,7 +209,6 @@ config:
 
   endpointSecurity:
     jwsSign: false
-    fspiopSourceSigningName: switch
     # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key.
     # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored.
     # Expected properties of `jwsSigningKeySecret` are `name` and `key`.

account-lookup-service/chart-service/configs/default.json

@@ -1,5 +1,9 @@
 {{- $centralServicesHost := ( .Values.config.central_services_host | replace "$release_name" .Release.Name ) -}}
 {
+  "HUB_PARTICIPANT": {
+    "ID": {{ .Values.config.hub_participant.id }},
+    "NAME": {{ .Values.config.hub_participant.name | quote }}
+  },
   "ADMIN_PORT":  4001,
   "API_PORT":  {{ .Values.service.internalPort }},
   "PROTOCOL_VERSIONS": {{ .Values.config.protocol_versions | toPrettyJson }},
@@ -67,7 +71,6 @@
   "ENDPOINT_SECURITY": {
     "JWS": {
       "JWS_SIGN": {{ .Values.config.endpointSecurity.jwsSign }},
-      "FSPIOP_SOURCE_TO_SIGN": {{ .Values.config.endpointSecurity.fspiopSourceSigningName | quote }},
       "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
     }
   },

account-lookup-service/chart-service/values.yaml

@@ -124,6 +124,9 @@ metrics:
       serviceName: account-lookup-service
 
 config:
+  hub_participant:
+    id: 1
+    name: Hub
   ## Central-Ledger config
   central_services_host: '$release_name-centralledger-service'
   central_services_port: 80
@@ -208,7 +211,6 @@ config:
 
   endpointSecurity:
     jwsSign: false
-    fspiopSourceSigningName: switch
     # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key.
     # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored.
     # Expected properties of `jwsSigningKeySecret` are `name` and `key`.

account-lookup-service/values.yaml

@@ -61,6 +61,9 @@ account-lookup-service:
         serviceName: account-lookup-service
 
   config:
+    hub_participant:
+      id: 1
+      name: Hub
     ## Central-Ledger config
     central_services_host: '$release_name-centralledger-service'
     central_services_port: 80
@@ -139,7 +142,6 @@ account-lookup-service:
 
     endpointSecurity:
       jwsSign: false
-      fspiopSourceSigningName: switch
       # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key.
       # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored.
       # Expected properties of `jwsSigningKeySecret` are `name` and `key`.
@@ -382,6 +384,9 @@ account-lookup-service-admin:
         serviceName: account-lookup-service-admin
 
   config:
+    hub_participant:
+      id: 1
+      name: Hub
     ## Central-Ledger config
     central_services_host: '$release_name-centralledger-service'
     central_services_port: 80
@@ -456,7 +461,6 @@ account-lookup-service-admin:
 
     endpointSecurity:
       jwsSign: false
-      fspiopSourceSigningName: switch
       # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key.
       # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored.
       # Expected properties of `jwsSigningKeySecret` are `name` and `key`.

bulk-api-adapter/chart-handler-notification/configs/default.json

@@ -2,6 +2,10 @@
 {{- $centralServicesHost := ( .Values.config.central_services_host | replace "$release_name" .Release.Name ) -}}
 {{- $mongoHost := ( .Values.config.mongo_host | replace "$release_name" .Release.Name ) -}}
 {
+  "HUB_PARTICIPANT": {
+    "ID": {{ .Values.config.hub_participant.id }},
+    "NAME": {{ .Values.config.hub_participant.name | quote }}
+  },
   "PORT": {{ .Values.service.internalPort }},
   "HOSTNAME": "{{ .Values.ingress.hostname }}",
   "PROTOCOL_VERSIONS": {{ .Values.config.protocol_versions | toPrettyJson }},
@@ -24,7 +28,6 @@
     },
     "JWS": {
       "JWS_SIGN": {{ .Values.config.endpointSecurity.jwsSign }},
-      "FSPIOP_SOURCE_TO_SIGN": {{ .Values.config.endpointSecurity.fspiopSourceSigningName | quote }},
       "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
     }
   },

bulk-api-adapter/chart-handler-notification/values.yaml

@@ -93,6 +93,9 @@ metrics:
       serviceName: bulk-handler-notification
 
 config:
+  hub_participant:
+    id: 1
+    name: Hub
   # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used.
   kafka_host: kafka
   kafka_port: 9092
@@ -145,7 +148,6 @@ config:
   # Parameters for JWS signing requests
   endpointSecurity:
     jwsSign: false
-    fspiopSourceSigningName: 'switch'
     # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key.
     # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored.
     # Expected properties of `jwsSigningKeySecret` are `name` and `key`.

bulk-api-adapter/chart-service/configs/default.json

@@ -2,6 +2,10 @@
 {{- $centralServicesHost := ( .Values.config.central_services_host | replace "$release_name" .Release.Name ) -}}
 {{- $mongoHost := ( .Values.config.mongo_host | replace "$release_name" .Release.Name ) -}}
 {
+  "HUB_PARTICIPANT": {
+    "ID": {{ .Values.config.hub_participant.id }},
+    "NAME": {{ .Values.config.hub_participant.name | quote }}
+  },
   "PORT": {{ .Values.service.internalPort }},
   "HOSTNAME": "{{ .Values.ingress.hostname }}",
   "PROTOCOL_VERSIONS": {{ .Values.config.protocol_versions | toPrettyJson }},
@@ -24,7 +28,6 @@
     },
     "JWS": {
       "JWS_SIGN": false,
-      "FSPIOP_SOURCE_TO_SIGN": "switch",
       "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
     }
   },

bulk-api-adapter/chart-service/values.yaml

@@ -91,6 +91,9 @@ metrics:
       serviceName: bulk-service
 
 config:
+  hub_participant:
+    id: 1
+    name: Hub
   # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used.
   kafka_host: kafka
   kafka_port: 9092

bulk-api-adapter/values.yaml

@@ -475,7 +475,6 @@ bulk-api-adapter-handler-notification:
     # Parameters for JWS signing requests
     endpointSecurity:
       jwsSign: false
-      fspiopSourceSigningName: 'switch'
       # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key.
       # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored.
       # Expected properties of `jwsSigningKeySecret` are `name` and `key`.

bulk-centralledger/chart-handler-bulk-transfer-get/templates/deployment.yaml

@@ -17,7 +17,7 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "centralledger-handler-admin-transfer.name" . }}
+      app.kubernetes.io/name: {{ include "centralledger-handler-bulk-transfer-get.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:

bulk-centralledger/chart-handler-bulk-transfer-get/templates/secret.yaml

@@ -5,7 +5,7 @@ kind: Secret
 metadata:
   name: {{ template "centralledger-handler-bulk-transfer-get.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "centralledger-handler-admin-transfer.name" . }}
+    app.kubernetes.io/name: {{ include "centralledger-handler-bulk-transfer-get.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.Version }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}

bulk-centralledger/chart-handler-bulk-transfer-get/templates/service.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ template "centralledger-handler-bulk-transfer-get.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "centralledger-handler-admin-transfer.name" . }}
+    app.kubernetes.io/name: {{ include "centralledger-handler-bulk-transfer-get.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.Version }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}

centralledger/chart-service/values.yaml

@@ -279,7 +279,7 @@ initContainers: |
         value: {{ .Values.config.db_password }}
         {{- end }}
     volumeMounts:
-      - name: '{{ template "account-lookup-service-admin.fullname" . }}-config-volume'
+      - name: '{{ template "centralledger-service.fullname" . }}-config-volume'
         mountPath: /opt/app/config
 
 ## @param master.podLabels Extra labels for pod(s)

centralledger/values.yaml

@@ -296,7 +296,7 @@ centralledger-service:
           value: {{ .Values.config.db_password }}
           {{- end }}
       volumeMounts:
-        - name: '{{ template "account-lookup-service-admin.fullname" . }}-config-volume'
+        - name: '{{ template "centralledger-service.fullname" . }}-config-volume'
           mountPath: /opt/app/config
 
   service:

ml-api-adapter/chart-handler-notification/configs/default.json

@@ -1,6 +1,10 @@
 {{- $kafkaHost := ( .Values.config.kafka_host | replace "$release_name" .Release.Name ) -}}
 {{- $centralServicesHost := ( .Values.config.central_services_host | replace "$release_name" .Release.Name ) -}}
 {
+    "HUB_PARTICIPANT": {
+        "ID": {{ .Values.config.hub_participant.id }},
+        "NAME": {{ .Values.config.hub_participant.name | quote }}
+    },
     "PORT": {{ .Values.service.internalPort }},
     "ENDPOINT_SOURCE_URL": "http://{{ $centralServicesHost }}:{{ .Values.config.central_services_port }}",
     "ENDPOINT_HEALTH_URL": "http://{{ $centralServicesHost }}:{{ .Values.config.central_services_port }}{{ .Values.config.central_services_health_endpoint_param }}",
@@ -11,7 +15,6 @@
     "ENDPOINT_SECURITY":{
         "JWS": {
           "JWS_SIGN": {{ .Values.config.endpointSecurity.jwsSign }},
-          "FSPIOP_SOURCE_TO_SIGN": {{ .Values.config.endpointSecurity.fspiopSourceSigningName | quote }},
           "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
         },
         "TLS": {

ml-api-adapter/chart-handler-notification/values.yaml

@@ -144,6 +144,9 @@ metrics:
       serviceName: ml-handler-notification
 
 config:
+  hub_participant:
+    id: 1
+    name: Hub
   # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used.
   kafka_host: kafka
   kafka_port: 9092
@@ -207,7 +210,6 @@ config:
   # Parameters for JWS signing requests generated by ml-api-adapter
   endpointSecurity:
     jwsSign: false
-    fspiopSourceSigningName: 'switch'
     # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key.
     # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored.
     # Expected properties of `jwsSigningKeySecret` are `name` and `key`.

ml-api-adapter/chart-service/configs/default.json

@@ -1,6 +1,10 @@
 {{- $kafkaHost := ( .Values.config.kafka_host | replace "$release_name" .Release.Name ) -}}
 {{- $centralServicesHost := ( .Values.config.central_services_host | replace "$release_name" .Release.Name ) -}}
 {
+    "HUB_PARTICIPANT": {
+        "ID": {{ .Values.config.hub_participant.id }},
+        "NAME": {{ .Values.config.hub_participant.name | quote }}
+    },
     "PORT": {{ .Values.service.internalPort }},
     "ENDPOINT_SOURCE_URL": "http://{{ $centralServicesHost }}:{{ .Values.config.central_services_port }}",
     "ENDPOINT_HEALTH_URL": "http://{{ $centralServicesHost }}:{{ .Values.config.central_services_port }}{{ .Values.config.central_services_health_endpoint_param }}",
@@ -11,7 +15,6 @@
     "ENDPOINT_SECURITY":{
         "JWS": {
             "JWS_SIGN": false,
-            "FSPIOP_SOURCE_TO_SIGN": "switch",
             "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
           },
         "TLS": {

ml-api-adapter/chart-service/values.yaml

@@ -151,6 +151,9 @@ metrics:
       serviceName: ml-service
 
 config:
+  hub_participant:
+    id: 1
+    name: Hub
   # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used.
   kafka_host: kafka
   kafka_port: 9092

ml-api-adapter/values.yaml

@@ -145,6 +145,9 @@ ml-api-adapter-service:
     enabled: true
 
   config:
+    hub_participant:
+      id: 1
+      name: Hub
     # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used.
     kafka_host: kafka
     kafka_port: 9092
@@ -459,6 +462,9 @@ ml-api-adapter-handler-notification:
     enabled: true
 
   config:
+    hub_participant:
+      id: 1
+      name: Hub
     # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used.
     kafka_host: kafka
     kafka_port: 9092
@@ -520,7 +526,6 @@ ml-api-adapter-handler-notification:
     # Parameters for JWS signing requests generated by ml-api-adapter
     endpointSecurity:
       jwsSign: false
-      fspiopSourceSigningName: 'switch'
       # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key.
       # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored.
       # Expected properties of `jwsSigningKeySecret` are `name` and `key`.

mojaloop-bulk/values.yaml

@@ -111,6 +111,9 @@ bulk-api-adapter:
           serviceName: bulk-service
 
     config:
+      hub_participant:
+        id: 1
+        name: Hub
       # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used.
       kafka_host: kafka
       kafka_port: 9092
@@ -445,6 +448,9 @@ bulk-api-adapter:
           serviceName: bulk-handler-notification
 
     config:
+      hub_participant:
+        id: 1
+        name: Hub
       # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used.
       kafka_host: kafka
       kafka_port: 9092
@@ -497,7 +503,6 @@ bulk-api-adapter:
       # Parameters for JWS signing requests
       endpointSecurity:
         jwsSign: false
-        fspiopSourceSigningName: 'switch'
         # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key.
         # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored.
         # Expected properties of `jwsSigningKeySecret` are `name` and `key`.