arvados-cli 2.3.2 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4a9ff5e4d35aaa8c78cec8fbf7e7304c37728730082054115fcb4852938761d
-  data.tar.gz: 49b7156f6eaae802e5ffad8474624e1fce5687caf2f185c2380532d420d47d0d
+  metadata.gz: 853937874e6f1ec96ae8343ee16d4603f06f1e19f733c16cefeea9416042bb70
+  data.tar.gz: ec0c43f67f7cf65b3085db8fd0d5af6cba35e1b026ec74d082808560d130c97b
 SHA512:
-  metadata.gz: 338fe83a20f39490eb5b6c15a37a4b31bde5e81a7ec842fa658d59dcf0966567da797b11e9618c9e266145bbdf08d6c2ad0839ecbe77d4918492c648fe18ec3d
-  data.tar.gz: 0b0a841c7391fc00871a13eb5e4e39e0bbe577d1f25c8b6b45e0883b5ee0819079fa9e130e832861e44b631eb253698ad8b30eeee9fadf1905d8df07790da883
+  metadata.gz: 83182581206f85a2b615c82395b95b15ed30965972ef547611b07aba12082be57263eabcf43f82ce54820d9bf4e76a7a3087e340a4652eb63bfcdc7fd6d3e8c0
+  data.tar.gz: b50fcf3cc9c28a972099c74fa6615f8f1c37fd268a9e976dd029b824380bae358d159e15b28b6ad58d4dee309b3fa64f49b68edef54ab66a5b2b74d4e3eab887

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.2
+  version: 2.4.1
 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