X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6bf9e1a4b5640f3cdd057810f0c9b8a945bb88bd..8b2af30849edeab5ad8ebc6b51eaec39e5fdd81a:/sdk/go/arvadosclient/arvadosclient.go

diff --git a/sdk/go/arvadosclient/arvadosclient.go b/sdk/go/arvadosclient/arvadosclient.go
index 54602fb54e..24070c5b06 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")
@@ -146,7 +145,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
 			}
@@ -206,11 +205,14 @@ 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}
 
-	if resourceType != API_DISCOVERY_RESOURCE {
+	if resourceType != ApiDiscoveryResource {
 		u.Path = "/arvados/v1"
 	}
 
@@ -400,7 +402,7 @@ func (c *ArvadosClient) List(resource string, parameters Dict, output interface{
 	return c.Call("GET", resource, "", "", parameters, output)
 }
 
-const API_DISCOVERY_RESOURCE = "discovery/v1/apis/arvados/v1/rest"
+const ApiDiscoveryResource = "discovery/v1/apis/arvados/v1/rest"
 
 // Discovery returns the value of the given parameter in the discovery
 // document. Returns a non-nil error if the discovery document cannot
@@ -409,7 +411,7 @@ const API_DISCOVERY_RESOURCE = "discovery/v1/apis/arvados/v1/rest"
 func (c *ArvadosClient) Discovery(parameter string) (value interface{}, err error) {
 	if len(c.DiscoveryDoc) == 0 {
 		c.DiscoveryDoc = make(Dict)
-		err = c.Call("GET", API_DISCOVERY_RESOURCE, "", "", nil, &c.DiscoveryDoc)
+		err = c.Call("GET", ApiDiscoveryResource, "", "", nil, &c.DiscoveryDoc)
 		if err != nil {
 			return nil, err
 		}
@@ -423,6 +425,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