bits_service_client 3.2.0 → 3.3.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b72025bcaf34acdcce3558a4685553eed135ee
-  data.tar.gz: 2c1b5e61d064dfc866a2c50d0f699c5d71eff441
+  metadata.gz: 7073bd4444bd3db84ea5e8dd7fba708196c1aa01
+  data.tar.gz: 355aebf3a4a5a1dd8b36d69e9ec0625a7a0ef539
 SHA512:
-  metadata.gz: 5a3c40c2275f65b85ec5bb74fc9081f738e26fa9e9794e8ceb149e94d5cc9d9442c5f08be9648dbf3a97487693283ed4234789ca697050902bd460c0af9edcaf
-  data.tar.gz: 7b1d461c5d5fc5ce7b1e166205baf7fa62a651bc3c73689732543e2968e5ea174a937510769721b5459bfdd1254ebbce4c772dbf7a1defea01252054b572015d
+  metadata.gz: 111df09d52b46ee4bd06d5bc0cd6704166524b9afc7590363b3c5c9ea0da2ded407943897ae233bf815465afea3634ef50ac035dd41ef33cab25932d7d256b15
+  data.tar.gz: 0fcc11ab565da88f9a7d05c9bf02fd6e70fd86ecf41f4204bbd4a16a7aefa3d67fe40d1e4ff2a95bfff1958721814d14cb015019afa25f09b5f26be728d3c4a8

data/lib/bits_service_client/blob.rb

@@ -1,17 +1,90 @@
 # frozen_string_literal: true
 module BitsService
   class Blob
-    attr_reader :guid, :public_download_url, :internal_download_url, :public_upload_url
+    attr_reader :key
 
-    def initialize(guid:, public_download_url:, internal_download_url:, public_upload_url:)
-      @guid = guid
-      @public_download_url = public_download_url
-      @internal_download_url = internal_download_url
-      @public_upload_url = public_upload_url
+    def initialize(key:, private_endpoint:, private_http_client:, vcap_request_id:, username:, password:, resource_type:)
+      @key = key
+      @private_http_client = private_http_client
+      @vcap_request_id = vcap_request_id
+      @username = username
+      @password =password
+      @resource_type = resource_type
+      @private_endpoint = private_endpoint
     end
 
     def attributes(*_)
-      []
+      {}
+    end
+
+    def guid
+      key
+    end
+
+    def public_download_url
+      signed_url(key)
+    end
+
+    def public_upload_url
+      signed_url(key, verb: 'put')+'&async=true'
+    end
+
+    def internal_download_url
+      generate_private_url(key)
+    end
+
+    private
+
+    def signed_url(key, verb: nil)
+      query = if verb.nil?
+                ''
+              else
+                "?verb=#{verb}"
+              end
+
+      response = @private_http_client.get("/sign#{resource_path(key)}#{query}", @vcap_request_id, { username: @username, password: @password })
+      validate_response_code!([200, 302], response)
+
+      response.tap do |result|
+        result.body = result['location'] if result.code.to_i == 302
+      end
+
+      response.body
+    end
+
+    def generate_private_url(key)
+      path = resource_path(key)
+
+      @private_http_client.head(path, @vcap_request_id).tap do |response|
+        return response['location'] if response.code.to_i == 302
+      end
+
+      File.join(@private_endpoint.to_s, path)
+    end
+
+    # TODO: Refactor the following code to avoid duplicate methods with BitsService::Client
+
+    def validate_response_code!(expected_codes, response)
+      return if Array(expected_codes).include?(response.code.to_i)
+
+      error = {
+        response_code: response.code,
+        response_body: response.body,
+        response: response
+      }.to_json
+
+      logger.error("UnexpectedResponseCode: expected '#{expected_codes}' got #{response.code}")
+
+      fail BlobstoreError.new(error)
+    end
+
+    def resource_path(key)
+      prefix = @resource_type == :buildpack_cache ? 'buildpack_cache/entries/' : @resource_type
+      File.join('/', prefix.to_s, key.to_s)
+    end
+
+    def logger
+      @logger ||= Steno.logger('cc.bits_service_client')
     end
   end
 end

data/lib/bits_service_client/client.rb

@@ -102,30 +102,16 @@ module BitsService
 
     def blob(key)
       Blob.new(
-        guid: key,
-        public_download_url: signed_url(key),
-        public_upload_url: signed_url(key, verb: 'put')+'&async=true',
-        internal_download_url: generate_private_url(key)
+        key: key,
+        private_http_client: @private_http_client,
+        private_endpoint: @private_endpoint,
+        vcap_request_id: @vcap_request_id,
+        username: @username,
+        password: @password,
+        resource_type: @resource_type
       )
     end
 
-    def signed_url(key, verb: nil)
-      query = if verb.nil?
-                ''
-              else
-                "?verb=#{verb}"
-              end
-
-      response = @private_http_client.get("/sign#{resource_path(key)}#{query}", @vcap_request_id, { username: @username, password: @password })
-      validate_response_code!([200, 302], response)
-
-      response.tap do |result|
-        result.body = result['location'] if result.code.to_i == 302
-      end
-
-      response.body
-    end
-
     def delete_blob(blob)
       delete(blob.guid)
     end
@@ -175,16 +161,6 @@ module BitsService
       http_client.cert_store = cert_store
     end
 
-    def generate_private_url(guid)
-      path = resource_path(guid)
-
-      @private_http_client.head(path, @vcap_request_id).tap do |response|
-        return response['location'] if response.code.to_i == 302
-      end
-
-      File.join(@private_endpoint.to_s, path)
-    end
-
     def validate_response_code!(expected_codes, response)
       return if Array(expected_codes).include?(response.code.to_i)
 

data/lib/bits_service_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bits_service_client
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0.pre.1
 platform: ruby
 authors:
 - Rizwan Reza
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-10-29 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