Merge pull request #428 from SUSE/merge-upstream

Merge upstream

Author: richard-cox

CHANGELOG.md

@@ -45,6 +45,7 @@ This release contains a number of fixes and improvements:
 - Workload Summary: Ring chart series toggled on refresh & legend vs ring colours missmatched [\#389](https://github.com/SUSE/stratos/issues/389)
 - Can't connect a K3S endpoint [\#372](https://github.com/SUSE/stratos/issues/372)
 - Ensure `cf push` works from Windows  [\#4465](https://github.com/cloudfoundry/stratos/issues/4465)
+- SSLMode is not respected for database connections [\#4434](https://github.com/cloudfoundry/stratos/issues/4434)
 - Visiting marketplace tab breaks service list [\#4397](https://github.com/cloudfoundry/stratos/issues/4397)
 - CF Application reports error after restage [\#4392](https://github.com/cloudfoundry/stratos/issues/4392)
 - Helm Chart: Icon is missing [\#4370](https://github.com/cloudfoundry/stratos/issues/4370)

src/jetstream/datastore/database_cf_config.go

@@ -47,10 +47,10 @@ func ParseCFEnvs(db *DatabaseConfig, env *env.VarSet) (bool, error) {
 		log.Info("No DB configurations defined, will use SQLite")
 		return false, nil
 	}
-	return findDatabaseConfig(vcapServices, db), nil
+	return findDatabaseConfig(vcapServices, db, env), nil
 }
 
-func findDatabaseConfig(vcapServices map[string][]VCAPService, db *DatabaseConfig) bool {
+func findDatabaseConfig(vcapServices map[string][]VCAPService, db *DatabaseConfig, env *env.VarSet) bool {
 	var service VCAPService
 	configs := findDatabaseConfigurations(vcapServices)
 	log.Infof("Found %d database service instances", len(configs))
@@ -78,7 +78,7 @@ func findDatabaseConfig(vcapServices map[string][]VCAPService, db *DatabaseConfi
 		db.Username = getDBCredentialsValue(dbCredentials["username"])
 		db.Password = getDBCredentialsValue(dbCredentials["password"])
 		db.Host = getDBCredentialsValue(dbCredentials["hostname"])
-		db.SSLMode = "disable"
+		db.SSLMode = env.String("DB_SSL_MODE", "disable")
 		db.Port, _ = strconv.Atoi(getDBCredentialsValue(dbCredentials["port"]))
 		// Note - Both isPostgresService and isMySQLService look at the credentials uri & tags
 		if isPostgresService(service) {