prefab-cloud-ruby 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80a03ec9a75bc4c5d827c746354ff1353fe135a5ab6e31e9beaaf1ca1c27c931
-  data.tar.gz: d4c9f02e6bbb54d8d4884cc2d94179f39e859aafe3966188b1a00f7b7e5ccc48
+  metadata.gz: c18d5a31a2f535269b3faf262b82a57e67b75ceee5581c5ef6f8cea7bbdb416b
+  data.tar.gz: d7125da40abab76dc25e37459cdde3a891801dc4f630c3f3f2f22f7f65ef2f5d
 SHA512:
-  metadata.gz: 67f8b5ed6f61f01943736f9abbb685c9d7f7fd4c029ff3e051356f6e65936595f18899160fd842c415d86c371b0f9d915d795c6b9adafbdebeadd5b6fc6cc75b
-  data.tar.gz: c56dd76208ad8bbfd9d7add1bbc317a951671c2590cecf93389fbb5170aa9da13898bb3501e396450df2eaa93a67d7041b24fbdc2ca77f2a414056d0cbf471f9
+  metadata.gz: 38e1ad427078327f05b01b869d5f0879819271b372d8373996d5d592e3d4efa92bed6b59d061d92dc2a21eb49c6c529140ae9f9b5d8825fc2b828840d1b23a7f
+  data.tar.gz: 88cf63bf9dfdc9c103660240a5d2b35f27103eda55c28a96cb16943da41adf4ffa85928533fd739a868b3b5f5bb5ef565b80073f75712f3bb62305921694d1b2

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.10.0

data/lib/prefab/client.rb

@@ -8,7 +8,7 @@ module Prefab
     }
 
 
