projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'crunch-job_finds_newer_docker_hashes' of https://github.com/tmooney...
[arvados.git]
/
sdk
/
cli
/
bin
/
arv-tag
diff --git
a/sdk/cli/bin/arv-tag
b/sdk/cli/bin/arv-tag
index e400dab7dabdc656d6e552ed762194d0bc0b20fb..816c1e9320602a0959aeda033d764e9cabd631b6 100755
(executable)
--- a/
sdk/cli/bin/arv-tag
+++ b/
sdk/cli/bin/arv-tag
@@
-17,11
+17,13
@@
def usage
end
def api_call(method, parameters:{}, request_body:{})
end
def api_call(method, parameters:{}, request_body:{})
- request_body[:api_token] = ENV['ARVADOS_API_TOKEN']
result = $client.execute(:api_method => method,
:parameters => parameters,
:body_object => request_body,
result = $client.execute(:api_method => method,
:parameters => parameters,
:body_object => request_body,
- :authenticated => false)
+ :authenticated => false,
+ :headers => {
+ authorization: "OAuth2 #{ENV['ARVADOS_API_TOKEN']}",
+ })
begin
results = JSON.parse result.body
begin
results = JSON.parse result.body
@@
-99,7
+101,8
@@
$arvados_api_host = ENV['ARVADOS_API_HOST'] or
abort "#{$0}: fatal: ARVADOS_API_HOST environment variable not set."
$arvados_api_token = ENV['ARVADOS_API_TOKEN'] or
abort "#{$0}: fatal: ARVADOS_API_TOKEN environment variable not set."
abort "#{$0}: fatal: ARVADOS_API_HOST environment variable not set."
$arvados_api_token = ENV['ARVADOS_API_TOKEN'] or
abort "#{$0}: fatal: ARVADOS_API_TOKEN environment variable not set."
-$arvados_api_host_insecure = ENV['ARVADOS_API_HOST_INSECURE'] == 'yes'
+$arvados_api_host_insecure = %w(1 true yes).
+ include?((ENV['ARVADOS_API_HOST_INSECURE'] || "").downcase)
begin
require 'rubygems'
begin
require 'rubygems'