From 238ccaf22580edf1fff4ba48e8206be19941cab2 Mon Sep 17 00:00:00 2001 From: Paul Nicolas Date: Mon, 13 Nov 2023 17:15:10 +0100 Subject: [PATCH] fix operator tests --- .../search-benthos-streams.yaml | 29 ++++++++++++------- .../deployments-apps-v1/search-benthos.yaml | 2 +- .../payments-v1.0.0-beta.3-pre-upgrade.yaml | 17 +++++++++++ 3 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/migrations-stack.formance.com-v1beta3/payments-v1.0.0-beta.3-pre-upgrade.yaml 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 9e8ac7e73f..a4fca3bf31 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 @@ -323,34 +323,34 @@ data: { "match": { "kind": "PAYMENT" - }, + } }, { "match": { "kind": "PAYMENT_ACCOUNT" - }, + } }, { "match": { "kind": "PAYMENT_BALANCE" - }, + } }, { "match": { "kind": "PAYMENT_BANK_ACCOUNT" - }, + } }, { "match": { "kind": "PAYMENT_TRANSFER_INITIATION" - }, + } } ] } }, { "match": { - "indexed.provider": this.payload.connector + "indexed.connectorId": this.payload.connectorId } }, { @@ -376,9 +376,18 @@ data: } }, { - "match": { - "indexed.id": this.payload.id - } + "should": [ + { + "match": { + "indexed.id": this.payload.id + } + }, + { + "match": { + "indexed.provider": this.payload.provider + } + } + ] }, { "match": { @@ -400,7 +409,7 @@ data: enabled: ${BASIC_AUTH_ENABLED} username: ${BASIC_AUTH_USERNAME} password: ${BASIC_AUTH_PASSWORD} - payments_ingestion.yaml: "input:\n event_bus:\n topic: payments\n consumer_group: search\n\npipeline:\n processors:\n - switch_event_type:\n events:\n - label: SAVED_PAYMENT\n processors:\n - bloblang: |\n root = {\n \"data\": this.payload,\n \"indexed\": {\n \"provider\": this.payload.provider,\n \"reference\": this.payload.reference,\n \"scheme\": this.payload.scheme,\n \"type\": this.payload.type,\n \"status\": this.payload.status,\n \"id\": this.payload.id,\n \"initialAmount\": this.payload.initialAmount,\n \"createdAt\": this.payload.createdAt\n },\n \"kind\": \"PAYMENT\",\n \"when\": this.date\n }\n meta action = \"index\"\n meta id = \"PAYMENT-%s\".format(this.payload.id)\n - label: SAVED_ACCOUNT\n processors:\n - bloblang: |\n root = {\n \"data\": this.payload,\n \"indexed\": {\n \"provider\": this.payload.provider,\n \"reference\": this.payload.reference,\n \"createdAt\": this.payload.createdAt,\n \"id\": this.payload.id,\n \"type\": this.payload.type,\n \"defaultAsset\": this.payload.defaultAsset,\n \"accountName\": this.payload.accountName\n },\n \"kind\": \"PAYMENT_ACCOUNT\",\n \"when\": this.date\n }\n meta action = \"index\"\n meta id = \"PAYMENT-ACCOUNT-%s\".format(this.payload.id)\n - label: SAVED_BALANCE\n processors:\n - bloblang: |\n root = {\n \"data\": this.payload,\n \"indexed\": {\n \"provider\": this.payload.provider,\n \"createdAt\": this.payload.createdAt,\n \"accountId\": this.payload.accountID,\n \"asset\": this.payload.asset,\n \"balance\": this.payload.balance\n },\n \"kind\": \"PAYMENT_BALANCE\",\n \"when\": this.date\n }\n meta action = \"index\"\n meta id = \"PAYMENT-BALANCE-%s-%s\".format(this.payload.accountId, this.payload.asset)\n - label: SAVED_BANK_ACCOUNT\n processors:\n - bloblang: |\n root = {\n \"data\": this.payload,\n \"indexed\": {\n \"id\": this.payload.id,\n \"createdAt\": this.payload.createdAt,\n \"provider\": this.payload.provider,\n \"name\": this.payload.name,\n \"accountNumber\": this.payload.accountNumber,\n \"iban\": this.payload.iban,\n \"swiftBicCode\": this.payload.swiftBicCode,\n \"country\": this.payload.country,\n \"accountId\": this.payload.accountID\n },\n \"kind\": \"PAYMENT_BANK_ACCOUNT\",\n \"when\": this.date\n }\n meta action = \"index\"\n meta id = \"PAYMENT-BANK-ACCOUNT-%s\".format(this.payload.id)\n - label: SAVED_TRANSFER_INITIATION\n processors:\n - bloblang: |\n root = {\n \"data\": this.payload,\n \"indexed\": {\n \"id\": this.payload.id,\n \"createdAt\": this.payload.createdAt,\n \"scheduledAt\": this.payload.scheduledAt,\n \"updatedAt\": this.payload.updatedAt,\n \"provider\": this.payload.provider,\n \"description\": this.payload.description,\n \"type\": this.payload.type,\n \"sourceAccountId\": this.payload.sourceAccountID,\n \"destinationAccountId\": this.payload.destinationAccountID,\n \"amount\": this.payload.amount,\n \"asset\": this.payload.asset,\n \"attempts\": this.payload.attempts,\n \"status\": this.payload.status,\n \"error\": this.payload.error,\n \"relatedPayment\": this.payload.relatedPayment\n },\n \"kind\": \"PAYMENT_TRANSFER_INITIATION\",\n \"when\": this.date\n }\n meta action = \"index\"\n meta id = \"PAYMENT-TRANSFER-INITIATION-%s\".format(this.payload.id)\n \n\noutput:\n resource: elasticsearch\n" + payments_ingestion.yaml: "input:\n event_bus:\n topic: payments\n consumer_group: search\n\npipeline:\n processors:\n - switch_event_type:\n events:\n - label: SAVED_PAYMENT\n processors:\n - bloblang: |\n root = {\n \"data\": this.payload,\n \"indexed\": {\n \"id\": this.payload.id,\n \"reference\": this.payload.reference,\n \"provider\": this.payload.provider,\n \"createdAt\": this.payload.createdAt,\n \"connectorId\": this.payload.connectorId,\n \"type\": this.payload.type,\n \"status\": this.payload.status,\n \"scheme\": this.payload.scheme,\n \"asset\": this.payload.asset,\n \"initialAmount\": this.payload.initialAmount\n },\n \"kind\": \"PAYMENT\",\n \"when\": this.date\n }\n meta action = \"index\"\n meta id = \"PAYMENT-%s\".format(this.payload.id)\n - label: SAVED_ACCOUNT\n processors:\n - bloblang: |\n root = {\n \"data\": this.payload,\n \"indexed\": {\n \"id\": this.payload.id,\n \"provider\": this.payload.provider,\n \"createdAt\": this.payload.createdAt,\n \"reference\": this.payload.reference,\n \"connectorId\": this.payload.connectorId,\n \"defaultAsset\": this.payload.defaultAsset,\n \"accountName\": this.payload.accountName,\n \"type\": this.payload.type\n },\n \"kind\": \"PAYMENT_ACCOUNT\",\n \"when\": this.date\n }\n meta action = \"index\"\n meta id = \"PAYMENT-ACCOUNT-%s\".format(this.payload.id)\n - label: SAVED_BALANCE\n processors:\n - bloblang: |\n root = {\n \"data\": this.payload,\n \"indexed\": {\n \"accountId\": this.payload.accountID,\n \"provider\": this.payload.provider,\n \"connectorId\": this.payload.connectorId,\n \"createdAt\": this.payload.createdAt,\n \"asset\": this.payload.asset,\n \"balance\": this.payload.balance\n },\n \"kind\": \"PAYMENT_BALANCE\",\n \"when\": this.date\n }\n meta action = \"index\"\n meta id = \"PAYMENT-BALANCE-%s-%s\".format(this.payload.accountId, this.payload.asset)\n - label: SAVED_BANK_ACCOUNT\n processors:\n - bloblang: |\n root = {\n \"data\": this.payload,\n \"indexed\": {\n \"id\": this.payload.id,\n \"createdAt\": this.payload.createdAt,\n \"connectorId\": this.payload.connectorId,\n \"name\": this.payload.name,\n \"accountNumber\": this.payload.accountNumber,\n \"iban\": this.payload.iban,\n \"swiftBicCode\": this.payload.swiftBicCode,\n \"country\": this.payload.country,\n \"provider\": this.payload.provider,\n \"accountId\": this.payload.accountID\n },\n \"kind\": \"PAYMENT_BANK_ACCOUNT\",\n \"when\": this.date\n }\n meta action = \"index\"\n meta id = \"PAYMENT-BANK-ACCOUNT-%s\".format(this.payload.id)\n - label: SAVED_TRANSFER_INITIATION\n processors:\n - bloblang: |\n root = {\n \"data\": this.payload,\n \"indexed\": {\n \"id\": this.payload.id,\n \"createdAt\": this.payload.createdAt,\n \"scheduledAt\": this.payload.scheduledAt,\n \"updatedAt\": this.payload.updatedAt,\n \"connectorId\": this.payload.connectorId,\n \"description\": this.payload.description,\n \"type\": this.payload.type,\n \"provider\": this.payload.provider,\n \"sourceAccountId\": this.payload.sourceAccountID,\n \"destinationAccountId\": this.payload.destinationAccountID,\n \"amount\": this.payload.amount,\n \"asset\": this.payload.asset,\n \"attempts\": this.payload.attempts,\n \"status\": this.payload.status,\n \"error\": this.payload.error,\n \"relatedPayment\": this.payload.relatedPayment\n },\n \"kind\": \"PAYMENT_TRANSFER_INITIATION\",\n \"when\": this.date\n }\n meta action = \"index\"\n meta id = \"PAYMENT-TRANSFER-INITIATION-%s\".format(this.payload.id)\n \n\noutput:\n resource: elasticsearch\n" kind: ConfigMap metadata: labels: 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 5598aa6e62..e7f10720fc 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: UXfSw4__EAaJBZzasvjSEBQdMgu0fIS1hfvkTevjxEM= + stack.formance.cloud/volumes-hash: hn1jIm1FetuAGcLCxqla0je3ANmri9eTTJ7XuSrf4j4= creationTimestamp: null labels: app.kubernetes.io/name: search-benthos diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/migrations-stack.formance.com-v1beta3/payments-v1.0.0-beta.3-pre-upgrade.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/migrations-stack.formance.com-v1beta3/payments-v1.0.0-beta.3-pre-upgrade.yaml new file mode 100644 index 0000000000..9cf13e3bfb --- /dev/null +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-with-gateway-fallback/results/migrations-stack.formance.com-v1beta3/payments-v1.0.0-beta.3-pre-upgrade.yaml @@ -0,0 +1,17 @@ +apiVersion: stack.formance.com/v1beta3 +kind: Migration +metadata: + generation: 1 + labels: + stack: "true" + name: payments-v1.0.0-beta.3-pre-upgrade + namespace: multipod-latest-with-gateway-fallback +spec: + configuration: multipod-latest-with-gateway-fallback + currentVersion: latest + module: payments + postUpgrade: false + targetedVersion: v1.0.0-beta.3 + version: multipod-latest-with-gateway-fallback +status: + terminated: true