prefab-cloud-ruby 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ebf0d2d3dfa86a3991010f99ed002bb7125fc37
-  data.tar.gz: 042f583a1b800bc1452d9ac187b2c949849e7651
+  metadata.gz: aa167019e6d70cdde48a87afc80b4363eca3d3d9
+  data.tar.gz: 761b554954582f17a31ab902bd02eb6b856df250
 SHA512:
-  metadata.gz: f7a1f5fafc6e0e6b5446abb903753593dc2fca8c02c71d50522d12674fb393ed0de77995772fbb22dc7cf29957b66b2ccfc7262d130e742e3f6d9c3fbefd8d6e
-  data.tar.gz: 13ae283ac75b64dd467b19e87fb255c9fc8d4b141ea96abae6ad4de4f48f03ea93d57d8055ae56a8864edb795482c7e43d78deca175b088644bdb9b0b134b05e
+  metadata.gz: 0cdfd19ee6df21bddb493d4cfbf95434c6d5c3d89065c115465db6a3298caff128a5734fae7dee0df26fe1e113229710b2371324afa7b1472b347eebc26fe7e1
+  data.tar.gz: f5945febd993742430b3ff909d3d27d306d171e542bd336408a70adfea705267e46f12c95eb0bb4cb411154e276dd808b1a84a55e214e9d735d94797534b0916

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/compile_protos.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+grpc_tools_ruby_protoc -I ../prefab-cloud/ --ruby_out=lib --grpc_out=lib prefab.proto

data/lib/prefab-cloud-ruby.rb

@@ -3,7 +3,6 @@ require 'concurrent'
 require 'openssl'
 require 'prefab_pb'
 require 'prefab_services_pb'
-require 'ratelimit_pb'
 require 'prefab/config_loader'
 require 'prefab/config_resolver'
 require 'prefab/client'

data/lib/prefab/client.rb

@@ -48,11 +48,15 @@ module Prefab
 
     def ssl_certs
       ssl_certs = ""
-      Dir.foreach(OpenSSL::X509::DEFAULT_CERT_DIR) do |cert|
-        next if cert == '.' or cert == '..'
+      Dir["#{OpenSSL::X509::DEFAULT_CERT_DIR}/*.pem"].each do |cert|
         ssl_certs << File.open(cert).read
       end
-      ssl_certs << File.open(OpenSSL::X509::DEFAULT_CERT_FILE).read
+      if OpenSSL::X509::DEFAULT_CERT_FILE && File.exists?(OpenSSL::X509::DEFAULT_CERT_FILE)
+        ssl_certs << File.open(OpenSSL::X509::DEFAULT_CERT_FILE).read
+      end
+      ssl_certs
+    rescue => e
+      @logger.warn("Issue loading SSL certs #{e.message}")
       ssl_certs
     end
 

data/lib/prefab/ratelimit_client.rb

@@ -15,10 +15,10 @@ module Prefab
       expiry = @client.shared_cache.read(expiry_cache_key)
       if !expiry.nil? && Integer(expiry) > Time.now.utc.to_f * 1000
         @client.stats.increment("prefab.ratelimit.limitcheck.expirycache.hit", tags: [])
-        return It::Ratelim::Data::LimitResponse.new(passed: false, amount: 0)
+        return Prefab::LimitResponse.new(passed: false, amount: 0)
       end
 
