arvados-cli 2.3.3 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88dfbc739f4011928c215e27a0c8a18eb88f59c440ddf5e212be8688eedb72c2
-  data.tar.gz: 97aef11af751c89abeabcd62326319bc2ddc6b286a8f0849972b31d4e798fa2d
+  metadata.gz: 2f72ce8f492bc8b5eeea7a378ac81e432a34f43602188c26d27e5453b6124bf4
+  data.tar.gz: 594302474288eef3c072231eb45ef5d288785e4e921b3531e51fd18fe2f0ca87
 SHA512:
-  metadata.gz: 0551332ff5ff6d5b46623178ab5fd2b5898268ca8068b90cbbc23f964d2d8c51e9bad4c1c28f5e0b66d34aeb79a6eb74f56d38a68b40f272e0cb8920c2e5c5ba
-  data.tar.gz: b2a18f23e3f70c1d77dfe29bd254b9d37da988cf2c665ec72a1eca14e5a12188f94f76af49b32bb139080cd8f5dba0403833a2645f3eb8dc9d0b54a99602b887
+  metadata.gz: f726a1faf4b392a2343cb6a4bf3bd8e989b1c0bc4c979bcc2d6bb90e657c7ddf5eec2a05c24c9ac6b9d317b9c22b00251c5974997f8d3854b8edf1e21740fa2e
+  data.tar.gz: a135ad867e8b3316c23bf84694d2285ca3aac9010f5b5e30d22c51a6987bd4e3608c1e33d86842e27be8590db4ae10d7b9ec84f82fbc3ac3de4acc200efae2ec

data/bin/arv

@@ -65,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
@@ -182,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
@@ -605,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}"
@@ -708,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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.2
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-10 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -160,7 +160,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.5'
-description: Arvados command line tools, git commit e3df40f20870d2403d409f7726096edc2be31635
+description: Arvados command line tools, git commit a58e9d7052c42510be3238dc7e1ade52c73f17cd
 email: packaging@arvados.org
 executables:
 - arv