From ec1fae97fb53e6b42e7b6af26e318aea06f8097f Mon Sep 17 00:00:00 2001 From: Arya Haldar Date: Wed, 7 Feb 2024 20:30:52 +0530 Subject: [PATCH] Revert change to helm helper functions for OPA --- src/common/Chart.yaml | 2 +- src/common/templates/_databaseconnectionsv2.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/Chart.yaml b/src/common/Chart.yaml index 6909d58..0f0c63a 100644 --- a/src/common/Chart.yaml +++ b/src/common/Chart.yaml @@ -15,7 +15,7 @@ type: library # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.10 +version: 1.3.11 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/src/common/templates/_databaseconnectionsv2.tpl b/src/common/templates/_databaseconnectionsv2.tpl index cdf765c..7665560 100644 --- a/src/common/templates/_databaseconnectionsv2.tpl +++ b/src/common/templates/_databaseconnectionsv2.tpl @@ -502,7 +502,7 @@ USAGE: {{- $sslMode := default "disable" .sslMode }} {{- if $installed }} {{- if $keywordValueConnectionString }} - {{- $connectionString := (printf "host=%s user=$%s password=$%s dbname=%s sslmode=%s" "postgres" $userVariableName $passwordVariableName .database $sslMode) }} + {{- $connectionString := (printf "host=%s user=%s password=%s dbname=%s sslmode=%s" "postgres" $userVariableName $passwordVariableName .database $sslMode) }} {{- printf "%s" $connectionString }} {{- else }} {{- $connectionString := (printf "%s://$(%s):$(%s)@%s/%s?%s" "postgres" $userVariableName $passwordVariableName "postgres:5432" .database .args) }} @@ -519,7 +519,7 @@ USAGE: {{- $firsthostport := (index $hosts 0) -}} {{- $hostport := split ":" $firsthostport -}} {{- if $keywordValueConnectionString }} - {{- $connectionString := (printf "host=%s user=$%s password=$%s dbname=%s sslmode=%s" $hostport._0 $userVariableName $passwordVariableName .database $sslMode) }} + {{- $connectionString := (printf "host=%s user=%s password=%s dbname=%s sslmode=%s" $hostport._0 $userVariableName $passwordVariableName .database $sslMode) }} {{- printf "%s" $connectionString }} {{- else }} {{- include "harnesscommon.dbconnection.connection" (dict "type" $type "hosts" $hosts "protocol" $protocol "extraArgs" $finalArgs "userVariableName" $userVariableName "passwordVariableName" $passwordVariableName)}}