- raise Exception("host argument provided, but token missing.")
-
- connprofile = hashlib.sha1(' '.join([
- version, host, token, ('y' if apiinsecure else 'n')
- ])).hexdigest()
-
- if not cache or not services.get(connprofile):
- url = 'https://%s/discovery/v1/apis/{api}/{apiVersion}/rest' % host
- credentials = CredentialsFromToken(api_token=token)
-
- # Use system's CA certificates (if we find them) instead of httplib2's
- ca_certs = '/etc/ssl/certs/ca-certificates.crt'
- if not os.path.exists(ca_certs):
- ca_certs = None # use httplib2 default
-
- http = httplib2.Http(ca_certs=ca_certs,
- cache=(http_cache('discovery') if cache else None))
- http = credentials.authorize(http)
- if apiinsecure:
- http.disable_ssl_certificate_validation = True
- services[connprofile] = apiclient.discovery.build(
- 'arvados', version, http=http, discoveryServiceUrl=url)
- http.cache = None
-
- return services[connprofile]
+ raise ValueError("host argument provided, but token missing.")
+
+ if host:
+ # Caller wants us to build the discoveryServiceUrl
+ kwargs['discoveryServiceUrl'] = (
+ 'https://%s/discovery/v1/apis/{api}/{apiVersion}/rest' % (host,))
+
+ if 'http' not in kwargs:
+ http_kwargs = {'ca_certs': util.ca_certs_path()}
+ if cache:
+ http_kwargs['cache'] = http_cache('discovery')
+ if insecure:
+ http_kwargs['disable_ssl_certificate_validation'] = True
+ kwargs['http'] = httplib2.Http(**http_kwargs)
+
+ kwargs['http'] = _patch_http_request(kwargs['http'], token)
+
+ svc = apiclient_discovery.build('arvados', version, cache_discovery=False, **kwargs)
+ svc.api_token = token
+ svc.insecure = insecure
+ svc.request_id = request_id
+ kwargs['http'].max_request_size = svc._rootDesc.get('maxRequestSize', 0)
+ kwargs['http'].cache = None
+ kwargs['http']._request_id = lambda: svc.request_id or util.new_request_id()
+ return svc
+
+def api_from_config(version=None, apiconfig=None, **kwargs):
+ """Return an apiclient Resources object enabling access to an Arvados server
+ instance.
+
+ :version:
+ A string naming the version of the Arvados REST API to use (for
+ example, 'v1').
+
+ :apiconfig:
+ If provided, this should be a dict-like object (must support the get()
+ method) with entries for ARVADOS_API_HOST, ARVADOS_API_TOKEN, and
+ optionally ARVADOS_API_HOST_INSECURE. If not provided, use
+ arvados.config (which gets these parameters from the environment by
+ default.)
+
+ Other keyword arguments such as `cache` will be passed along `api()`
+
+ """
+ # Load from user configuration or environment
+ if apiconfig is None:
+ apiconfig = config.settings()
+
+ for x in ['ARVADOS_API_HOST', 'ARVADOS_API_TOKEN']:
+ if x not in apiconfig:
+ raise ValueError("%s is not set. Aborting." % x)
+ host = apiconfig.get('ARVADOS_API_HOST')
+ token = apiconfig.get('ARVADOS_API_TOKEN')
+ insecure = config.flag_is_true('ARVADOS_API_HOST_INSECURE', apiconfig)
+
+ return api(version=version, host=host, token=token, insecure=insecure, **kwargs)