From 7be26c1f7bbc269cff0e5f9cf95b2697e9e2b061 Mon Sep 17 00:00:00 2001 From: Ragot Geoffrey Date: Mon, 9 Oct 2023 11:36:19 +0200 Subject: [PATCH] feat(search): add 'init-mapping' subcommand (#569) feat: add 'init-mapping' sub command --- .../stack.formance.com_configurations.yaml | 20 +++++------ ...ion_configurations.stack.formance.com.yaml | 20 +++++------ .../jobs-batch-v1/auth-create-database.yaml | 2 +- .../payments-create-database.yaml | 2 +- .../webhooks-create-database.yaml | 2 +- .../jobs-batch-v1/auth-create-database.yaml | 2 +- .../jobs-batch-v1/ledger-create-database.yaml | 2 +- .../orchestration-create-database.yaml | 2 +- .../payments-create-database.yaml | 2 +- .../webhooks-create-database.yaml | 2 +- .../jobs-batch-v1/auth-create-database.yaml | 2 +- .../jobs-batch-v1/ledger-create-database.yaml | 2 +- .../orchestration-create-database.yaml | 2 +- .../payments-create-database.yaml | 2 +- .../webhooks-create-database.yaml | 2 +- .../jobs-batch-v1/auth-create-database.yaml | 2 +- .../jobs-batch-v1/ledger-create-database.yaml | 2 +- .../orchestration-create-database.yaml | 2 +- .../payments-create-database.yaml | 2 +- .../webhooks-create-database.yaml | 2 +- .../jobs-batch-v1/auth-create-database.yaml | 2 +- .../jobs-batch-v1/ledger-create-database.yaml | 2 +- .../orchestration-create-database.yaml | 2 +- .../payments-create-database.yaml | 2 +- .../webhooks-create-database.yaml | 2 +- .../jobs-batch-v1/auth-create-database.yaml | 2 +- .../jobs-batch-v1/ledger-create-database.yaml | 2 +- .../payments-create-database.yaml | 2 +- .../webhooks-create-database.yaml | 2 +- .../jobs-batch-v1/auth-create-database.yaml | 2 +- .../jobs-batch-v1/ledger-create-database.yaml | 2 +- .../orchestration-create-database.yaml | 2 +- .../payments-create-database.yaml | 2 +- .../webhooks-create-database.yaml | 2 +- .../jobs-batch-v1/auth-create-database.yaml | 2 +- .../jobs-batch-v1/ledger-create-database.yaml | 2 +- .../orchestration-create-database.yaml | 2 +- .../payments-create-database.yaml | 2 +- .../webhooks-create-database.yaml | 2 +- .../jobs-batch-v1/auth-create-database.yaml | 2 +- .../jobs-batch-v1/ledger-create-database.yaml | 2 +- .../orchestration-create-database.yaml | 2 +- .../payments-create-database.yaml | 2 +- .../webhooks-create-database.yaml | 2 +- components/search/cmd/init_mapping.go | 33 +++++++++++++++++ components/search/cmd/root.go | 5 +-- components/search/cmd/{server.go => serve.go} | 36 ++++++++++--------- 47 files changed, 116 insertions(+), 82 deletions(-) create mode 100644 components/search/cmd/init_mapping.go rename components/search/cmd/{server.go => serve.go} (87%) diff --git a/components/operator/config/crd/bases/stack.formance.com_configurations.yaml b/components/operator/config/crd/bases/stack.formance.com_configurations.yaml index 9578276fd4..63185fa538 100644 --- a/components/operator/config/crd/bases/stack.formance.com_configurations.yaml +++ b/components/operator/config/crd/bases/stack.formance.com_configurations.yaml @@ -4229,6 +4229,8 @@ spec: type: boolean postgres: properties: + credentialsFromSecret: + type: string disableSSLMode: type: boolean host: @@ -4241,9 +4243,7 @@ spec: type: string required: - host - - password - port - - username type: object resourceProperties: properties: @@ -4400,6 +4400,8 @@ spec: type: object postgres: properties: + credentialsFromSecret: + type: string disableSSLMode: type: boolean host: @@ -4412,9 +4414,7 @@ spec: type: string required: - host - - password - port - - username type: object resourceProperties: properties: @@ -4451,6 +4451,8 @@ spec: type: boolean postgres: properties: + credentialsFromSecret: + type: string disableSSLMode: type: boolean host: @@ -4463,9 +4465,7 @@ spec: type: string required: - host - - password - port - - username type: object resourceProperties: properties: @@ -4504,6 +4504,8 @@ spec: type: string postgres: properties: + credentialsFromSecret: + type: string disableSSLMode: type: boolean host: @@ -4516,9 +4518,7 @@ spec: type: string required: - host - - password - port - - username type: object resourceProperties: properties: @@ -4711,6 +4711,8 @@ spec: type: boolean postgres: properties: + credentialsFromSecret: + type: string disableSSLMode: type: boolean host: @@ -4723,9 +4725,7 @@ spec: type: string required: - host - - password - port - - username type: object resourceProperties: properties: diff --git a/components/operator/helm/templates/gen/apiextensions.k8s.io_v1_customresourcedefinition_configurations.stack.formance.com.yaml b/components/operator/helm/templates/gen/apiextensions.k8s.io_v1_customresourcedefinition_configurations.stack.formance.com.yaml index f3b696c7f9..e2bdb056b2 100644 --- a/components/operator/helm/templates/gen/apiextensions.k8s.io_v1_customresourcedefinition_configurations.stack.formance.com.yaml +++ b/components/operator/helm/templates/gen/apiextensions.k8s.io_v1_customresourcedefinition_configurations.stack.formance.com.yaml @@ -4240,6 +4240,8 @@ spec: type: boolean postgres: properties: + credentialsFromSecret: + type: string disableSSLMode: type: boolean host: @@ -4252,9 +4254,7 @@ spec: type: string required: - host - - password - port - - username type: object resourceProperties: properties: @@ -4411,6 +4411,8 @@ spec: type: object postgres: properties: + credentialsFromSecret: + type: string disableSSLMode: type: boolean host: @@ -4423,9 +4425,7 @@ spec: type: string required: - host - - password - port - - username type: object resourceProperties: properties: @@ -4462,6 +4462,8 @@ spec: type: boolean postgres: properties: + credentialsFromSecret: + type: string disableSSLMode: type: boolean host: @@ -4474,9 +4476,7 @@ spec: type: string required: - host - - password - port - - username type: object resourceProperties: properties: @@ -4515,6 +4515,8 @@ spec: type: string postgres: properties: + credentialsFromSecret: + type: string disableSSLMode: type: boolean host: @@ -4527,9 +4529,7 @@ spec: type: string required: - host - - password - port - - username type: object resourceProperties: properties: @@ -4722,6 +4722,8 @@ spec: type: boolean postgres: properties: + credentialsFromSecret: + type: string disableSSLMode: type: boolean host: @@ -4734,9 +4736,7 @@ spec: type: string required: - host - - password - port - - username type: object resourceProperties: properties: diff --git a/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/auth-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/auth-create-database.yaml index f88376a167..adda4b0809 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/auth-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/auth-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/payments-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/payments-create-database.yaml index bb0ba7e3b1..0469270f3b 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/payments-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/payments-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/webhooks-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/webhooks-create-database.yaml index 65801aa10d..51006fd685 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/webhooks-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-disabled-one-service/results/jobs-batch-v1/webhooks-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/auth-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/auth-create-database.yaml index 1fbecc2811..8665289243 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/auth-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/auth-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/ledger-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/ledger-create-database.yaml index 61a6b15720..705d56d88d 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/ledger-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/ledger-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/orchestration-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/orchestration-create-database.yaml index d65733f34c..45b7e6ffca 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/orchestration-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/orchestration-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/payments-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/payments-create-database.yaml index 8b5c0ae9e5..ef14cfa3eb 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/payments-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/payments-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/webhooks-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/webhooks-create-database.yaml index ad8e8c200b..cf4ab19c0c 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/webhooks-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-latest/results/jobs-batch-v1/webhooks-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/auth-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/auth-create-database.yaml index fdec939a43..65a02fad3e 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/auth-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/auth-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/ledger-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/ledger-create-database.yaml index a968d4094c..5a67fbdf0f 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/ledger-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/ledger-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/orchestration-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/orchestration-create-database.yaml index 1707f66ff3..c9fcfaab1c 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/orchestration-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/orchestration-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/payments-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/payments-create-database.yaml index a867328cfb..c7d6d5155c 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/payments-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/payments-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/webhooks-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/webhooks-create-database.yaml index 0b626e6833..7e4ce4243d 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/webhooks-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-ledgerv1/results/jobs-batch-v1/webhooks-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/auth-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/auth-create-database.yaml index 3bd46c6145..5afe792ff3 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/auth-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/auth-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/ledger-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/ledger-create-database.yaml index 42e41c200c..23c9671a5c 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/ledger-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/ledger-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/orchestration-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/orchestration-create-database.yaml index 3a97864e5a..9dcb58f6b2 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/orchestration-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/orchestration-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/payments-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/payments-create-database.yaml index 0de389a66d..5db8839a0f 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/payments-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/payments-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/webhooks-create-database.yaml b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/webhooks-create-database.yaml index eb043f9573..cc219e0f9e 100644 --- a/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/webhooks-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/monopod-search-before-v0.7.0/results/jobs-batch-v1/webhooks-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/auth-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/auth-create-database.yaml index e64283cefd..a2dfc2d8da 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/auth-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/auth-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/ledger-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/ledger-create-database.yaml index 7b4af8f807..68649f6aea 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/ledger-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/ledger-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/orchestration-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/orchestration-create-database.yaml index b88e48cca2..86608665e2 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/orchestration-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/orchestration-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/payments-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/payments-create-database.yaml index a0f1a26769..91bb4a1bc4 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/payments-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/payments-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/webhooks-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/webhooks-create-database.yaml index 85a061b15b..1949b5378a 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/webhooks-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-debug/results/jobs-batch-v1/webhooks-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/auth-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/auth-create-database.yaml index 5daed07353..4a546adc60 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/auth-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/auth-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/ledger-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/ledger-create-database.yaml index f1101b6b5f..f830ab0181 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/ledger-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/ledger-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/payments-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/payments-create-database.yaml index 90521321f7..b3d5a864c4 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/payments-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/payments-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/webhooks-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/webhooks-create-database.yaml index d45c192885..9c96c3411a 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/webhooks-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-disabled-one-service/results/jobs-batch-v1/webhooks-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/auth-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/auth-create-database.yaml index 8d9a22b212..a1046d07ba 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/auth-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/auth-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/ledger-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/ledger-create-database.yaml index 793adc0c1b..251a38d9c3 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/ledger-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/ledger-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/orchestration-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/orchestration-create-database.yaml index f5304aa2fa..1fcb52e80f 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/orchestration-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/orchestration-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/payments-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/payments-create-database.yaml index a3e65511b8..0bd67428da 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/payments-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/payments-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/webhooks-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/webhooks-create-database.yaml index 9d47febcfe..eff8b274b8 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/webhooks-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest-no-monitoring/results/jobs-batch-v1/webhooks-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/auth-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/auth-create-database.yaml index 45d3f1476b..7beceb75ea 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/auth-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/auth-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/ledger-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/ledger-create-database.yaml index 683a45c943..569023e696 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/ledger-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/ledger-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/orchestration-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/orchestration-create-database.yaml index c370da0283..2375c41217 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/orchestration-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/orchestration-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/payments-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/payments-create-database.yaml index 5027e43f65..433bb26a43 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/payments-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/payments-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/webhooks-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/webhooks-create-database.yaml index 6dee3aee75..2f6824ea66 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/webhooks-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-latest/results/jobs-batch-v1/webhooks-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/auth-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/auth-create-database.yaml index 84ea22d913..a89ea01ce4 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/auth-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/auth-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/ledger-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/ledger-create-database.yaml index 34084b9a70..f815582cc7 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/ledger-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/ledger-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/orchestration-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/orchestration-create-database.yaml index 15a131e503..41e78123f4 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/orchestration-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/orchestration-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/payments-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/payments-create-database.yaml index 5d37be273e..08b620c3e6 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/payments-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/payments-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/webhooks-create-database.yaml b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/webhooks-create-database.yaml index d5ee54582e..e2e4eadc4a 100644 --- a/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/webhooks-create-database.yaml +++ b/components/operator/internal/controllers/stack/testdata/multipod-service-annotation/results/jobs-batch-v1/webhooks-create-database.yaml @@ -24,7 +24,7 @@ spec: - args: - sh - -c - - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} + - echo SELECT \'CREATE DATABASE \"${POSTGRES_DATABASE}\"\' WHERE NOT EXISTS \(SELECT FROM pg_database WHERE datname = \'${POSTGRES_DATABASE}\'\)\\gexec | psql -h ${POSTGRES_HOST} -p ${POSTGRES_PORT} -U ${POSTGRES_USERNAME} "sslmode=disable" env: - name: POSTGRES_HOST value: localhost diff --git a/components/search/cmd/init_mapping.go b/components/search/cmd/init_mapping.go new file mode 100644 index 0000000000..dee5a5e3e8 --- /dev/null +++ b/components/search/cmd/init_mapping.go @@ -0,0 +1,33 @@ +package cmd + +import ( + "github.com/formancehq/search/pkg/searchengine" + "github.com/pkg/errors" + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +func NewInitMapping() *cobra.Command { + return &cobra.Command{ + Use: "init-mapping", + Short: "Init ElasticSearch mapping", + RunE: func(cmd *cobra.Command, args []string) error { + openSearchServiceHost := viper.GetString(openSearchServiceFlag) + if openSearchServiceHost == "" { + exitWithError(cmd.Context(), "missing open search service host") + } + + client, err := newOpensearchClient(openSearchServiceHost) + if err != nil { + return err + } + + esIndex := viper.GetString(esIndicesFlag) + if esIndex == "" { + return errors.New("es index not defined") + } + + return searchengine.CreateIndex(cmd.Context(), client, esIndex) + }, + } +} diff --git a/components/search/cmd/root.go b/components/search/cmd/root.go index 8fc7d355a1..29e8d95c22 100644 --- a/components/search/cmd/root.go +++ b/components/search/cmd/root.go @@ -31,10 +31,7 @@ func NewRootCommand() *cobra.Command { DisableAutoGenTag: true, } - version := NewVersion() - root.AddCommand(version) - server := NewServer() - root.AddCommand(server) + root.AddCommand(NewVersion(), NewServer(), NewInitMapping()) root.Flags().Bool(service.DebugFlag, false, "debug mode") err := viper.BindPFlags(root.Flags()) diff --git a/components/search/cmd/server.go b/components/search/cmd/serve.go similarity index 87% rename from components/search/cmd/server.go rename to components/search/cmd/serve.go index 0e6a5fb687..0fa11649cd 100644 --- a/components/search/cmd/server.go +++ b/components/search/cmd/serve.go @@ -106,25 +106,29 @@ func exitWithError(ctx context.Context, msg string) { os.Exit(1) } +func newOpensearchClient(openSearchServiceHost string) (*opensearch.Client, error) { + httpTransport := http.DefaultTransport + httpTransport.(*http.Transport).TLSClientConfig = &tls.Config{ + InsecureSkipVerify: true, + } + + if viper.GetBool(app.DebugFlag) { + httpTransport = httpclient.NewDebugHTTPTransport(httpTransport) + } + + return opensearch.NewClient(opensearch.Config{ + Addresses: []string{viper.GetString(openSearchSchemeFlag) + "://" + openSearchServiceHost}, + Transport: otelhttp.NewTransport(httpTransport), + Username: viper.GetString(openSearchUsernameFlag), + Password: viper.GetString(openSearchPasswordFlag), + UseResponseCheckOnly: true, + }) +} + func opensearchClientModule(openSearchServiceHost string, loadMapping bool, esIndex string) fx.Option { options := []fx.Option{ fx.Provide(func() (*opensearch.Client, error) { - httpTransport := http.DefaultTransport - httpTransport.(*http.Transport).TLSClientConfig = &tls.Config{ - InsecureSkipVerify: true, - } - - if viper.GetBool(app.DebugFlag) { - httpTransport = httpclient.NewDebugHTTPTransport(httpTransport) - } - - return opensearch.NewClient(opensearch.Config{ - Addresses: []string{viper.GetString(openSearchSchemeFlag) + "://" + openSearchServiceHost}, - Transport: otelhttp.NewTransport(httpTransport), - Username: viper.GetString(openSearchUsernameFlag), - Password: viper.GetString(openSearchPasswordFlag), - UseResponseCheckOnly: true, - }) + return newOpensearchClient(openSearchServiceHost) }), } if loadMapping {