improve text

infitx-org · Oct 17, 2024 · 2814cbb · 2814cbb
1 parent 95ec4ff
commit 2814cbb
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 65 deletions.
diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml
@@ -1,12 +1,21 @@
-name: Update Mojaloop images
+name: Update Mojaloop image tags
+run-name: Update Mojaloop image tags (${{ github.event.inputs.tag || github.event_name }}) - ${{ github.event.inputs.image }}
 
 on:
   workflow_dispatch:
     inputs:
       image:
         description: Published image
+        default: '*'
       tag:
         description: Updated tag
+      upstream:
+        description: Upstream job URL
+  push:
+    branches:
+      - main
+    paths:
+      - updatecli.d/*
   schedule:
     - cron: '0 0 * * *'
 
@@ -25,17 +34,21 @@ jobs:
         uses: updatecli/updatecli-action@v2
 
       - name: Update image tags
-        run: updatecli apply
+        run: |
+          echo "Updating Mojaloop image tags:" > update.log
+          echo "${{ github.event.inputs.upstream }}" > update.log
+          updatecli apply |& tee /dev/tty | grep -o '[^.]*\.image\.tag" updated from .*,' | sed -e 's/[",]//g;s/^/- /' >> update.log
 
       - name: Create pull request
         id: create_pr
         uses: peter-evans/create-pull-request@v7
         with:
-          commit-message: Update Mojaloop image versions
-          title: Update Mojaloop image versions
+          commit-message: Update Mojaloop image tags (${{ github.event.inputs.tag || github.event_name }}) - ${{ github.event.inputs.image }}
+          title: Update Mojaloop image tags (${{ github.event.inputs.tag || github.event_name }}) - ${{ github.event.inputs.image }}
+          body-path: update.log
 
       - name: Auto merge pull request
-        if: steps.create_pr.outputs.pull-request-number
+        if: steps.create_pr.outputs.pull-request-number && github.event_name != 'push'
         uses: peter-evans/enable-pull-request-automerge@v3
         with:
           pull-request-number: ${{ steps.create_pr.outputs.pull-request-number }}

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ the following chain of events:
 1. This workflow checks the Docker Hub for the latest Mojaloop docker images that
    fulfill the semver conditions specified in the manifest files in the
    [updatecli.d](updatecli.d) directory.
-1. If there are new images that fulfill the conditions, the workflow updates the
+1. If there are new images that fulfill the conditions, the workflow
    creates a pull request with the latest versions set in the `*-override.yaml`
    files, which is automatically merged.
 1. The merge starts the [gitlab.yaml](.github/workflows/gitlab.yaml) workflow,

diff --git a/mojaloop-values-override.yaml b/mojaloop-values-override.yaml
@@ -1,31 +1,35 @@
-DEFINE:
-  account-lookup-service: &accountImage
-    image:
-      tag: v15.6.0-iso.1
-  central-ledger: &ledgerImage
-    image: &ledgerImageTag
-      tag: v17.9.0-iso.1
-  ml-api-adapter: &adapterImage
-    image:
-      tag: v14.2.0-iso.2
-  ml-testing-toolkit: &toolkitBackendImage
-    image:
-      tag: v17.3.1
-  ml-testing-toolkit-ui: &toolkitFrontendImage
-    image:
-      tag: v15.6.0
-  quoting-service: &quotingImage
-    image:
-      tag: v15.9.0-iso.2
-  sdk-scheme-adapter: &schemeAdapterImage
-    image:
-      tag: v23.6.0-snapshot.17
-  transaction-request-service: &transactionRequestImage
-    image:
-      tag: v14.3.1
-  mojaloop-simulator: &simulatorImage
-    image:
-      tag: v15.1.1
+_DEFINE:
+  CONTINUOUS_DEPLOYMENT:
+    account-lookup-service: &accountImage
+      image:
+        tag: v15.6.0-iso.1
+    central-ledger: &ledgerImage
+      image: &ledgerImageTag
+        tag: v17.9.0-iso.1
+    ml-api-adapter: &adapterImage
+      image:
+        tag: v14.2.0-iso.2
+    ml-testing-toolkit: &toolkitBackendImage
+      image:
+        tag: v17.3.1
+    ml-testing-toolkit-ui: &toolkitFrontendImage
+      image:
+        tag: v15.6.0
+    quoting-service: &quotingImage
+      image:
+        tag: v15.9.0-iso.2
+    sdk-scheme-adapter: &schemeAdapterImage
+      image:
+        tag: v23.6.0-snapshot.17
+    transaction-request-service: &transactionRequestImage
+      image:
+        tag: v14.3.1
+    mojaloop-simulator: &simulatorImage
+      image:
+        tag: v15.1.1
+    central-settlement: &settlementImage
+      image:
+        tag: v17.0.0-snapshot.10
 ml-testing-toolkit:
   ml-testing-toolkit-backend: *toolkitBackendImage
   ml-testing-toolkit-frontend: *toolkitFrontendImage
@@ -63,3 +67,8 @@ mojaloop-simulator:
     testfsp2: *simulatorConfig
     testfsp3: *simulatorConfig
     testfsp4: *simulatorConfig
+centralsettlement:
+  centralsettlement-service: *settlementImage
+  centralsettlement-handler-deferredsettlement: *settlementImage
+  centralsettlement-handler-grosssettlement: *settlementImage
+  centralsettlement-handler-rules: *settlementImage
diff --git a/proxy-values-override.yaml b/proxy-values-override.yaml
@@ -1,7 +1,8 @@
-DEFINE:
-  management-api: &management-api
-    image:
-      tag: 6.1.1
+_DEFINE:
+  CONTINUOUS_DEPLOYMENT:
+    management-api: &management-api
+      image:
+        tag: 6.1.1
 inter-scheme-proxy-adapter:
   image:
     tag: 1.3.0-snapshot.7

diff --git a/todo/manifest.yaml b/todo/manifest.yaml
@@ -112,116 +112,116 @@ targets:
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.mojaloop-simulator.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.mojaloop-simulator.image.tag
   simulator:
     kind: yaml
     sourceid: simulator
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.simulator.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.simulator.image.tag
   central-settlement:
     kind: yaml
     sourceid: central-settlement
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.central-settlement.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.central-settlement.image.tag
   reporting-hub-bop-api-svc:
     kind: yaml
     sourceid: reporting-hub-bop-api-svc
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.reporting-hub-bop-api-svc.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.reporting-hub-bop-api-svc.image.tag
   reporting-events-processor-svc:
     kind: yaml
     sourceid: reporting-events-processor-svc
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.reporting-events-processor-svc.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.reporting-events-processor-svc.image.tag
   reporting-hub-bop-experience-api-svc:
     kind: yaml
     sourceid: reporting-hub-bop-experience-api-svc
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.reporting-hub-bop-experience-api-svc.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.reporting-hub-bop-experience-api-svc.image.tag
   reporting-hub-bop-role-ui:
     kind: yaml
     sourceid: reporting-hub-bop-role-ui
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.reporting-hub-bop-role-ui.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.reporting-hub-bop-role-ui.image.tag
   reporting-hub-bop-settlements-ui:
     kind: yaml
     sourceid: reporting-hub-bop-settlements-ui
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.reporting-hub-bop-settlements-ui.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.reporting-hub-bop-settlements-ui.image.tag
   reporting-hub-bop-shell:
     kind: yaml
     sourceid: reporting-hub-bop-shell
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.reporting-hub-bop-shell.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.reporting-hub-bop-shell.image.tag
   reporting-hub-bop-trx-ui:
     kind: yaml
     sourceid: reporting-hub-bop-trx-ui
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.reporting-hub-bop-trx-ui.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.reporting-hub-bop-trx-ui.image.tag
   reporting:
     kind: yaml
     sourceid: reporting
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.reporting.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.reporting.image.tag
   role-assignment-service:
     kind: yaml
     sourceid: role-assignment-service
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.role-assignment-service.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.role-assignment-service.image.tag
   reporting-hub-bop-positions-ui:
     kind: yaml
     sourceid: reporting-hub-bop-positions-ui
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.reporting-hub-bop-positions-ui.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.reporting-hub-bop-positions-ui.image.tag
   event-sidecar:
     kind: yaml
     sourceid: event-sidecar
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.event-sidecar.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.event-sidecar.image.tag
   ml-testing-toolkit-client-lib:
     kind: yaml
     sourceid: ml-testing-toolkit-client-lib
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.ml-testing-toolkit-client-lib.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.ml-testing-toolkit-client-lib.image.tag
   ml-testing-toolkit-ui:
     kind: yaml
     sourceid: ml-testing-toolkit-ui
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.ml-testing-toolkit-ui.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.ml-testing-toolkit-ui.image.tag
   sdk-scheme-adapter:
     kind: yaml
     sourceid: sdk-scheme-adapter
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.sdk-scheme-adapter.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.sdk-scheme-adapter.image.tag
diff --git a/updatecli.d/account-lookup-service.yaml b/updatecli.d/account-lookup-service.yaml
@@ -13,4 +13,4 @@ targets:
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.account-lookup-service.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.account-lookup-service.image.tag
diff --git a/updatecli.d/central-ledger.yaml b/updatecli.d/central-ledger.yaml
@@ -13,4 +13,4 @@ targets:
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.central-ledger.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.central-ledger.image.tag
diff --git a/updatecli.d/central-settlement.yaml b/updatecli.d/central-settlement.yaml
@@ -0,0 +1,16 @@
+name: Update Mojaloop central-settlement
+sources:
+  image:
+    kind: dockerimage
+    spec:
+      image: mojaloop/central-settlement
+      versionfilter:
+        kind: semver
+        pattern: '>=v17.0.0-snapshot.0 <=v17.0.0-snapshot.9999'
+targets:
+  yaml:
+    kind: yaml
+    spec:
+      engine: yamlpath
+      file: mojaloop-values-override.yaml
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.central-settlement.image.tag
diff --git a/updatecli.d/ml-api-adapter.yaml b/updatecli.d/ml-api-adapter.yaml
@@ -13,4 +13,4 @@ targets:
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.ml-api-adapter.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.ml-api-adapter.image.tag
diff --git a/updatecli.d/ml-testing-toolkit-ui.yaml b/updatecli.d/ml-testing-toolkit-ui.yaml
@@ -13,4 +13,4 @@ targets:
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.ml-testing-toolkit-ui.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.ml-testing-toolkit-ui.image.tag
diff --git a/updatecli.d/ml-testing-toolkit.yaml b/updatecli.d/ml-testing-toolkit.yaml
@@ -13,4 +13,4 @@ targets:
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.ml-testing-toolkit.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.ml-testing-toolkit.image.tag
diff --git a/updatecli.d/mojaloop-simulator.yaml b/updatecli.d/mojaloop-simulator.yaml
@@ -13,4 +13,4 @@ targets:
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.mojaloop-simulator.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.mojaloop-simulator.image.tag
diff --git a/updatecli.d/proxy-mojaloop-payment-manager-management-api.yaml b/updatecli.d/proxy-mojaloop-payment-manager-management-api.yaml
@@ -13,4 +13,4 @@ targets:
     spec:
       engine: yamlpath
       file: proxy-values-override.yaml
-      key: $.DEFINE.management-api.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.management-api.image.tag
diff --git a/updatecli.d/quoting-service.yaml b/updatecli.d/quoting-service.yaml
@@ -13,4 +13,4 @@ targets:
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.quoting-service.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.quoting-service.image.tag
diff --git a/updatecli.d/sdk-scheme-adapter.yaml b/updatecli.d/sdk-scheme-adapter.yaml
@@ -13,4 +13,4 @@ targets:
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.sdk-scheme-adapter.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.sdk-scheme-adapter.image.tag
diff --git a/updatecli.d/transaction-requests-service.yaml b/updatecli.d/transaction-requests-service.yaml
@@ -13,4 +13,4 @@ targets:
     spec:
       engine: yamlpath
       file: mojaloop-values-override.yaml
-      key: $.DEFINE.transaction-request-service.image.tag
+      key: $._DEFINE.CONTINUOUS_DEPLOYMENT.transaction-request-service.image.tag