X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/045e3127cb48845c7d988d01488c055f02ae2ec3..7602078b5c8f56f6dddfd89a36cf65cb2e1c88d0:/sdk/go/arvadosclient/arvadosclient.go

diff --git a/sdk/go/arvadosclient/arvadosclient.go b/sdk/go/arvadosclient/arvadosclient.go
index d90c618f7a..13b3a30ac4 100644
--- a/sdk/go/arvadosclient/arvadosclient.go
+++ b/sdk/go/arvadosclient/arvadosclient.go
@@ -19,7 +19,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -29,8 +28,8 @@ import (
 
 type StringMatcher func(string) bool
 
-var UUIDMatch StringMatcher = regexp.MustCompile(`^[a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}$`).MatchString
-var PDHMatch StringMatcher = regexp.MustCompile(`^[0-9a-f]{32}\+\d+$`).MatchString
+var UUIDMatch StringMatcher = arvados.UUIDMatch
+var PDHMatch StringMatcher = arvados.PDHMatch
 
 var MissingArvadosApiHost = errors.New("Missing required environment variable ARVADOS_API_HOST")
 var MissingArvadosApiToken = errors.New("Missing required environment variable ARVADOS_API_TOKEN")
@@ -104,10 +103,6 @@ type ArvadosClient struct {
 	// Client object shared by client requests.  Supports HTTP KeepAlive.
 	Client *http.Client
 
-	// If true, sets the X-External-Client header to indicate
-	// the client is outside the cluster.
-	External bool
-
 	// Base URIs of Keep services, e.g., {"https://host1:8443",
 	// "https://host2:8443"}.  If this is nil, Keep clients will
 	// use the arvados.v1.keep_services.accessible API to discover
@@ -146,7 +141,7 @@ func MakeTLSConfig(insecure bool) *tls.Config {
 			data, err := ioutil.ReadFile(file)
 			if err != nil {
 				if !os.IsNotExist(err) {
-					log.Printf("error reading %q: %s", file, err)
+					log.Printf("proceeding without loading cert file %q: %s", file, err)
 				}
 				continue
 			}
@@ -167,17 +162,20 @@ func MakeTLSConfig(insecure bool) *tls.Config {
 // fields from configuration files but still need to use the
 // arvadosclient.ArvadosClient package.
 func New(c *arvados.Client) (*ArvadosClient, error) {
-	ac := &ArvadosClient{
-		Scheme:      "https",
-		ApiServer:   c.APIHost,
-		ApiToken:    c.AuthToken,
-		ApiInsecure: c.Insecure,
-		Client: &http.Client{
+	hc := c.Client
+	if hc == nil {
+		hc = &http.Client{
 			Timeout: 5 * time.Minute,
 			Transport: &http.Transport{
 				TLSClientConfig: MakeTLSConfig(c.Insecure)},
-		},
-		External:          false,
+		}
+	}
+	ac := &ArvadosClient{
+		Scheme:            "https",
+		ApiServer:         c.APIHost,
+		ApiToken:          c.AuthToken,
+		ApiInsecure:       c.Insecure,
+		Client:            hc,
 		Retries:           2,
 		KeepServiceURIs:   c.KeepServiceURIs,
 		lastClosedIdlesAt: time.Now(),
@@ -188,15 +186,9 @@ func New(c *arvados.Client) (*ArvadosClient, error) {
 
 // MakeArvadosClient creates a new ArvadosClient using the standard
 // environment variables ARVADOS_API_HOST, ARVADOS_API_TOKEN,
-// ARVADOS_API_HOST_INSECURE, ARVADOS_EXTERNAL_CLIENT, and
-// ARVADOS_KEEP_SERVICES.
-func MakeArvadosClient() (ac *ArvadosClient, err error) {
-	ac, err = New(arvados.NewClientFromEnv())
-	if err != nil {
-		return
-	}
-	ac.External = StringBool(os.Getenv("ARVADOS_EXTERNAL_CLIENT"))
-	return
+// ARVADOS_API_HOST_INSECURE, and ARVADOS_KEEP_SERVICES.
+func MakeArvadosClient() (*ArvadosClient, error) {
+	return New(arvados.NewClientFromEnv())
 }
 
 // CallRaw is the same as Call() but returns a Reader that reads the
@@ -206,6 +198,9 @@ func (c *ArvadosClient) CallRaw(method string, resourceType string, uuid string,
 	if scheme == "" {
 		scheme = "https"
 	}
+	if c.ApiServer == "" {
+		return nil, fmt.Errorf("Arvados client is not configured (target API host is not set). Maybe env var ARVADOS_API_HOST should be set first?")
+	}
 	u := url.URL{
 		Scheme: scheme,
 		Host:   c.ApiServer}
@@ -274,9 +269,6 @@ func (c *ArvadosClient) CallRaw(method string, resourceType string, uuid string,
 		if c.RequestID != "" {
 			req.Header.Add("X-Request-Id", c.RequestID)
 		}
-		if c.External {
-			req.Header.Add("X-External-Client", "1")
-		}
 
 		resp, err = c.Client.Do(req)
 		if err != nil {
@@ -423,6 +415,24 @@ func (c *ArvadosClient) Discovery(parameter string) (value interface{}, err erro
 	return value, ErrInvalidArgument
 }
 
+// ClusterConfig returns the value of the given key in the current cluster's
+// exported config. If key is an empty string, it'll return the entire config.
+func (c *ArvadosClient) ClusterConfig(key string) (config interface{}, err error) {
+	var clusterConfig interface{}
+	err = c.Call("GET", "config", "", "", nil, &clusterConfig)
+	if err != nil {
+		return nil, err
+	}
+	if key == "" {
+		return clusterConfig, nil
+	}
+	configData, ok := clusterConfig.(map[string]interface{})[key]
+	if !ok {
+		return nil, ErrInvalidArgument
+	}
+	return configData, nil
+}
+
 func (c *ArvadosClient) httpClient() *http.Client {
 	if c.Client != nil {
 		return c.Client