bits_service_client 3.0.0 → 3.1.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ddf6f08436e197dd4999bcb2e83383f9197f37d
-  data.tar.gz: 14b23baef1291ab9c5073fd1f1538c19f5725117
+  metadata.gz: 36c579d11e320d6830b9b0807fe317c789f141e0
+  data.tar.gz: 00fdeb4d73f389bd3496ea13bb63cebb55a589fe
 SHA512:
-  metadata.gz: cb1c9310512e9c7c70fd1eb8057d0a19e82d30ecdadbd1053c5ce3ebc51f5f71756bef53d264d3885fc7e5c6291035c06f4c164386be2f9984f2abde7add17e6
-  data.tar.gz: c00d24d0ec2e7f84d688392ca77d37ece64f5fae25e28d3eba63115c409d1ab91226ab900906347c7111d1717271e613adbe2e636cf9093932c455c0b2c84fc4
+  metadata.gz: 42cf583b2c1e53c366d1b6056c5a3a1608641d96082e67ddcba91e2dca8e2219e6b5ea3093c3ca176967874d96f8dab9321d94637e0c1f381111eb7e43300916
+  data.tar.gz: 03b2046aad0bbc31cd19330bb1c3f21a86f10bd6611472694dbf521acb74f76cc8e22b719cdd425cb092dc97d118e872bf9ad6173f0d631e6c4f83fcfccf9047

data/lib/bits_service_client/client.rb

@@ -32,12 +32,29 @@ module BitsService
       response.code.to_i != 404
     end
 
-    def cp_to_blobstore(source_path, destination_key)
+    def cp_to_blobstore(source_path, destination_key, resources: nil)
       filename = File.basename(source_path)
       with_file_attachment!(source_path, filename) do |file_attachment|
         body = { :"#{@resource_type.to_s.singularize}" => file_attachment }
+
+        if resources != nil
+          body[:resources] = resources.to_json
+        end
+
         response = @private_http_client.do_request(Net::HTTP::Put::Multipart.new(resource_path(destination_key), body), @vcap_request_id)
         validate_response_code!(201, response)
+        if response.body == nil
+          logger.error("UnexpectedMissingBody: expected body with json payload. Got empty body.")
+
+          fail BlobstoreError.new({
+            response_code: response.code,
+            response_body: response.body,
+            response: response
+          }.to_json)
+        end
+        shas = JSON.parse(response.body, symbolize_names: true)
+        validate_keys_present!([:sha1, :sha256], shas, response)
+        return shas
       end
     end
 
@@ -170,6 +187,18 @@ module BitsService
       fail BlobstoreError.new(error)
     end
 
+    def validate_keys_present!(expected_keys, map, response)
+      return if expected_keys.all? { |expected_key| map.keys.include?(expected_key) }
+
+      logger.error("UnexpectedResponseBody: expected json with keys '#{expected_keys}'. Got #{map}")
+
+      fail BlobstoreError.new({
+        response_code: response.code,
+        response_body: response.body,
+        response: response
+      }.to_json)
+    end
+
     def resource_path(guid)
       prefix = resource_type == :buildpack_cache ? 'buildpack_cache/entries/' : resource_type
       File.join('/', prefix.to_s, guid.to_s)

data/lib/bits_service_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BitsServiceClient
-  VERSION = '3.0.0'
+  VERSION = '3.1.0.pre.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bits_service_client
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0.pre.1
 platform: ruby
 authors:
 - Rizwan Reza
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -195,9 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14.1