-    attr_reader :project_id, :shared_cache, :stats, :namespace, :interceptor, :api_key, :environment, :prefab_api_url
+    attr_reader :project_id, :shared_cache, :stats, :namespace, :interceptor, :api_key, :project_env_id, :prefab_api_url
 
     def initialize(api_key: ENV['PREFAB_API_KEY'],
                    logdev: nil,
@@ -27,13 +27,13 @@ module Prefab
       @shared_cache = (shared_cache || NoopCache.new)
       @api_key = api_key
       @project_id = api_key.split("-")[0].to_i
-      @environment = api_key.split("-")[1]
+      @project_env_id = api_key.split("-")[1].to_i
       @namespace = namespace
       @interceptor = Prefab::AuthInterceptor.new(api_key)
       @stubs = {}
       @prefab_api_url = ENV["PREFAB_API_URL"] || 'https://api.prefab.cloud'
       @prefab_grpc_url = ENV["PREFAB_GRPC_URL"] || 'grpc.prefab.cloud:443'
-      log_internal Logger::INFO, "Prefab Initializing in environment: '#{@environment}' and namespace: '#{@namespace}'"
+      log_internal Logger::INFO, "Prefab Initializing in environment: '#{@project_env_id}' and namespace: '#{@namespace}'"
       log_internal Logger::INFO, "Prefab Connecting to: #{@prefab_api_url} and #{@prefab_grpc_url} Secure: #{http_secure?}"
       at_exit do
         channel.destroy

data/lib/prefab/config_resolver.rb

@@ -6,7 +6,7 @@ module Prefab
     def initialize(base_client, config_loader)
       @lock = Concurrent::ReadWriteLock.new
       @local_store = {}
-      @environment = base_client.environment
+      @project_env_id = base_client.project_env_id
       @namespace = base_client.namespace
       @config_loader = config_loader
       make_local
@@ -16,8 +16,12 @@ module Prefab
       str = ""
       @lock.with_read_lock do
         @local_store.each do |k, v|
-          value = v[:value]
-          str << "|#{k}| from #{v[:match]} |#{value_of(value)}|#{value_of(value).class}\n"
+          if v.nil?
+            str<< "|#{k}| tombstone\n"
+          else
+            value = v[:value]
+            str << "|#{k}| from #{v[:match]} |#{value_of(value)}|#{value_of(value).class}\n"
+          end
         end
       end
       str
@@ -60,14 +64,14 @@ module Prefab
       store = {}
       @config_loader.calc_config.each do |key, config|
         sortable = config.rows.map do |row|
-          if !row.env_key.empty?
-            if row.env_key == @environment
+          if row.project_env_id != 0
+            if row.project_env_id == @project_env_id
               if !row.namespace.empty?
                 (starts_with, count) = starts_with_ns?(row.namespace, @namespace)
                 # rubocop:disable BlockNesting
                 { sortable: 2 + count, match: row.namespace, value: row.value, config: config} if starts_with
               else
-                { sortable: 1, match: row.env_key, value: row.value, config: config}
+                { sortable: 1, match: row.project_env_id, value: row.value, config: config}
               end
             end
           else

data/lib/prefab_pb.rb

@@ -8,7 +8,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_message "prefab.ConfigServicePointer" do
       optional :project_id, :int64, 1
       optional :start_at_id, :int64, 2
-      optional :env_key, :string, 3
+      optional :project_env_id, :int64, 3
     end
     add_message "prefab.ConfigValue" do
       oneof :type do
@@ -34,7 +34,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       repeated :variants, :message, 6, "prefab.FeatureFlagVariant"
     end
     add_message "prefab.ConfigRow" do
-      optional :env_key, :string, 1
+      optional :project_env_id, :int64, 1
       optional :namespace, :string, 2
       optional :value, :message, 3, "prefab.ConfigValue"
     end
@@ -173,6 +173,19 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :message, :string, 1
       optional :new_id, :int64, 2
     end
+    add_message "prefab.IdBlock" do
+      optional :project_id, :int64, 1
+      optional :project_env_id, :int64, 2
+      optional :sequence_name, :string, 3
+      optional :start, :int64, 4
+      optional :end, :int64, 5
+    end
+    add_message "prefab.IdBlockRequest" do
+      optional :project_id, :int64, 1
+      optional :project_env_id, :int64, 2
+      optional :sequence_name, :string, 3
+      optional :size, :int64, 4
+    end
     add_enum "prefab.OnFailure" do
       value :NOT_SET, 0
       value :LOG_AND_PASS, 1
@@ -209,5 +222,7 @@ module Prefab
   BatchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.BatchRequest").msgclass
   BasicResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.BasicResponse").msgclass
   CreationResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.CreationResponse").msgclass
+  IdBlock = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.IdBlock").msgclass
+  IdBlockRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.IdBlockRequest").msgclass
   OnFailure = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.OnFailure").enummodule
 end

data/lib/prefab_services_pb.rb

@@ -33,6 +33,20 @@ module Prefab
       rpc :Upsert, ::Prefab::Config, ::Prefab::CreationResponse
     end
 
+    Stub = Service.rpc_stub_class
+  end
+  module IdService
+    class Service
+
+      include ::GRPC::GenericService
+
+      self.marshal_class_method = :encode
+      self.unmarshal_class_method = :decode
+      self.service_name = 'prefab.IdService'
+
+      rpc :GetBlock, ::Prefab::IdBlockRequest, ::Prefab::IdBlock
+    end
+
     Stub = Service.rpc_stub_class
   end
 end

data/prefab-cloud-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 0.9.0 ruby lib
+# stub: prefab-cloud-ruby 0.10.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.9.0"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2022-03-18"
+  s.date = "2022-03-23"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [

data/test/harness_server.rb

@@ -15,28 +15,31 @@ class RackApp
 
     key = props["key"]
     namespace = props["namespace"]
-    environment = props["environment"]
+    project_env_id = props["project_env_id"]
     user_key = props["user_key"]
     is_feature_flag = !props["feature_flag"].nil?
 
     client = Prefab::Client.new(
-      api_key: "1-#{environment}-local_development_api_key-SDK", #sets environment
+      api_key: "1-#{project_env_id}-local_development_api_key-SDK", #sets environment
       namespace: namespace,
     )
 
     puts "Key #{key}"
     puts "User #{user_key}"
-    puts "Environment #{environment}"
+    puts "project_env_id #{project_env_id}"
     puts "Namespace #{namespace}"
     puts "Props! #{props}"
     puts "is_feature_flag! #{is_feature_flag}"
 
+    puts client.config_client.to_s
+
     if is_feature_flag
       puts "EVALFF #{key} #{user_key}"
       rtn = client.feature_flag_client.get(key, user_key, []).to_s
     else
       rtn = client.config_client.get(key).to_s
     end
+
     puts "return #{rtn}"
 
     [200, { "Content-Type" => "text/plain" }, rtn]

data/test/test_config_resolver.rb

@@ -2,6 +2,10 @@ require 'test_helper'
 
 class TestConfigResolver < Minitest::Test
 
+  STAGING_ENV_ID = 1
+  PRODUCTION_ENV_ID = 2
+  TEST_ENV_ID = 3
+
   def test_resolution
     @loader = MockConfigLoader.new
 
@@ -13,26 +17,26 @@ class TestConfigResolver < Minitest::Test
             value: Prefab::ConfigValue.new(string: "value_no_env_default"),
           ),
           Prefab::ConfigRow.new(
-            env_key: "test",
+            project_env_id: TEST_ENV_ID,
             value: Prefab::ConfigValue.new(string: "value_none"),
           ),
           Prefab::ConfigRow.new(
-            env_key: "test",
+            project_env_id: TEST_ENV_ID,
             namespace: "projectA",
             value: Prefab::ConfigValue.new(string: "valueA"),
           ),
           Prefab::ConfigRow.new(
-            env_key: "test",
+            project_env_id: TEST_ENV_ID,
             namespace: "projectB",
             value: Prefab::ConfigValue.new(string: "valueB"),
           ),
           Prefab::ConfigRow.new(
-            env_key: "test",
+            project_env_id: TEST_ENV_ID,
             namespace: "projectB.subprojectX",
             value: Prefab::ConfigValue.new(string: "projectB.subprojectX"),
           ),
           Prefab::ConfigRow.new(
-            env_key: "test",
+            project_env_id: TEST_ENV_ID,
             namespace: "projectB.subprojectY",
             value: Prefab::ConfigValue.new(string: "projectB.subprojectY"),
           ),
@@ -49,7 +53,7 @@ class TestConfigResolver < Minitest::Test
 
     @loader.stub :calc_config, loaded_values do
 
-      @resolverA = resolver_for_namespace("", @loader, environment: "some_other_env")
+      @resolverA = resolver_for_namespace("", @loader, project_env_id: PRODUCTION_ENV_ID)
       assert_equal "value_no_env_default", @resolverA.get("key")
 
       ## below here in the test env
@@ -100,6 +104,7 @@ class TestConfigResolver < Minitest::Test
   end
 
   def test_special_ff_variant_copying
+
     @loader = MockConfigLoader.new
     loaded_values = {
       "ff" => Prefab::Config.new(
@@ -114,7 +119,7 @@ class TestConfigResolver < Minitest::Test
             inactive_variant_idx: 0,
             default: Prefab::VariantDistribution.new(variant_idx: 1)
           )) },
