darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

drone client accepts docker host, cert and key

Browse source
This commit is contained in:
Brad Rydzewski 2014-10-21 01:17:33 -07:00
parent 8c51215e55
commit 2c4e992f1f
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
shared/build/docker/client.go
View file

@ -37,12 +37,27 @@ func New() *Client {
return NewHost("") return NewHost("")
} }
func NewHost(address string) *Client { func NewHost(uri string) *Client {
var cli, _ = NewClient(address, "", "") var cli, _ = NewHostCert(uri, nil, nil)
return cli return cli
} }
func NewClient(uri, cert, key string) (*Client, error) { func NewHostCertFile(uri, cert, key string) (*Client, error) {
if len(key) == 0 || len(cert) == 0 {
return NewHostCert(uri, nil, nil)
}
certfile, err := ioutil.ReadFile(cert)
if err != nil {
return nil, err
}
keyfile, err := ioutil.ReadFile(key)
if err != nil {
return nil, err
}
return NewHostCert(uri, certfile, keyfile)
}
func NewHostCert(uri string, cert, key []byte) (*Client, error) {
var host = GetHost(uri) var host = GetHost(uri)
var proto, addr = SplitProtoAddr(host) var proto, addr = SplitProtoAddr(host)
@ -55,12 +70,12 @@ func NewClient(uri, cert, key string) (*Client, error) {
// if no certificate is provided returns the // if no certificate is provided returns the
// client with no TLS configured. // client with no TLS configured.
if len(cert) == 0 || len(key) == 0 { if cert == nil || key == nil || len(cert) == 0 || len(key) == 0 {
return cli, nil return cli, nil
} }
// loads the key value pair in pem format // loads the key value pair in pem format
pem, err := tls.LoadX509KeyPair(cert, key) pem, err := tls.X509KeyPair(cert, key)
if err != nil { if err != nil {
return nil, err return nil, err
} }