bits_service_client 3.3.0 → 3.4.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb5333ac7373fd26d9ef9be01cffff94b9a3dece
-  data.tar.gz: 65704f0fbb475e1ce6b324da8a727fe7d673bde1
+  metadata.gz: 7d7684746adb5996dafb5100c93d96a42bbeae06
+  data.tar.gz: e79ddcd829e6e8bb761e23b387dbd629cd3057b1
 SHA512:
-  metadata.gz: 9568f6dcb72e7b4a566b77d4b2ab4e31ff80113a65f8c384fa0339acb641d79a180252ed7000ea63f5410ecd8a220e5f262aedb013a1843f4e438759e9568a1c
-  data.tar.gz: 52ae5702b69aa85aba90604e1d6c4d8b9b3868779e038a9bbc9cae7e284f79f40ae8ac12ac5945af91991fbc7d5e024dd25077570bc6a60400051a2edd661562
+  metadata.gz: d8cde1d30a5f69dcc48e0a4cac67517847ae64c0a4b118afe232f15a1a04ad71e12ebd2b95e028a4f32e80e71b22b0f3addb25efdead0228990cde01c40f5309
+  data.tar.gz: dc17b670fd6403cd8627e943a7083ccc593c56967413d93765eea0fc4a87564a89ec21c72fec4f2716c50923c25558f8c6df2004526d33ac1af1cb02ad92e3da

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Include:
     - '**/Gemfile'
     - '**/Rakefile'
@@ -157,3 +157,9 @@ Style/WordArray:
 
 Style/ZeroLengthPredicate:
   Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'Rakefile'
+    - '**/*.rake'
+    - 'spec/**/*.rb'

data/Gemfile

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec

data/Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 guard :bundler do
   require 'guard/bundler'
   require 'guard/bundler/verify'
@@ -12,12 +14,12 @@ end
 
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/bits_service_client/(.+)\.rb$}){|m| "spec/unit/bits_service_client/#{m[1]}_spec.rb"}
-  watch(%r{^lib/bits_service_client/client.rb$}){|m| "spec/unit/bits_service_client/bits_service_client_spec.rb"}
-  watch('spec/spec_helper.rb')  { 'spec' }
+  watch(%r{^lib/bits_service_client/(.+)\.rb$}) { |m| "spec/unit/bits_service_client/#{m[1]}_spec.rb" }
+  watch(%r{^lib/bits_service_client/client.rb$}) { |m| 'spec/unit/bits_service_client/bits_service_client_spec.rb' }
+  watch('spec/spec_helper.rb') { 'spec' }
 end
 
 guard :rubocop do
-  watch(%r{.+\.rb$})
+  watch(/.+\.rb$/)
   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'

data/bits_service_client.gemspec

@@ -1,5 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bits_service_client/version'
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'steno'
+  spec.add_dependency 'statsd-ruby', '~> 1.4'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'multipart-post'
@@ -27,4 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'webmock', '= 2.3.1'
+  spec.add_development_dependency 'sinatra'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-nav'
 end

data/lib/bits_service_client/blob.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module BitsService
   class Blob
     attr_reader :key
@@ -8,7 +9,7 @@ module BitsService
       @private_http_client = private_http_client
       @vcap_request_id = vcap_request_id
       @username = username
-      @password =password
+      @password = password
       @resource_type = resource_type
       @private_endpoint = private_endpoint
     end
@@ -26,7 +27,7 @@ module BitsService
     end
 
     def public_upload_url
-      signed_url(key, verb: 'put')+'&async=true'
+      signed_url(key, verb: 'put') + '&async=true'
     end
 
     def internal_download_url

data/lib/bits_service_client/client.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
+
 require 'active_support/inflector'
 require 'bits_service_client/logging_http_client'
 require 'tmpdir'
-require "open3"
+require 'open3'
 
 module BitsService
   class Client
     ResourceTypeNotPresent = Class.new(StandardError)
     ConfigurationError = Class.new(StandardError)
 
-    def initialize(bits_service_options:, resource_type:, vcap_request_id: '', request_timeout_in_seconds: 900)
+    def initialize(bits_service_options:, resource_type:, vcap_request_id: '', request_timeout_in_seconds: 900, request_timeout_in_seconds_fast: 10)
       @username = validated(bits_service_options, :username)
       @password = validated(bits_service_options, :password)
       @private_endpoint = validated_http_url(bits_service_options, :private_endpoint)
@@ -20,6 +21,7 @@ module BitsService
       @vcap_request_id = vcap_request_id
 
       @private_http_client = create_logging_http_client(@private_endpoint, bits_service_options, request_timeout_in_seconds)
+      @private_http_client_fast_timeout = create_logging_http_client(@private_endpoint, bits_service_options, request_timeout_in_seconds_fast)
       @public_http_client = create_logging_http_client(@public_endpoint, bits_service_options, request_timeout_in_seconds)
     end
 
@@ -28,7 +30,7 @@ module BitsService
     end
 
     def exists?(key)
