blobstore_client 1.3091.0 → 1.3093.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44da63745ae7b347d12c0fa424dd53017749b0d0
-  data.tar.gz: 673e5bc4cf2d247a69658cf895394ec8f0a2a86f
+  metadata.gz: 8ea314f54fdeee107f401b1bbe2a26c6525dd703
+  data.tar.gz: 57eedf305975a368f5c028cc00d373247108b3e8
 SHA512:
-  metadata.gz: 4abeab091a4073b09e2f6b77ef3296d0677163682ae5ec948b5e4a3af0c4139fbcdcd632344cb2415b1faca8a944fddef14553ea4a9e9cf5fa58652885dfd0e4
-  data.tar.gz: 2e78aa17053d11c742a4d1a08ef2d1e61898db1512fee41caa3bf9ce431039ac49ed6e942dda187f0a353647a4f5fde261e4d3b78018121073bb1e61133411da
+  metadata.gz: 8020e39ff60582d5c4ef6259720919a9aaff2551317a60d9a22b09c7a3cec16eaf679c194b0eb15cc07f50a58e11ea7914cb212858c4049f5fddd8300980509a
+  data.tar.gz: 22977c18fcce31f399f42bce5a8f6f443a270db31314d7beeefb1adb129b69af0b0d9a231d143d39ffd71ab0b2975d585f2557bb6fb1561e4d63a733c071de4f

data/lib/blobstore_client/dav_blobstore_client.rb

@@ -54,6 +54,7 @@ module Bosh
       def delete_object(id)
         response = @client.delete(url(id), header: @headers)
 
+        raise NotFound, "Object '#{id}' is not found, #{response.status}/#{response.content}" if response.status == 404
         raise BlobstoreError, "Could not delete object, #{response.status}/#{response.content}" if response.status != 204
       end
 

data/lib/blobstore_client/s3_blobstore_client.rb

@@ -114,9 +114,8 @@ module Bosh
         raise BlobstoreError, 'unsupported action' if @simple
         object_id = full_oid_path(object_id)
         object = get_object_from_s3(object_id)
-        unless object.exists?
-          raise BlobstoreError, "no such object: #{object_id}"
-        end
+        raise NotFound, "Object '#{object_id}' is not found" unless object.exists?
+
         object.delete
       rescue AWS::Errors::Base => e
         raise BlobstoreError, "Failed to delete object '#{object_id}', S3 response error: #{e.message}"

data/lib/blobstore_client/simple_blobstore_client.rb

@@ -48,10 +48,9 @@ module Bosh
 
       def delete_object(id)
         response = @client.delete(url(id), header: @headers)
-        if response.status != 204
-          raise BlobstoreError,
-                "Could not delete object, #{response.status}/#{response.content}"
-        end
+
+        raise NotFound, "Object '#{id}' is not found, #{response.status}/#{response.content}" if response.status == 404
+        raise BlobstoreError, "Could not delete object, #{response.status}/#{response.content}" if response.status != 204
       end
 
       def object_exists?(id)

data/lib/blobstore_client/swift_blobstore_client.rb

@@ -85,6 +85,8 @@ module Bosh
         raise NotFound, "Swift object '#{object_id}' not found" if object.nil?
 
         object.destroy
+      rescue NotFound => e
+        raise e
       rescue Exception => e
         raise BlobstoreError, "Failed to delete object '#{object_id}': #{e.message}"
       end

data/lib/blobstore_client/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Blobstore
     class Client
-      VERSION = '1.3091.0'
+      VERSION = '1.3093.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobstore_client
 version: !ruby/object:Gem::Version
-  version: 1.3091.0
+  version: 1.3093.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement