[ARVADOS] updated: d8326579d327530adcf4118b48947d3812845c33

[git at public.curoverse.com]

Summary of changes:
 sdk/go/arvadosclient/arvadosclient.go | 6 ++++--
 sdk/go/keepclient/keepclient.go       | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

       via  d8326579d327530adcf4118b48947d3812845c33 (commit)
      from  6381b9e85f278b0c8cb45ffccd89ca1b1bc4d3ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d8326579d327530adcf4118b48947d3812845c33
Author: Ward Vandewege <ward at curoverse.com>
Date:   Sun Mar 22 14:02:26 2015 -0400

    Go SDK improvements:
    
    - keepclient now respects the ARVADOS_API_HOST_INSECURE environment
      variable
    
    - arvadosclient and keepclient accept (1,yes,true) to enable the
      insecure api host flag, case insensitive.
    
    No issue #

diff --git a/sdk/go/arvadosclient/arvadosclient.go b/sdk/go/arvadosclient/arvadosclient.go
index 7c24426..4c16398 100644
--- a/sdk/go/arvadosclient/arvadosclient.go
+++ b/sdk/go/arvadosclient/arvadosclient.go
@@ -12,6 +12,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"regexp"
 	"strings"
 )
 
@@ -53,8 +54,9 @@ type ArvadosClient struct {
 // variables ARVADOS_API_HOST, ARVADOS_API_TOKEN, and (optionally)
 // ARVADOS_API_HOST_INSECURE.
 func MakeArvadosClient() (kc ArvadosClient, err error) {
-	insecure := (os.Getenv("ARVADOS_API_HOST_INSECURE") == "true")
-	external := (os.Getenv("ARVADOS_EXTERNAL_CLIENT") == "true")
+	var matchTrue = regexp.MustCompile("^(?i:1|yes|true)$")
+	insecure := matchTrue.MatchString(os.Getenv("ARVADOS_API_HOST_INSECURE"))
+	external := matchTrue.MatchString(os.Getenv("ARVADOS_EXTERNAL_CLIENT"))
 
 	kc = ArvadosClient{
 		ApiServer:   os.Getenv("ARVADOS_API_HOST"),
diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index 0869d3d..5d79194 100644
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -3,6 +3,7 @@ package keepclient
 
 import (
 	"crypto/md5"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
@@ -11,6 +12,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"os"
 	"regexp"
 	"strings"
 	"sync"
@@ -44,11 +46,14 @@ type KeepClient struct {
 // Create a new KeepClient.  This will contact the API server to discover Keep
 // servers.
 func MakeKeepClient(arv *arvadosclient.ArvadosClient) (kc KeepClient, err error) {
+	var matchTrue = regexp.MustCompile("^(?i:1|yes|true)$")
+	insecure := matchTrue.MatchString(os.Getenv("ARVADOS_API_HOST_INSECURE"))
 	kc = KeepClient{
 		Arvados:       arv,
 		Want_replicas: 2,
 		Using_proxy:   false,
-		Client:        &http.Client{},
+		Client: &http.Client{Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: insecure}}},
 	}
 	_, err = (&kc).DiscoverKeepServers()
 

-----------------------------------------------------------------------


hooks/post-receive
--