mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-07 01:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify flag checks; format

Browse Source
This commit is contained in:
Jason Hoch 2018-06-21 11:56:36 -04:00
parent 8223796ae7
commit c40e563292
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/tlsutils/tlsconfig.go
View File

@ -43,6 +43,7 @@ func CreateTLSConfig(prefix string) (*tls.Config, error) {
return tlsConfig, nil return tlsConfig, nil
} }
// NewTLSConfig creates a tls.Config instance from directly-passed parameters, loading the ca, cert, and key from disk
func NewTLSConfig(certPath, keyPath, caPath, serverName string, insecure bool, minVersion uint16) (*tls.Config, error) { func NewTLSConfig(certPath, keyPath, caPath, serverName string, insecure bool, minVersion uint16) (*tls.Config, error) {
if certPath != "" && keyPath == "" || certPath == "" && keyPath != "" { if certPath != "" && keyPath == "" || certPath == "" && keyPath != "" {
return nil, errors.New("either both cert and key or none must be provided") return nil, errors.New("either both cert and key or none must be provided")

18
provider/pdns.go
View File

@ -30,13 +30,11 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"crypto/tls" "crypto/tls"
"crypto/x509"
pgo "github.com/ffledgling/pdns-go" pgo "github.com/ffledgling/pdns-go"
"github.com/kubernetes-incubator/external-dns/endpoint" "github.com/kubernetes-incubator/external-dns/endpoint"
"github.com/kubernetes-incubator/external-dns/plan"
"io/ioutil"
"net"
"github.com/kubernetes-incubator/external-dns/pkg/tlsutils" "github.com/kubernetes-incubator/external-dns/pkg/tlsutils"
"github.com/kubernetes-incubator/external-dns/plan"
"net"
) )
type pdnsChangeType string type pdnsChangeType string
@ -81,15 +79,7 @@ type TLSConfig struct {
func (tlsConfig *TLSConfig) setHTTPClient(pdnsClientConfig *pgo.Configuration) error { func (tlsConfig *TLSConfig) setHTTPClient(pdnsClientConfig *pgo.Configuration) error {
if !tlsConfig.TLSEnabled { if !tlsConfig.TLSEnabled {
if tlsConfig.CAFilePath != "" { log.Debug("Skipping TLS for PDNS Provider.")
return errors.New("certificate authority file path was specified, but TLS was not enabled")
}
if tlsConfig.ClientCertFilePath != "" {
return errors.New("client certificate file path was specified, but TLS was not enabled")
}
if tlsConfig.ClientCertKeyFilePath != "" {
return errors.New("client certificate key file path was specified, but TLS was not enabled")
}
return nil return nil
} }
@ -100,7 +90,7 @@ func (tlsConfig *TLSConfig) setHTTPClient(pdnsClientConfig *pgo.Configuration) e
tlsClientConfig, err := tlsutils.NewTLSConfig(tlsConfig.ClientCertFilePath, tlsConfig.ClientCertKeyFilePath, tlsConfig.CAFilePath, "", false, tls.VersionTLS12) tlsClientConfig, err := tlsutils.NewTLSConfig(tlsConfig.ClientCertFilePath, tlsConfig.ClientCertKeyFilePath, tlsConfig.CAFilePath, "", false, tls.VersionTLS12)
if err != nil { if err != nil {
return err; return err
} }
// Timeouts taken from net.http.DefaultTransport // Timeouts taken from net.http.DefaultTransport