-      response = @private_http_client.head(resource_path(key), @vcap_request_id)
+      response = @private_http_client_fast_timeout.head(resource_path(key), @vcap_request_id)
       validate_response_code!([200, 302, 404], response)
 
       response.code.to_i != 404
@@ -50,14 +52,14 @@ module BitsService
 
       body = { :"#{@resource_type.to_s.singularize}" => UploadIO.new(source_path, 'application/octet-stream') }
 
-      if resources != nil
+      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.")
+      if response.body.nil?
+        logger.error('UnexpectedMissingBody: expected body with json payload. Got empty body.')
 
         fail BlobstoreError.new({
           response_code: response.code,
@@ -66,8 +68,8 @@ module BitsService
         }.to_json)
       end
       shas = JSON.parse(response.body, symbolize_names: true)
-      validate_keys_present!([:sha1, :sha256], shas, response)
-      return shas
+      validate_keys_present!(%i[sha1 sha256], shas, response)
+      shas
     end
 
     def download_from_blobstore(source_key, destination_path, mode: nil)
@@ -92,9 +94,8 @@ module BitsService
     end
 
     def delete(key)
-      response = @private_http_client.delete(resource_path(key), @vcap_request_id)
+      response = @private_http_client_fast_timeout.delete(resource_path(key), @vcap_request_id)
       validate_response_code!([204, 404], response)
-
       if response.code.to_i == 404
         raise FileNotFound.new("Could not find object '#{key}', #{response.code}/#{response.body}")
       end
@@ -117,17 +118,17 @@ module BitsService
     end
 
     def delete_all(_=nil)
-      raise NotImplementedError unless :buildpack_cache == resource_type
+      raise NotImplementedError unless resource_type == :buildpack_cache
 
-      @private_http_client.delete(resource_path(''), @vcap_request_id).tap do |response|
+      @private_http_client_fast_timeout.delete(resource_path(''), @vcap_request_id).tap do |response|
         validate_response_code!(204, response)
       end
     end
 
     def delete_all_in_path(path)
-      raise NotImplementedError unless :buildpack_cache == resource_type
+      raise NotImplementedError unless resource_type == :buildpack_cache
 
-      @private_http_client.delete(resource_path(path.to_s), @vcap_request_id).tap do |response|
+      @private_http_client_fast_timeout.delete(resource_path(path.to_s), @vcap_request_id).tap do |response|
         validate_response_code!(204, response)
       end
     end
@@ -140,10 +141,10 @@ module BitsService
       LoggingHttpClient.new(
         Net::HTTP.new(endpoint.host, endpoint.port).tap do |c|
           c.read_timeout = request_timeout_in_seconds
-          if bits_service_options.has_key?(:ca_cert_path)
+          if bits_service_options.key?(:ca_cert_path)
             ca_cert_path = bits_service_options[:ca_cert_path]
           else
-            logger.info("Using bits-service client with root ca certs only (no configured ca_cert_path).")
+            logger.info('Using bits-service client with root ca certs only (no configured ca_cert_path).')
             ca_cert_path = nil
           end
           enable_ssl(c, ca_cert_path) if endpoint.scheme == 'https'

data/lib/bits_service_client/errors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module BitsService
   module Errors
     class Error < StandardError; end

data/lib/bits_service_client/logging_http_client.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
+
+require 'statsd'
+
 module BitsService
   class LoggingHttpClient
     def initialize(http_client)
       @http_client = http_client
       @logger = Steno.logger('cc.bits_service_client')
+      @statsd = Statsd.new
     end
 
     def get(path, vcap_request_id, credentials=nil)
@@ -37,9 +41,22 @@ module BitsService
 
       request.add_field('X-VCAP-REQUEST-ID', vcap_request_id)
 
-      @http_client.request(request).tap do |response|
+      begin
+        response = @http_client.request(request)
         @logger.info('Response', { code: response.code, vcap_request_id: vcap_request_id })
+      rescue Net::ReadTimeout => ex
+        @statsd.increment("cc.bits_#{request.method.downcase}.timeout")
+
+        @logger.info('Request timeout', {
+          method: request.method,
+          path: request.path,
+          address: @http_client.address,
+          port: @http_client.port,
+          vcap_request_id: vcap_request_id,
+        })
+        raise ex
       end
+      response
     end
   end
 end

data/lib/bits_service_client/resource_pool.rb

@@ -18,7 +18,7 @@ module BitsService
       end
     end
 
-    def signed_matches_url()
+    def signed_matches_url
       req = Net::HTTP::Get.new('/sign/app_stash/matches?verb=post')
       req.basic_auth(@username, @password)
       response = do_request(http_client, req, @vcap_request_id)

data/lib/bits_service_client/version.rb

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

data/lib/bits_service_client.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'json'
 require 'net/http/post/multipart'
 require 'openssl'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bits_service_client
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0.pre.1
 platform: ruby
 authors:
 - Rizwan Reza
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -41,6 +41,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: statsd-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +167,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - rizwanreza@gmail.com
@@ -195,12 +251,12 @@ 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
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Bits Services client for Cloud Foundry