projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'MajewskiKrzysztof/keep_client_delete_method' into 18655...
[arvados.git]
/
sdk
/
cli
/
bin
/
arv-tag
diff --git
a/sdk/cli/bin/arv-tag
b/sdk/cli/bin/arv-tag
index e400dab7dabdc656d6e552ed762194d0bc0b20fb..f709020fc75e91a3449adceabfebd31e02dca13d 100755
(executable)
--- a/
sdk/cli/bin/arv-tag
+++ b/
sdk/cli/bin/arv-tag
@@
-1,4
+1,7
@@
#! /usr/bin/env ruby
#! /usr/bin/env ruby
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
# arv tag usage:
# arv tag add tag1 [tag2 ...] --object obj_uuid1 [--object obj_uuid2 ...]
# arv tag usage:
# arv tag add tag1 [tag2 ...] --object obj_uuid1 [--object obj_uuid2 ...]
@@
-17,11
+20,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
+104,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'
@@
-107,11
+113,11
@@
begin
require 'json'
require 'pp'
require 'oj'
require 'json'
require 'pp'
require 'oj'
- require '
trollop
'
+ require '
optimist
'
rescue LoadError
abort <<-EOS
#{$0}: fatal: some runtime dependencies are missing.
rescue LoadError
abort <<-EOS
#{$0}: fatal: some runtime dependencies are missing.
-Try: gem install pp google-api-client json
trollop
+Try: gem install pp google-api-client json
optimist
EOS
end
EOS
end
@@
-150,7
+156,7
@@
class Google::APIClient
end
end
end
end
-global_opts =
Trollop
::options do
+global_opts =
Optimist
::options do
banner usage_string
banner ""
opt :dry_run, "Don't actually do anything", :short => "-n"
banner usage_string
banner ""
opt :dry_run, "Don't actually do anything", :short => "-n"
@@
-163,7
+169,7
@@
global_opts = Trollop::options do
stop_on ['add', 'remove']
end
stop_on ['add', 'remove']
end
-p =
Trollop
::Parser.new do
+p =
Optimist
::Parser.new do
opt(:all,
"Remove this tag from all objects under your ownership. Only valid with `tag remove'.",
:short => :none)
opt(:all,
"Remove this tag from all objects under your ownership. Only valid with `tag remove'.",
:short => :none)
@@
-174,7
+180,7
@@
p = Trollop::Parser.new do
:short => :o)
end
:short => :o)
end
-$options =
Trollop
::with_standard_exception_handling p do
+$options =
Optimist
::with_standard_exception_handling p do
p.parse ARGV
end
p.parse ARGV
end