-          { env_key: "test",
+          { project_env_id: TEST_ENV_ID,
             value: Prefab::ConfigValue.new(feature_flag: Prefab::FeatureFlag.new(
               inactive_variant_idx: 0,
               default: Prefab::VariantDistribution.new(variant_idx: 2)
@@ -183,8 +188,8 @@ class TestConfigResolver < Minitest::Test
     end
   end
 
-  def resolver_for_namespace(namespace, loader, environment: "test")
-    Prefab::ConfigResolver.new(MockBaseClient.new(namespace: namespace, environment: environment), loader)
+  def resolver_for_namespace(namespace, loader, project_env_id: TEST_ENV_ID)
+    Prefab::ConfigResolver.new(MockBaseClient.new(namespace: namespace, project_env_id: project_env_id), loader)
   end
 
 end

data/test/test_feature_flag_client.rb

@@ -135,7 +135,7 @@ class TestFeatureFlagClient < Minitest::Test
 
   def test_segments
     segment_key = "prefab-segment-beta-group"
-    @mock_base_client.mock_this_config(segment_key,
+    @mock_base_client.config_client.mock_this_config(segment_key,
                                        Prefab::Segment.new(
                                          name: "Beta Group",
                                          includes: ["user:1"]
@@ -170,7 +170,7 @@ class TestFeatureFlagClient < Minitest::Test
 
   def test_in_multiple_segments_has_or_behavior
     segment_key_one = "prefab-segment-segment-1"
-    @mock_base_client.mock_this_config(segment_key_one,
+    @mock_base_client.config_client.mock_this_config(segment_key_one,
                                        Prefab::Segment.new(
                                          name: "Segment-1",
                                          includes: ["user:1", "user:2"],
@@ -178,7 +178,7 @@ class TestFeatureFlagClient < Minitest::Test
                                        )
     )
     segment_key_two = "prefab-segment-segment-2"
-    @mock_base_client.mock_this_config(segment_key_two,
+    @mock_base_client.config_client.mock_this_config(segment_key_two,
                                        Prefab::Segment.new(
                                          name: "Segment-2",
                                          includes: ["user:3", "user:4"],

data/test/test_helper.rb

@@ -2,33 +2,49 @@ require 'minitest/autorun'
 require 'prefab-cloud-ruby'
 
 class MockBaseClient
-  attr_reader :namespace, :logger, :environment
+  STAGING_ENV_ID = 1
+  PRODUCTION_ENV_ID = 2
+  TEST_ENV_ID = 3
+  attr_reader :namespace, :logger, :project_env_id, :config_client
 
-  def initialize(environment: "test", namespace: "")
-    @environment = environment
+  def initialize(project_env_id: TEST_ENV_ID, namespace: "")
+    @project_env_id = project_env_id
     @namespace = namespace
     @logger = Logger.new($stdout)
-    @config_values = {}
+    @config_client = MockConfigClient.new
   end
 
   def project_id
     1
   end
 
+  def project_env_id
+    @project_env_id
+  end
+
   def log_internal level, message
   end
 
-  def mock_this_config key, config_value
-    @config_values[key] = config_value
+  def config_value key
+    @config_values[key]
   end
 
+end
+
+class MockConfigClient
+  def initialize(config_values = {})
+    @config_values = config_values
+  end
   def get(key)
     @config_values[key]
   end
 
   def get_config(key)
-    puts "HELLOOOO"
-    @config_values[key]
+    Prefab::Config.new(value: @config_values[key], key: key)
+  end
+
+  def mock_this_config key, config_value
+    @config_values[key] = config_value
   end
 end
 

data/test/test_logger.rb

@@ -39,13 +39,3 @@ class TestCLogger < Minitest::Test
                  @logger.level_of("app.models.user")
   end
 end
-
-class MockConfigClient
-  def initialize(hash)
-    @hash = hash
-  end
-
-  def get(key)
-    @hash[key]
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby