X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/30d63b582ed093d235ae4a9efdeda5de1d4e2f24..0ca2d1f043dff99aa5f57a4336ea3a924e87e78b:/sdk/cli/bin/arv diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv index 31cbeec70c..c9809fad6a 100755 --- a/sdk/cli/bin/arv +++ b/sdk/cli/bin/arv @@ -1,10 +1,14 @@ #!/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' if RUBY_VERSION < '1.9.3' then abort <<-EOS @@ -12,90 +16,40 @@ if RUBY_VERSION < '1.9.3' then EOS end -# read authentication data from arvados configuration file if present -lineno = 0 -config_file = File.expand_path('~/.config/arvados/settings.conf') -if File.exist? config_file then - File.open(config_file, 'r').each do |line| - lineno = lineno + 1 - # skip comments - if line.match('^\s*#') then - next - end - var, val = line.chomp.split('=', 2) - # allow environment settings to override config files. - if var and val - ENV[var] ||= val - else - warn "#{config_file}: #{lineno}: could not parse `#{line}'" - end - end -end - -case ARGV[0] -when 'keep' - ARGV.shift - @sub = ARGV.shift - if ['get', 'put', 'ls', 'normalize'].index @sub then - # Native Arvados - exec `which arv-#{@sub}`.strip, *ARGV - elsif ['less', 'check'].index @sub then - # wh* shims - exec `which wh#{@sub}`.strip, *ARGV - else - puts "Usage: \n" + - "#{$0} keep ls\n" + - "#{$0} keep get\n" + - "#{$0} keep put\n" + - "#{$0} keep less\n" + - "#{$0} keep check\n" - end - abort -when 'pipeline' - ARGV.shift - @sub = ARGV.shift - if ['run'].index @sub then - exec `which arv-run-pipeline-instance`.strip, *ARGV - else - puts "Usage: \n" + - "#{$0} pipeline run [...]\n" + - "(see arv-run-pipeline-instance --help for details)\n" - end - abort -when 'tag' - ARGV.shift - exec `which arv-tag`.strip, *ARGV -end - -ENV['ARVADOS_API_VERSION'] ||= 'v1' - -if not ENV.include?('ARVADOS_API_HOST') or not ENV.include?('ARVADOS_API_TOKEN') then - abort <<-EOS -ARVADOS_API_HOST and ARVADOS_API_TOKEN need to be defined as environment variables. - EOS +begin + require 'json' + require 'net/http' + require 'pp' + require 'tempfile' + require 'yaml' +rescue LoadError => error + abort "Error loading libraries: #{error}\n" end begin - require 'curb' require 'rubygems' - require 'google/api_client' - require 'json' - require 'pp' - require 'trollop' + # Load the gems with more requirements first, so we respect any version + # constraints they put on gems loaded later. + require 'arvados/google_api_client' + require 'active_support/inflector' require 'andand' + require 'curb' require 'oj' - require 'active_support/inflector' - require 'yaml' -rescue LoadError + require 'optimist' +rescue LoadError => error abort <<-EOS +Error loading gems: #{error} + Please install all required gems: - gem install activesupport andand curb google-api-client json oj trollop + gem install arvados activesupport andand curb json oj optimist EOS end +# Search for 'ENTRY POINT' to see where things get going + ActiveSupport::Inflector.inflections do |inflect| inflect.irregular 'specimen', 'specimens' inflect.irregular 'human', 'humans' @@ -111,33 +65,6 @@ module Kernel end end -# do this if you're testing with a dev server and you don't care about SSL certificate checks: -if ENV['ARVADOS_API_HOST_INSECURE'] - suppress_warnings { OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE } -end - -class Google::APIClient - def discovery_document(api, version) - api = api.to_s - return @discovery_documents["#{api}:#{version}"] ||= - begin - # fetch new API discovery doc if stale - cached_doc = File.expand_path '~/.cache/arvados/discovery_uri.json' - if not File.exist?(cached_doc) or (Time.now - File.mtime(cached_doc)) > 86400 - response = self.execute!(:http_method => :get, - :uri => self.discovery_uri(api, version), - :authenticated => false) - FileUtils.makedirs(File.dirname cached_doc) - File.open(cached_doc, 'w') do |f| - f.puts response.body - end - end - - File.open(cached_doc) { |f| JSON.load f } - end - end -end - class ArvadosClient < Google::APIClient def execute(*args) if args.last.is_a? Hash @@ -148,21 +75,368 @@ class ArvadosClient < Google::APIClient end end -begin - client = ArvadosClient.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}" - exit 1 +def init_config + # read authentication data from arvados configuration file if present + lineno = 0 + config_file = File.expand_path('~/.config/arvados/settings.conf') rescue nil + if not config_file.nil? and File.exist? config_file then + File.open(config_file, 'r').each do |line| + lineno = lineno + 1 + # skip comments + if line.match('^\s*#') then + next + end + var, val = line.chomp.split('=', 2) + # allow environment settings to override config files. + if var and val + ENV[var] ||= val + else + warn "#{config_file}: #{lineno}: could not parse `#{line}'" + end + end + end +end + + +subcommands = %w(copy create edit get keep pipeline run tag ws) + +def exec_bin bin, opts + bin_path = `which #{bin.shellescape}`.strip + if bin_path.empty? + raise "#{bin}: command not found" + end + exec bin_path, *opts +end + +def check_subcommands client, arvados, subcommand, global_opts, remaining_opts + case subcommand + when 'create' + arv_create client, arvados, global_opts, remaining_opts + when 'edit' + arv_edit client, arvados, global_opts, remaining_opts + when 'get' + arv_get client, arvados, global_opts, remaining_opts + when 'copy', 'tag', 'ws', 'run' + exec_bin "arv-#{subcommand}", remaining_opts + when 'keep' + @sub = remaining_opts.shift + if ['get', 'put', 'ls', 'normalize'].index @sub then + # Native Arvados + exec_bin "arv-#{@sub}", remaining_opts + elsif @sub == 'docker' + exec_bin "arv-keepdocker", remaining_opts + else + puts "Usage: arv keep [method] [--parameters]\n" + puts "Use 'arv keep [method] --help' to get more information about specific methods.\n\n" + puts "Available methods: ls, get, put, docker" + end + abort + end +end + +def command_exists?(command) + File.executable?(command) || ENV['PATH'].split(':').any? {|folder| File.executable?(File.join(folder, command))} +end + +def run_editor path + pid = Process::fork + if pid.nil? + editor = nil + [ENV["VISUAL"], ENV["EDITOR"], "nano", "vi"].each do |e| + editor ||= e if e and command_exists? e + end + if editor.nil? + abort "Could not find any editor to use, please set $VISUAL or $EDITOR to your desired editor." + end + exec editor, path + else + Process.wait pid + end + + if $?.exitstatus != 0 + raise "Editor exited with status #{$?.exitstatus}" + end +end + +def edit_and_commit_object initial_obj, tmp_stem, global_opts, &block + + content = get_obj_content initial_obj, global_opts + + tmp_file = Tempfile.new([tmp_stem, ".#{global_opts[:format]}"]) + tmp_file.write(content) + tmp_file.close + + begin + error_text = '' + while true + begin + run_editor tmp_file.path + + tmp_file.open + newcontent = tmp_file.read() + tmp_file.close + + # Strip lines starting with '#' + newcontent = newcontent.lines.select {|l| !l.start_with? '#'}.join + + # Load the new object + newobj = case global_opts[:format] + when 'json' + Oj.load(newcontent) + when 'yaml' + YAML.load(newcontent) + else + abort "Unrecognized format #{global_opts[:format]}" + end + + yield newobj + + break + rescue => e + can_retry = true + if e.is_a? Psych::SyntaxError + this_error = "YAML error parsing your input: #{e}" + elsif e.is_a? JSON::ParserError or e.is_a? Oj::ParseError + this_error = "JSON error parsing your input: #{e}" + elsif e.is_a? ArvadosAPIError + this_error = "API responded with error #{e}" + else + this_error = "#{e.class}: #{e}" + can_retry = false + end + puts this_error + + tmp_file.open + newcontent = tmp_file.read() + tmp_file.close + + if newcontent == error_text or not can_retry + FileUtils::cp tmp_file.path, tmp_file.path + ".saved" + puts "File is unchanged, edit aborted." if can_retry + abort "Saved contents to " + tmp_file.path + ".saved" + else + tmp_file.open + tmp_file.truncate 0 + error_text = this_error.to_s.lines.map {|l| '# ' + l}.join + "\n" + error_text += "# Please fix the error and try again.\n" + error_text += newcontent.lines.select {|l| !l.start_with? '#'}.join + tmp_file.write error_text + tmp_file.close + end + end + end + ensure + tmp_file.close(true) + end + + nil +end + +class ArvadosAPIError < RuntimeError +end + +def check_response result + begin + results = JSON.parse result.body + rescue JSON::ParserError, Oj::ParseError => e + raise "Failed to parse server response:\n" + e.to_s + end + + if result.response.status != 200 + raise ArvadosAPIError.new("#{result.response.status}: #{ + ((results['errors'] && results['errors'].join('\n')) || + Net::HTTPResponse::CODE_TO_OBJ[status.to_s].to_s.sub(/^Net::HTTP/, '').titleize)}") + end + + results +end + +def lookup_uuid_rsc arvados, uuid + m = /([a-z0-9]{5})-([a-z0-9]{5})-([a-z0-9]{15})/.match uuid + if !m + if /^[a-f0-9]{32}/.match uuid + abort "Arvados collections are not editable." + else + abort "'#{uuid}' does not appear to be an Arvados uuid" + end + end + + rsc = nil + arvados.discovery_document["resources"].each do |k,v| + klass = k.singularize.camelize + dig = Digest::MD5.hexdigest(klass).to_i(16).to_s(36)[-5..-1] + if dig == m[2] + rsc = k + end + end + + if rsc.nil? + abort "Could not determine resource type #{m[2]}" + end + + return rsc +end + +def fetch_rsc_obj client, arvados, rsc, uuid, remaining_opts + + begin + result = client.execute(:api_method => eval('arvados.' + rsc + '.get'), + :parameters => {"uuid" => uuid}, + :authenticated => false, + :headers => { + authorization: 'OAuth2 '+ENV['ARVADOS_API_TOKEN'] + }) + obj = check_response result + rescue => e + abort "Server error: #{e}" + end + + if remaining_opts.length > 0 + obj.select! { |k, v| remaining_opts.include? k } + end + + return obj +end + +def get_obj_content obj, global_opts + content = case global_opts[:format] + when 'json' + Oj.dump(obj, :indent => 1) + when 'yaml' + obj.to_yaml + else + abort "Unrecognized format #{global_opts[:format]}" + end + return content +end + +def arv_edit client, arvados, global_opts, remaining_opts + uuid = remaining_opts.shift + if uuid.nil? or uuid == "-h" or uuid == "--help" + puts head_banner + puts "Usage: arv edit [uuid] [fields...]\n\n" + puts "Fetch the specified Arvados object, select the specified fields, \n" + puts "open an interactive text editor on a text representation (json or\n" + puts "yaml, use --format) and then update the object. Will use 'nano'\n" + puts "by default, customize with the EDITOR or VISUAL environment variable.\n" + exit 255 + end + + rsc = lookup_uuid_rsc arvados, uuid + oldobj = fetch_rsc_obj client, arvados, rsc, uuid, remaining_opts + + edit_and_commit_object oldobj, uuid, global_opts do |newobj| + newobj.select! {|k| newobj[k] != oldobj[k]} + if !newobj.empty? + result = client.execute(:api_method => eval('arvados.' + rsc + '.update'), + :parameters => {"uuid" => uuid}, + :body_object => { rsc.singularize => newobj }, + :authenticated => false, + :headers => { + authorization: 'OAuth2 '+ENV['ARVADOS_API_TOKEN'] + }) + results = check_response result + STDERR.puts "Updated object #{results['uuid']}" + else + STDERR.puts "Object is unchanged, did not update." + end + end + + exit 0 +end + +def arv_get client, arvados, global_opts, remaining_opts + uuid = remaining_opts.shift + if uuid.nil? or uuid == "-h" or uuid == "--help" + puts head_banner + puts "Usage: arv [--format json|yaml] get [uuid] [fields...]\n\n" + puts "Fetch the specified Arvados object, select the specified fields,\n" + puts "and print a text representation.\n" + exit 255 + end + + rsc = lookup_uuid_rsc arvados, uuid + obj = fetch_rsc_obj client, arvados, rsc, uuid, remaining_opts + content = get_obj_content obj, global_opts + + puts content + exit 0 +end + +def arv_create client, arvados, global_opts, remaining_opts + types = resource_types(arvados.discovery_document) + 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 + + object_type = remaining_opts.shift + if object_type.nil? + abort "Missing resource type, must be one of #{types.join ', '}" + end + + rsc = arvados.discovery_document["resources"].keys.select { |k| object_type == k.singularize } + if rsc.empty? + abort "Could not determine resource type #{object_type}" + end + rsc = rsc.first + + discovered_params = arvados.discovery_document["resources"][rsc]["methods"]["create"]["parameters"] + method_opts = Optimist::options do + banner head_banner + banner "Usage: arv create [--project-uuid] #{object_type} [create parameters]" + banner "" + banner "This method supports the following parameters:" + banner "" + discovered_params.each do |k,v| + 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 optimist bork + end + opts[:default] = v["default"] if v.include?("default") + opts[:default] = v["default"].to_i if opts[:type] == :integer + opts[:default] = to_boolean(v["default"]) if opts[:type] == :boolean + opts[:required] = true if v.include?("required") and v["required"] + description = '' + description = ' ' + v["description"] if v.include?("description") + opt k.to_sym, description, opts + end + end + + initial_obj = {} + if create_opts[:project_uuid] + initial_obj["owner_uuid"] = create_opts[:project_uuid] + end + + edit_and_commit_object initial_obj, "", global_opts do |newobj| + result = client.execute(:api_method => eval('arvados.' + rsc + '.create'), + :parameters => method_opts, + :body_object => {object_type => newobj}, + :authenticated => false, + :headers => { + authorization: 'OAuth2 '+ENV['ARVADOS_API_TOKEN'] + }) + results = check_response result + puts "Created object #{results['uuid']}" + end + + exit 0 end def to_boolean(s) !!(s =~ /^(true|t|yes|y|1)$/i) end +def head_banner + "Arvados command line client\n" +end + def help_methods(discovery_document, resource, method=nil) - banner = "\n" - banner += "The #{resource} resource type supports the following methods:" + banner = head_banner + banner += "Usage: arv #{resource} [method] [--parameters]\n" + banner += "Use 'arv #{resource} [method] --help' to get more information about specific methods.\n\n" + banner += "The #{resource} resource supports the following methods:" banner += "\n\n" discovery_document["resources"][resource.pluralize]["methods"]. each do |k,v| @@ -176,44 +450,36 @@ def help_methods(discovery_document, resource, method=nil) banner += "\n" STDERR.puts banner - if not method.nil? and method != '--help' then - Trollop::die ("Unknown method #{method.inspect} " + - "for resource #{resource.inspect}") + if not method.nil? and method != '--help' and method != '-h' then + abort "Unknown method #{method.inspect} " + + "for resource #{resource.inspect}" end exit 255 end -def help_resources(discovery_document, resource) - banner = "\n" - banner += "This Arvados instance supports the following resource types:" - banner += "\n\n" - discovery_document["resources"].each do |k,v| - description = '' - resource_info = discovery_document["schemas"][k.singularize.capitalize] - if resource_info and resource_info.include?('description') - # add only the first line of the discovery doc description - description = ' ' + resource_info["description"].split("\n").first.chomp - end - banner += " #{sprintf("%30s",k.singularize)}#{description}\n" - end - banner += "\n" - STDERR.puts banner - - if not resource.nil? and resource != '--help' then - Trollop::die "Unknown resource type #{resource.inspect}" - end +def help_resources(option_parser, discovery_document, resource) + option_parser.educate exit 255 end -def parse_arguments(discovery_document) +def resource_types discovery_document resource_types = Array.new() discovery_document["resources"].each do |k,v| resource_types << k.singularize end + resource_types +end + +def parse_arguments(discovery_document, subcommands) + resources_and_subcommands = resource_types(discovery_document) + subcommands - global_opts = Trollop::options do + option_parser = Optimist::Parser.new do version __FILE__ - banner "arv: the Arvados CLI tool" + banner head_banner + banner "Usage: arv [--flags] subcommand|resource [method] [--parameters]" + banner "" + banner "Available flags:" + opt :dry_run, "Don't actually do anything", :short => "-n" opt :verbose, "Print some things on stderr" opt :format, @@ -221,9 +487,24 @@ def parse_arguments(discovery_document) :type => :string, :default => 'json' opt :short, "Return only UUIDs (equivalent to --format=uuid)" - opt :resources, "Display list of resources known to this Arvados instance." + + banner "" + banner "Use 'arv subcommand|resource --help' to get more information about a particular command or resource." + banner "" + banner "Available subcommands: #{subcommands.join(', ')}" + banner "" + + banner "Available resources: #{discovery_document['resources'].keys.map { |k| k.singularize }.join(', ')}" + + banner "" + banner "Additional options:" + conflicts :short, :format - stop_on resource_types + stop_on resources_and_subcommands + end + + global_opts = Optimist::with_standard_exception_handling option_parser do + o = option_parser.parse ARGV end unless %w(json yaml uuid).include?(global_opts[:format]) @@ -237,59 +518,105 @@ def parse_arguments(discovery_document) end resource = ARGV.shift - if global_opts[:resources] or not resource_types.include?(resource) - help_resources(discovery_document, resource) - end - method = ARGV.shift - if not (discovery_document["resources"][resource.pluralize]["methods"]. - include?(method)) - help_methods(discovery_document, resource, method) - end + if not subcommands.include? resource + if not resources_and_subcommands.include?(resource) + puts "Resource or subcommand '#{resource}' is not recognized.\n\n" if !resource.nil? + help_resources(option_parser, discovery_document, resource) + end - discovered_params = discovery_document\ + method = ARGV.shift + if not (discovery_document["resources"][resource.pluralize]["methods"]. + include?(method)) + help_methods(discovery_document, resource, method) + end + + discovered_params = discovery_document\ ["resources"][resource.pluralize]\ ["methods"][method]["parameters"] - method_opts = Trollop::options do - discovered_params.each do |k,v| - 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 + method_opts = Optimist::options do + banner head_banner + banner "Usage: arv #{resource} #{method} [--parameters]" + banner "" + banner "This method supports the following parameters:" + banner "" + discovered_params.each do |k,v| + 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 optimist bork + end + opts[:default] = v["default"] if v.include?("default") + opts[:default] = v["default"].to_i if opts[:type] == :integer + opts[:default] = to_boolean(v["default"]) if opts[:type] == :boolean + opts[:required] = true if v.include?("required") and v["required"] + description = '' + description = ' ' + v["description"] if v.include?("description") + opt k.to_sym, description, opts end - opts[:default] = v["default"] if v.include?("default") - opts[:default] = v["default"].to_i if opts[:type] == :integer - opts[:default] = to_boolean(v["default"]) if opts[:type] == :boolean - opts[:required] = true if v.include?("required") and v["required"] - description = '' - description = ' ' + v["description"] if v.include?("description") - opt k.to_sym, description, opts - end - body_object = discovery_document["resources"][resource.pluralize]["methods"][method]["request"] - if body_object and discovered_params[resource].nil? - is_required = true - if body_object["required"] == false - is_required = false + + body_object = discovery_document["resources"][resource.pluralize]["methods"][method]["request"] + if body_object and discovered_params[resource].nil? + is_required = true + if body_object["required"] == false + is_required = false + end + resource_opt_desc = "Either a string representing #{resource} as JSON or a filename from which to read #{resource} JSON (use '-' to read from stdin)." + if is_required + resource_opt_desc += " This option must be specified." + end + opt resource.to_sym, resource_opt_desc, { + required: is_required, + type: :string + } end - opt resource.to_sym, "#{resource} (request body)", { - required: is_required, - type: :string - } end - end - discovered_params.each do |k,v| - k = k.to_sym - if ['object', 'array'].index(v["type"]) and method_opts.has_key? k - if method_opts[k].andand.match /^\// - method_opts[k] = File.open method_opts[k], 'rb' do |f| f.read end + discovered_params.merge({resource => {'type' => 'object'}}).each do |k,v| + k = k.to_sym + if ['object', 'array'].index(v["type"]) and method_opts.has_key? k + if method_opts[k].andand.match /^\// + method_opts[k] = File.open method_opts[k], 'rb' do |f| f.read end + end end end end + return resource, method, method_opts, global_opts, ARGV end -resource_schema, method, method_opts, global_opts, remaining_opts = parse_arguments(arvados.discovery_document) +# +# ENTRY POINT +# + +init_config + +ENV['ARVADOS_API_VERSION'] ||= 'v1' + +if not ENV.include?('ARVADOS_API_HOST') or not ENV.include?('ARVADOS_API_TOKEN') then + abort <<-EOS +ARVADOS_API_HOST and ARVADOS_API_TOKEN need to be defined as environment variables. + EOS +end + +# do this if you're testing with a dev server and you don't care about SSL certificate checks: +if ENV['ARVADOS_API_HOST_INSECURE'] + suppress_warnings { OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE } +end + +begin + client = ArvadosClient.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}" + exit 1 +end + +# Parse arguments here +resource_schema, method, method_opts, global_opts, remaining_opts = parse_arguments(arvados.discovery_document, subcommands) + +check_subcommands client, arvados, resource_schema, global_opts, remaining_opts + controller = resource_schema.pluralize api_method = 'arvados.' + controller + '.' + method @@ -304,6 +631,45 @@ end request_parameters = {_profile:true}.merge(method_opts) resource_body = request_parameters.delete(resource_schema.to_sym) if resource_body + # check if resource_body is valid JSON by attempting to parse it + resource_body_is_json = true + begin + # 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 + resource_body_is_json = false + end + resource_body_is_readable_file = false + # if resource_body is not valid JSON, it should be a filename (or '-' for stdin) + if resource_body == '-' + resource_body_is_readable_file = true + resource_body_file = $stdin + elsif File.readable? resource_body + resource_body_is_readable_file = true + resource_body_file = File.open(resource_body, 'r') + end + if resource_body_is_json and resource_body_is_readable_file + abort "Argument specified for option '--#{resource_schema.to_sym}' is both valid JSON and a readable file. Please consider renaming the file: '#{resource_body}'" + elsif !resource_body_is_json and !resource_body_is_readable_file + if File.exists? resource_body + # specified file exists but is not readable + abort "Argument specified for option '--#{resource_schema.to_sym}' is an existing file but is not readable. Please check permissions on: '#{resource_body}'" + else + # specified file does not exist + abort "Argument specified for option '--#{resource_schema.to_sym}' is neither valid JSON nor an existing file: '#{resource_body}'" + end + elsif resource_body_is_readable_file + resource_body = resource_body_file.read() + begin + # 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 + abort "Contents of file '#{resource_body_file.path}' is not valid JSON: #{e}" + end + resource_body_file.close() + end request_body = { resource_schema => resource_body } @@ -335,7 +701,7 @@ when else result = client.execute(:api_method => eval(api_method), :parameters => request_parameters, - :body => request_body, + :body_object => request_body, :authenticated => false, :headers => { authorization: 'OAuth2 '+ENV['ARVADOS_API_TOKEN']