Skip to content

[cherry-pick] Only set "PGSSLMODE" mode env variable when SSL is enabled (#801) #805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2021
Merged

[cherry-pick] Only set "PGSSLMODE" mode env variable when SSL is enabled (#801) #805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions pkg/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,10 @@ func (opt *postgresOptions) waitForDBReady(appBinding *v1alpha1.AppBinding, secr
if err != nil {
return err
}
shell.SetEnv(EnvPGSSLMODE, pgSSlmode)
// Only set "PGSSLMODE" mode env variable, if it has been provided in the AppBinding.
if pgSSlmode != "" {
shell.SetEnv(EnvPGSSLMODE, pgSSlmode)
}

//shell.SetEnv(EnvPgPassword, must(meta_util.GetBytesForKeys(secret.Data, core.BasicAuthPasswordKey, envPostgresPassword)))
args := []interface{}{
Expand All @@ -142,8 +145,10 @@ func (opt *postgresOptions) waitForDBReady(appBinding *v1alpha1.AppBinding, secr
}

func getSSLMODE(appBinding *v1alpha1.AppBinding) (string, error) {

sslmodeString := appBinding.Spec.ClientConfig.Service.Query
if sslmodeString == "" {
return "", nil
}
temps := strings.Split(sslmodeString, "=")
if len(temps) != 2 {
return "", fmt.Errorf("the sslmode is not valid. please provide the valid template. the temlpate should be like this: sslmode=<your_desire_sslmode>")
Expand Down Expand Up @@ -198,6 +203,9 @@ func (opt *postgresOptions) GetResticWrapperWithPGConnectorVariables(appBinding
if err != nil {
return nil, userName, err
}
resticWrapper.SetEnv(EnvPGSSLMODE, pgSSlmode)
// Only set "PGSSLMODE" mode env variable, if it has been provided in the AppBinding.
if pgSSlmode != "" {
resticWrapper.SetEnv(EnvPGSSLMODE, pgSSlmode)
}
return resticWrapper, userName, nil
}