From 8ff53b498924965b3336bcdc65f2169eebf520cf Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Tue, 30 Apr 2024 11:29:24 +0300 Subject: [PATCH] add validation --- library/common/templates/lib/cnpg/cluster/_backup.tpl | 5 +++-- .../lib/cnpg/cluster/_bootstrapRecoveryExternalCluster.tpl | 5 +++-- .../templates/lib/cnpg/providers/_providerSecretSpawner.tpl | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/library/common/templates/lib/cnpg/cluster/_backup.tpl b/library/common/templates/lib/cnpg/cluster/_backup.tpl index bec27a24..c6d5caab 100644 --- a/library/common/templates/lib/cnpg/cluster/_backup.tpl +++ b/library/common/templates/lib/cnpg/cluster/_backup.tpl @@ -17,6 +17,7 @@ backup: {{/* Fetch provider data */}} {{/* Get the creds defined in backup.$provider */}} {{- $creds := (get $rootCtx.Values.credentials $objectData.backups.credentials) -}} - {{ $provider := $creds.type -}} - {{- include (printf "tc.v1.common.lib.cnpg.cluster.barmanObjectStoreConfig.%s" $provider) (dict "rootCtx" $rootCtx "objectData" $objectData "data" $creds "type" "backup") | nindent 4 -}} + {{- include "tc.v1.common.lib.credentials.validation" (dict "rootCtx" $rootCtx "caller" "CNPG Backup" "credName" $objectData.backups.credentials) -}} + + {{- include (printf "tc.v1.common.lib.cnpg.cluster.barmanObjectStoreConfig.%s" $creds.type) (dict "rootCtx" $rootCtx "objectData" $objectData "data" $creds "type" "backup") | nindent 4 -}} {{- end -}} diff --git a/library/common/templates/lib/cnpg/cluster/_bootstrapRecoveryExternalCluster.tpl b/library/common/templates/lib/cnpg/cluster/_bootstrapRecoveryExternalCluster.tpl index 6798cf25..bea693cd 100644 --- a/library/common/templates/lib/cnpg/cluster/_bootstrapRecoveryExternalCluster.tpl +++ b/library/common/templates/lib/cnpg/cluster/_bootstrapRecoveryExternalCluster.tpl @@ -15,7 +15,8 @@ externalClusters: {{/* Fetch provider data */}} {{/* Get the creds defined in backup.$provider */}} {{- $creds := (get $rootCtx.Values.credentials $objectData.recovery.credentials) -}} - {{ $provider := $creds.type -}} - {{- include (printf "tc.v1.common.lib.cnpg.cluster.barmanObjectStoreConfig.%s" $provider) (dict "rootCtx" $rootCtx "objectData" $objectData "data" $creds "type" "recovery") | nindent 6 -}} + {{- include "tc.v1.common.lib.credentials.validation" (dict "rootCtx" $rootCtx "caller" "CNPG Recovery External Cluster" "credName" $objectData.recovery.credentials) -}} + + {{- include (printf "tc.v1.common.lib.cnpg.cluster.barmanObjectStoreConfig.%s" $creds.type) (dict "rootCtx" $rootCtx "objectData" $objectData "data" $creds "type" "recovery") | nindent 6 -}} {{- end -}} {{- end -}} diff --git a/library/common/templates/lib/cnpg/providers/_providerSecretSpawner.tpl b/library/common/templates/lib/cnpg/providers/_providerSecretSpawner.tpl index c999d9f1..adf3ee86 100644 --- a/library/common/templates/lib/cnpg/providers/_providerSecretSpawner.tpl +++ b/library/common/templates/lib/cnpg/providers/_providerSecretSpawner.tpl @@ -13,10 +13,12 @@ {{/* Get the creds defined in backup.$provider */}} {{- $creds = (get $rootCtx.Values.credentials $objectData.backups.credentials) -}} {{- $provider = $creds.type -}} + {{- include "tc.v1.common.lib.credentials.validation" (dict "rootCtx" $rootCtx "caller" "CNPG Backup" "credName" $objectData.backups.credentials) -}} {{- else if eq $type "recovery" -}} {{/* Get the creds defined in recovery.$provider */}} {{- $creds = (get $rootCtx.Values.credentials $objectData.recovery.credentials) -}} {{- $provider = $creds.type -}} + {{- include "tc.v1.common.lib.credentials.validation" (dict "rootCtx" $rootCtx "caller" "CNPG Backup" "credName" $objectData.recovery.credentials) -}} {{- end -}} {{- include (printf "tc.v1.common.lib.cnpg.provider.%s.validation" $provider) (dict "objectData" $objectData "creds" $creds) -}}