arvados-cli 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33da67d2b1ee543aaa256d8c76bd4f904c4a7838d7f934c191647b97fd51758b
-  data.tar.gz: 1c762df477524d9ce8fac27de4923cfdb84fa24e3fa3f17368c014df1d95249b
+  metadata.gz: a3e87b05c43d4fdbc00d0040db8715420bd18e2a5a329942d7322276eb04a1a9
+  data.tar.gz: 5ec37ddd9354894592a6913c1621a3abecd286004e27999f10778a3f210a3846
 SHA512:
-  metadata.gz: 4618ddc2db5c603d5fb0a235a6c241d499b3ca3fd1bb3cec2df8aa73189a9dfefc03df3e8cfb3a50a0526469894b9088b4087cbfe1af9ec5b1abb3877867ec73
-  data.tar.gz: 6bd65dceaa514e0e6d811df40a253a9b67867913b9b7f072cc3e64f9cab6c3777fe10079c9cf40926ffd776042e2e00290510f190f80f3f0fde881c9571cefca
+  metadata.gz: c0b7f9a204c55be54d4f2a0d7bdb6ceadcef5082ca9d2d918782afeaf5d4458cfbcd76e8d19ed126bef75bf20f8d52fa11811b19728a41891b72638ef405e7e0
+  data.tar.gz: d6098e6f3b6f38089f193749a7377f1e166869d7b69bf184bb9435e256ded3646c3d0be591e149c9fb3333ea836a96ceb86c056787eba0708ca6a16f22c69f27

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
@@ -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.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-10 00:00:00.000000000 Z
+date: 2022-03-15 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 b1494b493833a2b6f881bf967c47dd3e8c313dc7
 email: packaging@arvados.org
 executables:
 - arv