AppendCertsFromPEM doesn't have error and removes pgTLSArgs
AppendCertsFromPEM doesn't have error and removes pgTLSArgs because not used
This commit is contained in:
committed by
Jack Christensen
parent
9295bf7483
commit
271b0ac95e
@@ -571,13 +571,6 @@ func parseServiceSettings(servicefilePath, serviceName string) (map[string]strin
|
|||||||
return settings, nil
|
return settings, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type pgTLSArgs struct {
|
|
||||||
sslMode string
|
|
||||||
sslRootCert string
|
|
||||||
sslCert string
|
|
||||||
sslKey string
|
|
||||||
}
|
|
||||||
|
|
||||||
// configTLS uses libpq's TLS parameters to construct []*tls.Config. It is
|
// configTLS uses libpq's TLS parameters to construct []*tls.Config. It is
|
||||||
// necessary to allow returning multiple TLS configs as sslmode "allow" and
|
// necessary to allow returning multiple TLS configs as sslmode "allow" and
|
||||||
// "prefer" allow fallback.
|
// "prefer" allow fallback.
|
||||||
@@ -662,7 +655,7 @@ func configTLS(settings map[string]string) ([]*tls.Config, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !caCertPool.AppendCertsFromPEM(caCert) {
|
if !caCertPool.AppendCertsFromPEM(caCert) {
|
||||||
return nil, errors.Errorf("unable to add CA to cert pool: %w", err)
|
return nil, errors.New("unable to add CA to cert pool")
|
||||||
}
|
}
|
||||||
|
|
||||||
tlsConfig.RootCAs = caCertPool
|
tlsConfig.RootCAs = caCertPool
|
||||||
|
|||||||
Reference in New Issue
Block a user