Fix connect_timeout for gocloud (#56)

Author: ynaka81

postgresql/config.go

@@ -172,14 +172,13 @@ func (c *Config) featureSupported(name featureName) bool {
 }
 
 func (c *Config) connParams() []string {
-	params := map[string]string{
-		"connect_timeout": strconv.Itoa(c.ConnectTimeoutSec),
-	}
+	params := map[string]string{}
 
-	// sslmode is not allowed with gocloud
+	// sslmode and connect_timeout are not allowed with gocloud
 	// (TLS is provided by gocloud directly)
 	if c.Scheme == "postgres" {
 		params["sslmode"] = c.SSLMode
+		params["connect_timeout"] = strconv.Itoa(c.ConnectTimeoutSec)
 	}
 
 	if c.featureSupported(featureFallbackApplicationName) {

postgresql/config_test.go

@@ -14,13 +14,14 @@ func TestConfigConnParams(t *testing.T) {
 		input *Config
 		want  []string
 	}{
-		{&Config{ConnectTimeoutSec: 10}, []string{"connect_timeout=10"}},
+		{&Config{Scheme: "postgres", SSLMode: "require", ConnectTimeoutSec: 10}, []string{"connect_timeout=10", "sslmode=require"}},
 		{&Config{Scheme: "postgres", SSLMode: "disable"}, []string{"connect_timeout=0", "sslmode=disable"}},
-		{&Config{Scheme: "awspostgres", SSLMode: "disable"}, []string{"connect_timeout=0"}},
-		{&Config{ExpectedVersion: semver.MustParse("9.0.0"), ApplicationName: "Terraform provider"}, []string{"connect_timeout=0", "fallback_application_name=Terraform+provider"}},
-		{&Config{ExpectedVersion: semver.MustParse("8.0.0"), ApplicationName: "Terraform provider"}, []string{"connect_timeout=0"}},
-		{&Config{SSLClientCert: &ClientCertificateConfig{CertificatePath: "/path/to/public-certificate.pem", KeyPath: "/path/to/private-key.pem"}}, []string{"connect_timeout=0", "sslcert=%2Fpath%2Fto%2Fpublic-certificate.pem", "sslkey=%2Fpath%2Fto%2Fprivate-key.pem"}},
-		{&Config{SSLRootCertPath: "/path/to/root.pem"}, []string{"connect_timeout=0", "sslrootcert=%2Fpath%2Fto%2Froot.pem"}},
+		{&Config{Scheme: "awspostgres", ConnectTimeoutSec: 10}, []string{}},
+		{&Config{Scheme: "awspostgres", SSLMode: "disable"}, []string{}},
+		{&Config{ExpectedVersion: semver.MustParse("9.0.0"), ApplicationName: "Terraform provider"}, []string{"fallback_application_name=Terraform+provider"}},
+		{&Config{ExpectedVersion: semver.MustParse("8.0.0"), ApplicationName: "Terraform provider"}, []string{}},
+		{&Config{SSLClientCert: &ClientCertificateConfig{CertificatePath: "/path/to/public-certificate.pem", KeyPath: "/path/to/private-key.pem"}}, []string{"sslcert=%2Fpath%2Fto%2Fpublic-certificate.pem", "sslkey=%2Fpath%2Fto%2Fprivate-key.pem"}},
+		{&Config{SSLRootCertPath: "/path/to/root.pem"}, []string{"sslrootcert=%2Fpath%2Fto%2Froot.pem"}},
 	}
 
 	for _, test := range tests {