projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3762-delete-list-worker
[arvados.git]
/
sdk
/
go
/
keepclient
/
keepclient.go
diff --git
a/sdk/go/keepclient/keepclient.go
b/sdk/go/keepclient/keepclient.go
index df6fee12914ed0218ce076bcc6d9d5e717a659c1..5d791948dcb808f3373555d183d61f7df5a22100 100644
(file)
--- a/
sdk/go/keepclient/keepclient.go
+++ b/
sdk/go/keepclient/keepclient.go
@@
-3,6
+3,7
@@
package keepclient
import (
"crypto/md5"
import (
"crypto/md5"
+ "crypto/tls"
"errors"
"fmt"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"errors"
"fmt"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
@@
-11,6
+12,7
@@
import (
"io/ioutil"
"log"
"net/http"
"io/ioutil"
"log"
"net/http"
+ "os"
"regexp"
"strings"
"sync"
"regexp"
"strings"
"sync"
@@
-44,13
+46,16
@@
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) {
// 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,
kc = KeepClient{
Arvados: arv,
Want_replicas: 2,
Using_proxy: false,
- Client: &http.Client{Transport: &http.Transport{}}}
-
- err = (&kc).DiscoverKeepServers()
+ Client: &http.Client{Transport: &http.Transport{
+ TLSClientConfig: &tls.Config{InsecureSkipVerify: insecure}}},
+ }
+ _, err = (&kc).DiscoverKeepServers()
return kc, err
}
return kc, err
}
@@
-159,10
+164,17
@@
func (this KeepClient) AuthorizedGet(hash string,
var resp *http.Response
if resp, err = this.Client.Do(req); err != nil || resp.StatusCode != http.StatusOK {
var resp *http.Response
if resp, err = this.Client.Do(req); err != nil || resp.StatusCode != http.StatusOK {
- respbody, _ := ioutil.ReadAll(&io.LimitedReader{resp.Body, 4096})
+ statusCode := -1
+ var respbody []byte
+ if resp != nil {
+ statusCode = resp.StatusCode
+ if resp.Body != nil {
+ respbody, _ = ioutil.ReadAll(&io.LimitedReader{resp.Body, 4096})
+ }
+ }
response := strings.TrimSpace(string(respbody))
log.Printf("[%v] Download %v status code: %v error: \"%v\" response: \"%v\"",
response := strings.TrimSpace(string(respbody))
log.Printf("[%v] Download %v status code: %v error: \"%v\" response: \"%v\"",
- requestId, url,
resp.S
tatusCode, err, response)
+ requestId, url,
s
tatusCode, err, response)
continue
}
continue
}