-      req = It::Ratelim::Data::LimitRequest.new(
+      req = Prefab::LimitRequest.new(
         account_id: @client.account_id,
         acquire_amount: acquire_amount,
         groups: groups,
@@ -35,20 +35,21 @@ module Prefab
       result
 
     rescue => e
-      handle_error(e, on_error)
+      handle_error(e, on_error, groups)
     end
 
     private
 
-    def handle_error(e, on_error)
+    def handle_error(e, on_error, groups)
       @client.stats.increment("prefab.ratelimit.error", tags: ["type:limit"])
+      message = "ratelimit for #{groups} error: #{e.message}"
       case on_error
       when :log_and_pass
-        @client.logger.warn(e)
-        It::Ratelim::Data::LimitResponse.new(passed: true, amount: 0)
+        @client.logger.warn(message)
+        Prefab::LimitResponse.new(passed: true, amount: 0)
       when :log_and_hit
-        @client.logger.warn(e)
-        It::Ratelim::Data::LimitResponse.new(passed: false, amount: 0)
+        @client.logger.warn(message)
+        Prefab::LimitResponse.new(passed: false, amount: 0)
       when :throw
         raise e
       end

data/lib/prefab_pb.rb

@@ -3,8 +3,6 @@
 
 require 'google/protobuf'
 
-require 'google/protobuf/wrappers_pb'
-require 'ratelimit_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "prefab.ConfigServicePointer" do
     optional :account_id, :int64, 1
@@ -23,12 +21,108 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :bytes, :bytes, 3
       optional :double, :double, 4
       optional :bool, :bool, 5
-      optional :feature_flag, :message, 6, "it.ratelim.data.FeatureFlag"
+      optional :feature_flag, :message, 6, "prefab.FeatureFlag"
     end
   end
   add_message "prefab.ConfigDeltas" do
     repeated :deltas, :message, 1, "prefab.ConfigDelta"
   end
+  add_message "prefab.LimitResponse" do
+    optional :passed, :bool, 1
+    optional :expires_at, :int64, 2
+    optional :enforced_group, :string, 3
+    optional :current_bucket, :int64, 4
+    optional :policy_group, :string, 5
+    optional :policy_name, :enum, 6, "prefab.LimitResponse.LimitPolicyNames"
+    optional :policy_limit, :int32, 7
+    optional :amount, :int64, 8
+    optional :limit_reset_at, :int64, 9
+    optional :safety_level, :enum, 10, "prefab.LimitDefinition.SafetyLevel"
+  end
+  add_enum "prefab.LimitResponse.LimitPolicyNames" do
+    value :NOT_SET, 0
+    value :SECONDLY_ROLLING, 1
+    value :MINUTELY_ROLLING, 3
+    value :HOURLY_ROLLING, 5
+    value :DAILY_ROLLING, 7
+    value :MONTHLY_ROLLING, 8
+    value :INFINITE, 9
+    value :YEARLY_ROLLING, 10
+  end
+  add_message "prefab.LimitRequest" do
+    optional :account_id, :int64, 1
+    optional :acquire_amount, :int32, 2
+    repeated :groups, :string, 3
+    optional :limit_combiner, :enum, 4, "prefab.LimitRequest.LimitCombiner"
+    optional :allow_partial_response, :bool, 5
+  end
+  add_enum "prefab.LimitRequest.LimitCombiner" do
+    value :NOT_SET, 0
+    value :MINIMUM, 1
+    value :MAXIMUM, 2
+  end
+  add_message "prefab.FeatureFlag" do
+    optional :account_id, :int64, 1
+    optional :feature, :string, 2
+    optional :pct, :double, 3
+    repeated :whitelisted, :string, 4
+    optional :prior_feature_name, :string, 5
+  end
+  add_message "prefab.LimitDefinition" do
+    optional :group, :string, 1
+    optional :policy_name, :enum, 2, "prefab.LimitResponse.LimitPolicyNames"
+    optional :limit, :int32, 3
+    optional :burst, :int32, 4
+    optional :account_id, :int64, 5
+    optional :last_modified, :int64, 6
+    optional :returnable, :bool, 7
+    optional :safety_level, :enum, 8, "prefab.LimitDefinition.SafetyLevel"
+  end
+  add_enum "prefab.LimitDefinition.SafetyLevel" do
+    value :NOT_SET, 0
+    value :L4_BEST_EFFORT, 4
+    value :L5_BOMBPROOF, 5
+  end
+  add_message "prefab.LimitDefinitions" do
+    repeated :definitions, :message, 1, "prefab.LimitDefinition"
+  end
+  add_message "prefab.FeatureFlags" do
+    repeated :flags, :message, 1, "prefab.FeatureFlag"
+    optional :cache_expiry, :int64, 2
+  end
+  add_message "prefab.BucketWrite" do
+    optional :tokenBucket, :message, 1, "prefab.TokenBucket"
+    optional :bucket, :string, 2
+  end
+  add_message "prefab.TokenBucket" do
+    optional :current_value, :int64, 1
+    optional :time_key, :int64, 2
+    repeated :expiries, :int64, 3
+  end
+  add_message "prefab.BufferedRequest" do
+    optional :account_id, :int64, 1
+    optional :method, :string, 2
+    optional :uri, :string, 3
+    optional :body, :string, 4
+    repeated :limit_groups, :string, 5
+    optional :content_type, :string, 6
+    optional :fifo, :bool, 7
+  end
+  add_message "prefab.BatchRequest" do
+    optional :account_id, :int64, 1
+    optional :method, :string, 2
+    optional :uri, :string, 3
+    optional :body, :string, 4
+    repeated :limit_groups, :string, 5
+    optional :batch_template, :string, 6
+    optional :batch_separator, :string, 7
+  end
+  add_enum "prefab.OnFailure" do
+    value :NOT_SET, 0
+    value :LOG_AND_PASS, 1
+    value :LOG_AND_FAIL, 2
+    value :THROW, 3
+  end
 end
 
 module Prefab
@@ -36,4 +130,18 @@ module Prefab
   ConfigDelta = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigDelta").msgclass
   ConfigValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigValue").msgclass
   ConfigDeltas = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigDeltas").msgclass
+  LimitResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitResponse").msgclass
+  LimitResponse::LimitPolicyNames = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitResponse.LimitPolicyNames").enummodule
+  LimitRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitRequest").msgclass
+  LimitRequest::LimitCombiner = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitRequest.LimitCombiner").enummodule
+  FeatureFlag = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.FeatureFlag").msgclass
+  LimitDefinition = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitDefinition").msgclass
+  LimitDefinition::SafetyLevel = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitDefinition.SafetyLevel").enummodule
+  LimitDefinitions = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.LimitDefinitions").msgclass
+  FeatureFlags = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.FeatureFlags").msgclass
+  BucketWrite = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.BucketWrite").msgclass
+  TokenBucket = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.TokenBucket").msgclass
+  BufferedRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.BufferedRequest").msgclass
+  BatchRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.BatchRequest").msgclass
+  OnFailure = Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.OnFailure").enummodule
 end

data/lib/prefab_services_pb.rb

@@ -14,7 +14,7 @@ module Prefab
       self.unmarshal_class_method = :decode
       self.service_name = 'prefab.RateLimitService'
 
-      rpc :LimitCheck, It::Ratelim::Data::LimitRequest, It::Ratelim::Data::LimitResponse
+      rpc :LimitCheck, LimitRequest, LimitResponse
     end
 
     Stub = Service.rpc_stub_class

data/prefab-cloud-ruby.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 0.0.6 ruby lib
+# stub: prefab-cloud-ruby 0.0.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "Rakefile",
     "VERSION",
+    "compile_protos.sh",
     "lib/prefab-cloud-ruby.rb",
     "lib/prefab/auth_interceptor.rb",
     "lib/prefab/client.rb",
@@ -36,7 +37,6 @@ Gem::Specification.new do |s|
     "lib/prefab/store.rb",
     "lib/prefab_pb.rb",
     "lib/prefab_services_pb.rb",
-    "lib/ratelimit_pb.rb",
     "prefab-cloud-ruby.gemspec"
   ]
   s.homepage = "http://github.com/prefab-cloud/prefab-cloud-ruby".freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jeff Dwyer
@@ -141,6 +141,7 @@ files:
 - LICENSE.txt
 - Rakefile
 - VERSION
+- compile_protos.sh
 - lib/prefab-cloud-ruby.rb
 - lib/prefab/auth_interceptor.rb
 - lib/prefab/client.rb
@@ -153,7 +154,6 @@ files:
 - lib/prefab/store.rb
 - lib/prefab_pb.rb
 - lib/prefab_services_pb.rb
-- lib/ratelimit_pb.rb
 - prefab-cloud-ruby.gemspec
 homepage: http://github.com/prefab-cloud/prefab-cloud-ruby
 licenses:

data/lib/ratelimit_pb.rb

@@ -1,125 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: ratelimit.proto
-
-require 'google/protobuf'
-
-require 'google/protobuf/wrappers_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "it.ratelim.data.LimitResponse" do
-    optional :passed, :bool, 1
-    optional :expires_at, :int64, 2
-    optional :enforced_group, :string, 3
-    optional :current_bucket, :int64, 4
-    optional :policy_group, :string, 5
-    optional :policy_name, :enum, 6, "it.ratelim.data.LimitResponse.LimitPolicyNames"
-    optional :policy_limit, :int32, 7
-    optional :amount, :int64, 8
-    optional :limit_reset_at, :int64, 9
-    optional :safety_level, :enum, 10, "it.ratelim.data.LimitDefinition.SafetyLevel"
-  end
-  add_enum "it.ratelim.data.LimitResponse.LimitPolicyNames" do
-    value :NOT_SET, 0
-    value :SECONDLY_ROLLING, 1
-    value :MINUTELY_ROLLING, 3
-    value :HOURLY_ROLLING, 5
-    value :DAILY_ROLLING, 7
-    value :MONTHLY_ROLLING, 8
-    value :INFINITE, 9
-    value :YEARLY_ROLLING, 10
-  end
-  add_message "it.ratelim.data.LimitRequest" do
-    optional :account_id, :int64, 1
-    optional :acquire_amount, :int32, 2
-    repeated :groups, :string, 3
-    optional :limit_combiner, :enum, 4, "it.ratelim.data.LimitRequest.LimitCombiner"
-    optional :allow_partial_response, :bool, 5
-  end
-  add_enum "it.ratelim.data.LimitRequest.LimitCombiner" do
-    value :NOT_SET, 0
-    value :MINIMUM, 1
-    value :MAXIMUM, 2
-  end
-  add_message "it.ratelim.data.FeatureFlag" do
-    optional :account_id, :int64, 1
-    optional :feature, :string, 2
-    optional :pct, :double, 3
-    repeated :whitelisted, :string, 4
-    optional :prior_feature_name, :string, 5
-  end
-  add_message "it.ratelim.data.LimitDefinition" do
-    optional :group, :string, 1
-    optional :policy_name, :enum, 2, "it.ratelim.data.LimitResponse.LimitPolicyNames"
-    optional :limit, :int32, 3
-    optional :burst, :int32, 4
-    optional :account_id, :int64, 5
-    optional :last_modified, :int64, 6
-    optional :returnable, :bool, 7
-    optional :safety_level, :enum, 8, "it.ratelim.data.LimitDefinition.SafetyLevel"
-  end
-  add_enum "it.ratelim.data.LimitDefinition.SafetyLevel" do
-    value :NOT_SET, 0
-    value :L4_BEST_EFFORT, 4
-    value :L5_BOMBPROOF, 5
-  end
-  add_message "it.ratelim.data.LimitDefinitions" do
-    repeated :definitions, :message, 1, "it.ratelim.data.LimitDefinition"
-  end
-  add_message "it.ratelim.data.FeatureFlags" do
-    repeated :flags, :message, 1, "it.ratelim.data.FeatureFlag"
-    optional :cache_expiry, :int64, 2
-  end
-  add_message "it.ratelim.data.BucketWrite" do
-    optional :tokenBucket, :message, 1, "it.ratelim.data.TokenBucket"
-    optional :bucket, :string, 2
-  end
-  add_message "it.ratelim.data.TokenBucket" do
-    optional :current_value, :int64, 1
-    optional :time_key, :int64, 2
-    repeated :expiries, :int64, 3
-  end
-  add_message "it.ratelim.data.BufferedRequest" do
-    optional :account_id, :int64, 1
-    optional :method, :string, 2
-    optional :uri, :string, 3
-    optional :body, :string, 4
-    repeated :limit_groups, :string, 5
-    optional :content_type, :string, 6
-    optional :fifo, :bool, 7
-  end
-  add_message "it.ratelim.data.BatchRequest" do
-    optional :account_id, :int64, 1
-    optional :method, :string, 2
-    optional :uri, :string, 3
-    optional :body, :string, 4
-    repeated :limit_groups, :string, 5
-    optional :batch_template, :string, 6
-    optional :batch_separator, :string, 7
-  end
-  add_enum "it.ratelim.data.OnFailure" do
-    value :NOT_SET, 0
-    value :LOG_AND_PASS, 1
-    value :LOG_AND_FAIL, 2
-    value :THROW, 3
-  end
-end
-
-module It
-  module Ratelim
-    module Data
-      LimitResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.LimitResponse").msgclass
-      LimitResponse::LimitPolicyNames = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.LimitResponse.LimitPolicyNames").enummodule
-      LimitRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.LimitRequest").msgclass
-      LimitRequest::LimitCombiner = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.LimitRequest.LimitCombiner").enummodule
-      FeatureFlag = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.FeatureFlag").msgclass
-      LimitDefinition = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.LimitDefinition").msgclass
-      LimitDefinition::SafetyLevel = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.LimitDefinition.SafetyLevel").enummodule
-      LimitDefinitions = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.LimitDefinitions").msgclass
-      FeatureFlags = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.FeatureFlags").msgclass
-      BucketWrite = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.BucketWrite").msgclass
-      TokenBucket = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.TokenBucket").msgclass
-      BufferedRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.BufferedRequest").msgclass
-      BatchRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.BatchRequest").msgclass
-      OnFailure = Google::Protobuf::DescriptorPool.generated_pool.lookup("it.ratelim.data.OnFailure").enummodule
-    end
-  end
-end