bosh_cpi 1.2976.0 → 1.2977.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8143af3947effbb7293fa4de8580dddc1f872946
-  data.tar.gz: 790e3a9def71fb4abea3a3da4ed4d574b7c19ca4
+  metadata.gz: 75aa621a2ca92bc9ab26b3a7294bc2a26687e061
+  data.tar.gz: e41ca194a2b98a8416385308b4a2102ae6376520
 SHA512:
-  metadata.gz: b81265ce3b243f94bc4dc95182ab006661d5c58e621f2a9d81994165e9487314079c87f8e741b181ccd119637100a93941a9e7b0aa1349b5d2c9e238a47b7180
-  data.tar.gz: 0c3ad8a239c699ceda544f2227b70a6a91fe4df027503537567c1f72723c90cfe2674f35da5b2c1e3e6853c9c0bb070f04a8bb34f457ed73688c01b11ac6504e
+  metadata.gz: 384dc32c5ae1349ca7e845cbaee6c6be0accb4c2c119337c88d5583c20cc814a4f6e076a3183b01feb7272205c184a24b4a5e1cd042616bc556422d8ffdf4566
+  data.tar.gz: b400262502c978c31dcde835a899c6663e113ef21e2673f2c5eee8ffc8079a53e3a32951deecb37f63fdbb43c166522cf8dae8ab4afe14baa107b7fc296227f3

data/lib/bosh/cpi/cli.rb

@@ -39,27 +39,27 @@ class Bosh::Cpi::Cli
   def run(json)
     begin
       request = JSON.load(json)
-    rescue JSON::ParserError
-      return error_response(INVALID_CALL_ERROR_TYPE, 'Request cannot be deserialized', false)
+    rescue JSON::ParserError => e
+      return error_response(INVALID_CALL_ERROR_TYPE, "Request cannot be deserialized, details: #{e.message}", false, e.backtrace)
     end
 
     method = request['method']
     unless method.is_a?(String)
-      return error_response(INVALID_CALL_ERROR_TYPE, 'Method must be a String', false)
+      return error_response(INVALID_CALL_ERROR_TYPE, "Method must be a String, got: '#{method.inspect}'", false)
     end
 
     unless KNOWN_RPC_METHODS.include?(method)
-      return error_response(INVALID_CALL_ERROR_TYPE, 'Method is not known', false)
+      return error_response(INVALID_CALL_ERROR_TYPE, "Method is not known, got: '#{method}'", false)
     end
 
     arguments = request['arguments']
     unless arguments.is_a?(Array)
-      return error_response(INVALID_CALL_ERROR_TYPE, 'Arguments must be an Array', false)
+      return error_response(INVALID_CALL_ERROR_TYPE, "Arguments must be an Array, got: '#{arguments.inspect}'", false)
     end
 
     context = request['context']
     unless context.is_a?(Hash) && context['director_uuid'].is_a?(String)
-      return error_response(INVALID_CALL_ERROR_TYPE, 'Request should include context with director uuid', false)
+      return error_response(INVALID_CALL_ERROR_TYPE, "Request should include context with director uuid, got: '#{context.inspect}'", false)
     end
 
     configure_director(context['director_uuid'])
@@ -69,13 +69,13 @@ class Bosh::Cpi::Cli
     begin
       result = @cpi.public_send(ruby_method, *arguments)
     rescue Bosh::Clouds::RetriableCloudError => e
-      return error_response(error_name(e), e.message, e.ok_to_retry)
+      return error_response(error_name(e), e.message, e.ok_to_retry, e.backtrace)
     rescue Bosh::Clouds::CloudError, Bosh::Clouds::CpiError => e
-      return error_response(error_name(e), e.message, false)
-    rescue ArgumentError
-      return error_response(INVALID_CALL_ERROR_TYPE, 'Arguments are not correct', false)
+      return error_response(error_name(e), e.message, false, e.backtrace)
+    rescue ArgumentError => e
+      return error_response(INVALID_CALL_ERROR_TYPE, "Arguments are not correct, details: '#{e.message}'", false, e.backtrace)
     rescue Exception => e
-      return error_response(UNKNOWN_ERROR_TYPE, e.message, false)
+      return error_response(UNKNOWN_ERROR_TYPE, e.message, false, e.backtrace)
     end
 
     result_response(result)
@@ -87,7 +87,11 @@ class Bosh::Cpi::Cli
     Bosh::Clouds::Config.uuid = director_uuid
   end
 
-  def error_response(type, message, ok_to_retry)
+  def error_response(type, message, ok_to_retry, bt=[])
+    if !bt.empty?
+      @logs_string_io.print("Rescued #{type}: #{message}. backtrace: #{bt.join("\n")}")
+    end
+
     hash = {
       result: nil,
       error: {

data/lib/cloud/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Clouds
-    VERSION = '1.2976.0'
+    VERSION = '1.2977.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2976.0
+  version: 1.2977.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2976.0
+        version: 1.2977.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2976.0
+        version: 1.2977.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CPI
-  3e4157
+  5a4f6d
 email: support@cloudfoundry.com
 executables: []
 extensions: []