15003: Merge branch 'master'

[arvados.git] / sdk / go / arvados / client.go

diff --git a/sdk/go/arvados/client.go b/sdk/go/arvados/client.go
index 254a0fa7d3e5f7ea1bf3c96a759a6702baf3331c..cbc2ca72f035f150fce46613fa015d299a9bbd7b 100644 (file)
--- a/sdk/go/arvados/client.go
+++ b/sdk/go/arvados/client.go
@@ -69,6 +69,21 @@ var InsecureHTTPClient = &http.Client{
 var DefaultSecureClient = &http.Client{
        Timeout: 5 * time.Minute}
 
+// NewClientFromConfig creates a new Client that uses the endpoints in
+// the given cluster.
+//
+// AuthToken is left empty for the caller to populate.
+func NewClientFromConfig(cluster *Cluster) (*Client, error) {
+       ctrlURL := cluster.Services.Controller.ExternalURL
+       if ctrlURL.Host == "" {
+               return nil, fmt.Errorf("no host in config Services.Controller.ExternalURL: %v", ctrlURL)
+       }
+       return &Client{
+               APIHost:  ctrlURL.Host,
+               Insecure: cluster.TLS.Insecure,
+       }, nil
+}
+
 // NewClientFromEnv creates a new Client that uses the default HTTP
 // client with the API endpoint and credentials given by the
 // ARVADOS_API_* environment variables.
@@ -103,7 +118,7 @@ var reqIDGen = httpserver.IDGenerator{Prefix: "req-"}
 // (*http.Client)Do().
 func (c *Client) Do(req *http.Request) (*http.Response, error) {
        if c.AuthToken != "" {
-               req.Header.Set("Authorization", "OAuth2 "+c.AuthToken)
+               req.Header.Add("Authorization", "OAuth2 "+c.AuthToken)
        }
 
        if req.Header.Get("X-Request-Id") == "" {
@@ -193,46 +208,6 @@ func anythingToValues(params interface{}) (url.Values, error) {
        return urlValues, nil
 }
 
-func (c *Client) MakeRequest(method, path string, body io.Reader, params interface{}) (*http.Request, error) {
-       urlString := c.apiURL(path)
-       urlValues, err := anythingToValues(params)
-       if err != nil {
-               return nil, err
-       }
-       if (method == "GET" || body != nil) && urlValues != nil {
-               // FIXME: what if params don't fit in URL
-               u, err := url.Parse(urlString)
-               if err != nil {
-                       return nil, err
-               }
-               u.RawQuery = urlValues.Encode()
-               urlString = u.String()
-       }
-       req, err := http.NewRequest(method, urlString, body)
-       if err != nil {
-               return nil, err
-       }
-       req.Header.Set("Content-type", "application/x-www-form-urlencoded")
-
-       if c.AuthToken != "" {
-               req.Header.Set("Authorization", "OAuth2 "+c.AuthToken)
-       }
-
-       if req.Header.Get("X-Request-Id") == "" {
-               reqid, _ := c.context().Value(contextKeyRequestID).(string)
-               if reqid == "" {
-                       reqid = reqIDGen.Next()
-               }
-               if req.Header == nil {
-                       req.Header = http.Header{"X-Request-Id": {reqid}}
-               } else {
-                       req.Header.Set("X-Request-Id", reqid)
-               }
-       }
-
-       return req, nil
-}
-
 // RequestAndDecode performs an API request and unmarshals the
 // response (which must be JSON) into dst. Method and body arguments
 // are the same as for http.NewRequest(). The given path is added to
@@ -245,10 +220,30 @@ func (c *Client) RequestAndDecode(dst interface{}, method, path string, body io.
                // Ensure body is closed even if we error out early
                defer body.Close()
        }
-       req, err := c.MakeRequest(method, path, body, params)
+       urlString := c.apiURL(path)
+       urlValues, err := anythingToValues(params)
        if err != nil {
                return err
        }
+       if urlValues == nil {
+               // Nothing to send
+       } else if method == "GET" || method == "HEAD" || body != nil {
+               // Must send params in query part of URL (FIXME: what
+               // if resulting URL is too long?)
+               u, err := url.Parse(urlString)
+               if err != nil {
+                       return err
+               }
+               u.RawQuery = urlValues.Encode()
+               urlString = u.String()
+       } else {
+               body = strings.NewReader(urlValues.Encode())
+       }
+       req, err := http.NewRequest(method, urlString, body)
+       if err != nil {
+               return err
+       }
+       req.Header.Set("Content-type", "application/x-www-form-urlencoded")
        return c.DoAndDecode(dst, req)
 }