X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b521d2c5254e439e23cd750f86d55eadffb3e4b9..9acc8cb9cd9ca4429712b0d31b647e9a6ecf2d96:/sdk/go/arvadosclient/arvadosclient.go

diff --git a/sdk/go/arvadosclient/arvadosclient.go b/sdk/go/arvadosclient/arvadosclient.go
index bfcbde2a70..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")
@@ -50,7 +49,7 @@ var (
 	defaultHTTPClientMtx      sync.Mutex
 )
 
-// Indicates an error that was returned by the API server.
+// APIServerError contains an error that was returned by the API server.
 type APIServerError struct {
 	// Address of server returning error, of the form "host:port".
 	ServerAddress string
@@ -84,10 +83,10 @@ func StringBool(s string) bool {
 	return s == "1" || s == "yes" || s == "true"
 }
 
-// Helper type so we don't have to write out 'map[string]interface{}' every time.
+// Dict is a helper type so we don't have to write out 'map[string]interface{}' every time.
 type Dict map[string]interface{}
 
-// Information about how to contact the Arvados server
+// ArvadosClient contains information about how to contact the Arvados server
 type ArvadosClient struct {
 	// https
 	Scheme string
@@ -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"
 	}
 
@@ -378,7 +380,7 @@ func (c *ArvadosClient) Delete(resource string, uuid string, parameters Dict, ou
 	return c.Call("DELETE", resource, uuid, "", parameters, output)
 }
 
-// Modify attributes of a resource. See Call for argument descriptions.
+// Update attributes of a resource. See Call for argument descriptions.
 func (c *ArvadosClient) Update(resourceType string, uuid string, parameters Dict, output interface{}) (err error) {
 	return c.Call("PUT", resourceType, uuid, "", parameters, output)
 }
@@ -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,19 +425,37 @@ func (c *ArvadosClient) Discovery(parameter string) (value interface{}, err erro
 	return value, ErrInvalidArgument
 }
 
-func (ac *ArvadosClient) httpClient() *http.Client {
-	if ac.Client != nil {
-		return ac.Client
+// 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
 	}
-	c := &defaultSecureHTTPClient
-	if ac.ApiInsecure {
-		c = &defaultInsecureHTTPClient
+	cl := &defaultSecureHTTPClient
+	if c.ApiInsecure {
+		cl = &defaultInsecureHTTPClient
 	}
-	if *c == nil {
+	if *cl == nil {
 		defaultHTTPClientMtx.Lock()
 		defer defaultHTTPClientMtx.Unlock()
-		*c = &http.Client{Transport: &http.Transport{
-			TLSClientConfig: MakeTLSConfig(ac.ApiInsecure)}}
+		*cl = &http.Client{Transport: &http.Transport{
+			TLSClientConfig: MakeTLSConfig(c.ApiInsecure)}}
 	}
-	return *c
+	return *cl
 }