X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2efdb0e205abe63c5ca777fc4dacca65192e5dd3..2b7d05cdf4e054024607b859bd6fb41e04855bfa:/sdk/cli/bin/arv diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv index aa038ac54a..e5aa4e4f2a 100755 --- a/sdk/cli/bin/arv +++ b/sdk/cli/bin/arv @@ -1,8 +1,11 @@ #!/usr/bin/env ruby +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 # Arvados cli client # -# Ward Vandewege +# Ward Vandewege require 'fileutils' require 'shellwords' @@ -32,7 +35,7 @@ begin require 'andand' require 'curb' require 'oj' - require 'trollop' + require 'optimist' rescue LoadError => error abort <<-EOS @@ -40,7 +43,7 @@ Error loading gems: #{error} Please install all required gems: - gem install arvados activesupport andand curb json oj trollop + gem install arvados activesupport andand curb json oj optimist EOS end @@ -62,16 +65,6 @@ module Kernel end end -class ArvadosClient < Google::APIClient - def execute(*args) - if args.last.is_a? Hash - args.last[:headers] ||= {} - args.last[:headers]['Accept'] ||= 'application/json' - end - super(*args) - end -end - def init_config # read authentication data from arvados configuration file if present lineno = 0 @@ -95,7 +88,7 @@ def init_config end -subcommands = %w(copy create edit get keep pipeline run tag ws) +subcommands = %w(copy create edit get keep tag ws) def exec_bin bin, opts bin_path = `which #{bin.shellescape}`.strip @@ -113,7 +106,7 @@ def check_subcommands client, arvados, subcommand, global_opts, remaining_opts arv_edit client, arvados, global_opts, remaining_opts when 'get' arv_get client, arvados, global_opts, remaining_opts - when 'copy', 'tag', 'ws', 'run' + when 'copy', 'tag', 'ws' exec_bin "arv-#{subcommand}", remaining_opts when 'keep' @sub = remaining_opts.shift @@ -128,16 +121,6 @@ def check_subcommands client, arvados, subcommand, global_opts, remaining_opts puts "Available methods: ls, get, put, docker" end abort - when 'pipeline' - sub = remaining_opts.shift - if sub == 'run' - exec_bin "arv-run-pipeline-instance", remaining_opts - else - puts "Usage: arv pipeline [method] [--parameters]\n" - puts "Use 'arv pipeline [method] --help' to get more information about specific methods.\n\n" - puts "Available methods: run" - end - abort end end @@ -189,7 +172,7 @@ def edit_and_commit_object initial_obj, tmp_stem, global_opts, &block # Load the new object newobj = case global_opts[:format] when 'json' - Oj.load(newcontent) + Oj.safe_load(newcontent) when 'yaml' YAML.load(newcontent) else @@ -372,7 +355,7 @@ end def arv_create client, arvados, global_opts, remaining_opts types = resource_types(arvados.discovery_document) - create_opts = Trollop::options do + create_opts = Optimist::options do opt :project_uuid, "Project uuid in which to create the object", :type => :string stop_on resource_types(arvados.discovery_document) end @@ -389,7 +372,7 @@ def arv_create client, arvados, global_opts, remaining_opts rsc = rsc.first discovered_params = arvados.discovery_document["resources"][rsc]["methods"]["create"]["parameters"] - method_opts = Trollop::options do + method_opts = Optimist::options do banner head_banner banner "Usage: arv create [--project-uuid] #{object_type} [create parameters]" banner "" @@ -399,7 +382,7 @@ def arv_create client, arvados, global_opts, remaining_opts opts = Hash.new() opts[:type] = v["type"].to_sym if v.include?("type") if [:datetime, :text, :object, :array].index opts[:type] - opts[:type] = :string # else trollop bork + opts[:type] = :string # else optimist bork end opts[:default] = v["default"] if v.include?("default") opts[:default] = v["default"].to_i if opts[:type] == :integer @@ -480,7 +463,7 @@ end def parse_arguments(discovery_document, subcommands) resources_and_subcommands = resource_types(discovery_document) + subcommands - option_parser = Trollop::Parser.new do + option_parser = Optimist::Parser.new do version __FILE__ banner head_banner banner "Usage: arv [--flags] subcommand|resource [method] [--parameters]" @@ -510,7 +493,7 @@ def parse_arguments(discovery_document, subcommands) stop_on resources_and_subcommands end - global_opts = Trollop::with_standard_exception_handling option_parser do + global_opts = Optimist::with_standard_exception_handling option_parser do o = option_parser.parse ARGV end @@ -541,7 +524,7 @@ def parse_arguments(discovery_document, subcommands) discovered_params = discovery_document\ ["resources"][resource.pluralize]\ ["methods"][method]["parameters"] - method_opts = Trollop::options do + method_opts = Optimist::options do banner head_banner banner "Usage: arv #{resource} #{method} [--parameters]" banner "" @@ -551,7 +534,7 @@ def parse_arguments(discovery_document, subcommands) opts = Hash.new() opts[:type] = v["type"].to_sym if v.include?("type") if [:datetime, :text, :object, :array].index opts[:type] - opts[:type] = :string # else trollop bork + opts[:type] = :string # else optimist bork end opts[:default] = v["default"] if v.include?("default") opts[:default] = v["default"].to_i if opts[:type] == :integer @@ -612,7 +595,7 @@ if ENV['ARVADOS_API_HOST_INSECURE'] end begin - client = ArvadosClient.new(:host => ENV['ARVADOS_API_HOST'], :application_name => 'arvados-cli', :application_version => '1.0') + client = Google::APIClient.new(:host => ENV['ARVADOS_API_HOST'], :application_name => 'arvados-cli', :application_version => '1.0') arvados = client.discovered_api('arvados', ENV['ARVADOS_API_VERSION']) rescue Exception => e puts "Failed to connect to Arvados API server: #{e}" @@ -669,7 +652,7 @@ if resource_body elsif resource_body_is_readable_file resource_body = resource_body_file.read() begin - # we don't actually need the results of the parsing, + # we don't actually need the results of the parsing, # just checking for the JSON::ParserError exception JSON.parse resource_body rescue JSON::ParserError => e @@ -715,14 +698,23 @@ else }) end +request_id = result.headers[:x_request_id] begin results = JSON.parse result.body rescue JSON::ParserError => e - abort "Failed to parse server response:\n" + e.to_s + err_msg = "Failed to parse server response:\n" + e.to_s + if request_id + err_msg += "\nRequest ID: #{request_id or client.request_id}" + end + abort err_msg end if results["errors"] then - abort "Error: #{results["errors"][0]}" + err_message = results["errors"][0] + if request_id and !err_message.match(/.*req-[0-9a-zA-Z]{20}.*/) + err_message += " (#{request_id})" + end + abort "Error: #{err_message}" end case global_opts[:format]