From 8d57c67ad4a648466a0abe5b8f24bed2371f5e0c Mon Sep 17 00:00:00 2001 From: Paul Nicolas Date: Wed, 13 Dec 2023 19:32:13 +0100 Subject: [PATCH] feat(payments): push raw data in nats but not in benthos (#1012) --- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- .../results/configmaps--v1/search-benthos-streams.yaml | 2 +- .../results/deployments-apps-v1/search-benthos.yaml | 2 +- components/payments/internal/messages/payments.go | 3 +++ .../benthos/streams/payments/v0.0.0/payments_ingestion.yaml | 2 +- 34 files changed, 36 insertions(+), 33 deletions(-) diff --git a/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml index 3180843ce6..d4634f38de 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml index ddd26d505d..faf22139cc 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml index d53a3077ba..4690e3b788 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml index d099664800..28c51b8ace 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/monopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/monopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml index 174d7cbe0b..96a473ccdc 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-streams.yaml index be5d0a04e8..2c7feeea6e 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-streams.yaml index 310b98be10..2616bf1aac 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/deployments-apps-v1/search-benthos.yaml index c62fcd603f..d3cce60c7b 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: -UoS45tOcCl3jiSwzxW_3wpgEP5fZtADgfvq9c999bk= + stack.formance.cloud/volumes-hash: zAMPIto8AXFdiwdNiCVG3o8e_2plT6XlsIrrlxf0NcA= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml index 262b0a4738..80e3206cca 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/deployments-apps-v1/search-benthos.yaml index e223273bd2..04875be997 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: -UoS45tOcCl3jiSwzxW_3wpgEP5fZtADgfvq9c999bk= + stack.formance.cloud/volumes-hash: zAMPIto8AXFdiwdNiCVG3o8e_2plT6XlsIrrlxf0NcA= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/configmaps--v1/search-benthos-streams.yaml index 7baf24bb25..d121a50cc5 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/deployments-apps-v1/search-benthos.yaml index 4e6236576b..c8a8681636 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: ZCAv3TDE8_leBkgtrdIjpiELW6zKYWYZ_4UZz3IQZtk= + stack.formance.cloud/volumes-hash: iXL4EcTjD7D2Zkq9Qb1D6Bctp8pGhkzkiwtjjBeKSnU= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-check-scopes/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-check-scopes/results/configmaps--v1/search-benthos-streams.yaml index 25578c16e7..b1abd6db78 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-check-scopes/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-check-scopes/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-check-scopes/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-check-scopes/results/deployments-apps-v1/search-benthos.yaml index 2a41f91804..f8e56a1b75 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-check-scopes/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-check-scopes/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: -UoS45tOcCl3jiSwzxW_3wpgEP5fZtADgfvq9c999bk= + stack.formance.cloud/volumes-hash: zAMPIto8AXFdiwdNiCVG3o8e_2plT6XlsIrrlxf0NcA= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-custom-registry/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-custom-registry/results/configmaps--v1/search-benthos-streams.yaml index 2a457a45e3..f1c8d7a954 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-custom-registry/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-custom-registry/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-custom-registry/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-custom-registry/results/deployments-apps-v1/search-benthos.yaml index 967621e757..d68261f5ce 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-custom-registry/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-custom-registry/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: -UoS45tOcCl3jiSwzxW_3wpgEP5fZtADgfvq9c999bk= + stack.formance.cloud/volumes-hash: zAMPIto8AXFdiwdNiCVG3o8e_2plT6XlsIrrlxf0NcA= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/configmaps--v1/search-benthos-streams.yaml index 7a5f3d5698..d485f62506 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/deployments-apps-v1/search-benthos.yaml index 020f451fef..adb5ff874b 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: -UoS45tOcCl3jiSwzxW_3wpgEP5fZtADgfvq9c999bk= + stack.formance.cloud/volumes-hash: zAMPIto8AXFdiwdNiCVG3o8e_2plT6XlsIrrlxf0NcA= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-secrets/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-secrets/results/configmaps--v1/search-benthos-streams.yaml index e654eeb4ca..71a3dd88f7 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-secrets/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-secrets/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-secrets/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-secrets/results/deployments-apps-v1/search-benthos.yaml index f604ba0e98..c330b417fb 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-secrets/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-secrets/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: -UoS45tOcCl3jiSwzxW_3wpgEP5fZtADgfvq9c999bk= + stack.formance.cloud/volumes-hash: zAMPIto8AXFdiwdNiCVG3o8e_2plT6XlsIrrlxf0NcA= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/configmaps--v1/search-benthos-streams.yaml index 3ebffb4c24..661889f435 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/deployments-apps-v1/search-benthos.yaml index 9e996cdcc9..9c79a4a79b 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: -UoS45tOcCl3jiSwzxW_3wpgEP5fZtADgfvq9c999bk= + stack.formance.cloud/volumes-hash: zAMPIto8AXFdiwdNiCVG3o8e_2plT6XlsIrrlxf0NcA= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-orchestration-v0.2.0/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-orchestration-v0.2.0/results/configmaps--v1/search-benthos-streams.yaml index 10b15e269a..a157d515f7 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-orchestration-v0.2.0/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-orchestration-v0.2.0/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-orchestration-v0.2.0/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-orchestration-v0.2.0/results/deployments-apps-v1/search-benthos.yaml index 69d3cae611..53f5f4dc24 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-orchestration-v0.2.0/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-orchestration-v0.2.0/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: -UoS45tOcCl3jiSwzxW_3wpgEP5fZtADgfvq9c999bk= + stack.formance.cloud/volumes-hash: zAMPIto8AXFdiwdNiCVG3o8e_2plT6XlsIrrlxf0NcA= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/configmaps--v1/search-benthos-streams.yaml index d88df383f1..e4c0885e48 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/deployments-apps-v1/search-benthos.yaml index 121f9ef45a..4a1be92a3f 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: ZCAv3TDE8_leBkgtrdIjpiELW6zKYWYZ_4UZz3IQZtk= + stack.formance.cloud/volumes-hash: iXL4EcTjD7D2Zkq9Qb1D6Bctp8pGhkzkiwtjjBeKSnU= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log-unvalid-tag/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log-unvalid-tag/results/configmaps--v1/search-benthos-streams.yaml index 911a0ca77e..9bc3d1776f 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log-unvalid-tag/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log-unvalid-tag/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log-unvalid-tag/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log-unvalid-tag/results/deployments-apps-v1/search-benthos.yaml index 1a05d711d4..360c6d3e42 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log-unvalid-tag/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log-unvalid-tag/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: F6bbZbx0MQNCbgZUdSGeciveDQa7otqWM4t6cfklKHU= + stack.formance.cloud/volumes-hash: ohqyd8i40N1OhA-WN_ifFolSeJokKiFPJd4m-8X3ybA= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log/results/configmaps--v1/search-benthos-streams.yaml index e66700ac6e..eb22c15698 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log/results/deployments-apps-v1/search-benthos.yaml index dedca7202e..138f43b459 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-with-audit-log/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: F6bbZbx0MQNCbgZUdSGeciveDQa7otqWM4t6cfklKHU= + stack.formance.cloud/volumes-hash: ohqyd8i40N1OhA-WN_ifFolSeJokKiFPJd4m-8X3ybA= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-without-audit-log/results/configmaps--v1/search-benthos-streams.yaml b/components/operator/internal/controllers/stack/testdata/multipod-without-audit-log/results/configmaps--v1/search-benthos-streams.yaml index 1158cb7119..3291204469 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-without-audit-log/results/configmaps--v1/search-benthos-streams.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-without-audit-log/results/configmaps--v1/search-benthos-streams.yaml @@ -151,7 +151,7 @@ data: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference, diff --git a/components/operator/internal/controllers/stack/testdata/multipod-without-audit-log/results/deployments-apps-v1/search-benthos.yaml b/components/operator/internal/controllers/stack/testdata/multipod-without-audit-log/results/deployments-apps-v1/search-benthos.yaml index 008fa60ddc..760038605b 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-without-audit-log/results/deployments-apps-v1/search-benthos.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-without-audit-log/results/deployments-apps-v1/search-benthos.yaml @@ -20,7 +20,7 @@ spec: template: metadata: annotations: - stack.formance.cloud/volumes-hash: ZCAv3TDE8_leBkgtrdIjpiELW6zKYWYZ_4UZz3IQZtk= + stack.formance.cloud/volumes-hash: iXL4EcTjD7D2Zkq9Qb1D6Bctp8pGhkzkiwtjjBeKSnU= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/payments/internal/messages/payments.go b/components/payments/internal/messages/payments.go index e0ace929bd..f026f11863 100644 --- a/components/payments/internal/messages/payments.go +++ b/components/payments/internal/messages/payments.go @@ -1,6 +1,7 @@ package messages import ( + "encoding/json" "math/big" "time" @@ -18,6 +19,7 @@ type paymentMessagePayload struct { Status models.PaymentStatus `json:"status"` Scheme models.PaymentScheme `json:"scheme"` Asset models.Asset `json:"asset"` + RawData json.RawMessage `json:"rawData"` // TODO: Remove 'initialAmount' once frontend has switched to 'amount InitialAmount *big.Int `json:"initialAmount"` @@ -38,6 +40,7 @@ func NewEventSavedPayments(provider models.ConnectorProvider, payment *models.Pa CreatedAt: payment.CreatedAt, ConnectorID: payment.ConnectorID.String(), Provider: provider.String(), + RawData: payment.RawData, Metadata: func() map[string]string { ret := make(map[string]string) for _, m := range payment.Metadata { diff --git a/ee/search/benthos/streams/payments/v0.0.0/payments_ingestion.yaml b/ee/search/benthos/streams/payments/v0.0.0/payments_ingestion.yaml index 228a9a9cc3..5b02838253 100644 --- a/ee/search/benthos/streams/payments/v0.0.0/payments_ingestion.yaml +++ b/ee/search/benthos/streams/payments/v0.0.0/payments_ingestion.yaml @@ -13,7 +13,7 @@ pipeline: - bloblang: | root = { "document": { - "data": this.payload, + "data": this.payload.without("rawData"), "indexed": { "id": this.payload.id, "reference": this.payload.reference,