prefab-cloud-ruby 0.8.0 → 0.11.0

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
@@ -22,28 +22,22 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
         optional :segment, :message, 8, "prefab.Segment"
       end
     end
-    add_message "prefab.NamespaceValue" do
-      optional :namespace, :string, 1
-      optional :config_value, :message, 2, "prefab.ConfigValue"
+    add_message "prefab.Configs" do
+      repeated :configs, :message, 1, "prefab.Config"
+      optional :config_service_pointer, :message, 2, "prefab.ConfigServicePointer"
     end
-    add_message "prefab.EnvironmentValues" do
-      optional :environment, :string, 1
-      repeated :namespace_values, :message, 2, "prefab.NamespaceValue"
-      optional :default, :message, 3, "prefab.ConfigValue"
-    end
-    add_message "prefab.ConfigDelta" do
+    add_message "prefab.Config" do
       optional :id, :int64, 1
-      optional :key, :string, 2
-      optional :default, :message, 3, "prefab.ConfigValue"
-      repeated :envs, :message, 4, "prefab.EnvironmentValues"
-    end
-    add_message "prefab.ConfigDeltas" do
-      repeated :deltas, :message, 1, "prefab.ConfigDelta"
-    end
-    add_message "prefab.UpsertRequest" do
-      optional :project_id, :int64, 1
-      optional :config_delta, :message, 2, "prefab.ConfigDelta"
+      optional :project_id, :int64, 2
+      optional :key, :string, 3
       optional :changed_by, :string, 4
+      repeated :rows, :message, 5, "prefab.ConfigRow"
+      repeated :variants, :message, 6, "prefab.FeatureFlagVariant"
+    end
+    add_message "prefab.ConfigRow" do
+      optional :project_env_id, :int64, 1
+      optional :namespace, :string, 2
+      optional :value, :message, 3, "prefab.ConfigValue"
     end
     add_message "prefab.LimitResponse" do
       optional :passed, :bool, 1
@@ -97,15 +91,19 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     end
     add_enum "prefab.Criteria.CriteriaOperator" do
       value :NOT_SET, 0
-      value :IN, 1
-      value :NOT_IN, 2
-      value :EQ, 3
-      value :IN_SEG, 4
-      value :NOT_IN_SEG, 5
+      value :LOOKUP_KEY_IN, 1
+      value :LOOKUP_KEY_NOT_IN, 2
+      value :IN_SEG, 3
+      value :NOT_IN_SEG, 4
+      value :ALWAYS_TRUE, 5
+      value :PROP_IS_ONE_OF, 6
+      value :PROP_IS_NOT_ONE_OF, 7
+      value :PROP_ENDS_WITH_ONE_OF, 8
+      value :PROP_DOES_NOT_END_WITH_ONE_OF, 9
     end
     add_message "prefab.Rule" do
       optional :criteria, :message, 1, "prefab.Criteria"
-      optional :distribution, :message, 2, "prefab.VariantDistribution"
+      repeated :variant_weights, :message, 2, "prefab.VariantWeight"
     end
     add_message "prefab.Segment" do
       optional :name, :string, 1
@@ -122,22 +120,11 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :weight, :int32, 1
       optional :variant_idx, :int32, 2
     end
-    add_message "prefab.VariantWeights" do
-      repeated :weights, :message, 1, "prefab.VariantWeight"
-    end
-    add_message "prefab.VariantDistribution" do
-      oneof :type do
-        optional :variant_idx, :int32, 1
-        optional :variant_weights, :message, 2, "prefab.VariantWeights"
-      end
-    end
     add_message "prefab.FeatureFlag" do
       optional :active, :bool, 1
       optional :inactive_variant_idx, :int32, 2
-      optional :default, :message, 3, "prefab.VariantDistribution"
       repeated :user_targets, :message, 4, "prefab.UserTarget"
       repeated :rules, :message, 5, "prefab.Rule"
-      repeated :variants, :message, 6, "prefab.FeatureFlagVariant"
     end
     add_message "prefab.LimitDefinition" do
       optional :policy_name, :enum, 2, "prefab.LimitResponse.LimitPolicyNames"
@@ -177,6 +164,23 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_message "prefab.BasicResponse" do
       optional :message, :string, 1
     end
+    add_message "prefab.CreationResponse" 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
@@ -189,11 +193,9 @@ end
 module Prefab
   ConfigServicePointer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigServicePointer").msgclass
   ConfigValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigValue").msgclass
-  NamespaceValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.NamespaceValue").msgclass
-  EnvironmentValues = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.EnvironmentValues").msgclass
-  ConfigDelta = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigDelta").msgclass
-  ConfigDeltas = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigDeltas").msgclass
-  UpsertRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.UpsertRequest").msgclass
+  Configs = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.Configs").msgclass
+  Config = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.Config").msgclass
+  ConfigRow = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.ConfigRow").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
@@ -205,8 +207,6 @@ module Prefab
   Segment = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.Segment").msgclass
   UserTarget = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.UserTarget").msgclass
   VariantWeight = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.VariantWeight").msgclass
-  VariantWeights = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.VariantWeights").msgclass
-  VariantDistribution = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.VariantDistribution").msgclass
   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
@@ -214,5 +214,8 @@ module Prefab
   BufferedRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("prefab.BufferedRequest").msgclass
   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

@@ -28,9 +28,23 @@ module Prefab
       self.unmarshal_class_method = :decode
       self.service_name = 'prefab.ConfigService'
 
-      rpc :GetConfig, ::Prefab::ConfigServicePointer, stream(::Prefab::ConfigDeltas)
-      rpc :GetAllConfig, ::Prefab::ConfigServicePointer, ::Prefab::ConfigDeltas
-      rpc :Upsert, ::Prefab::UpsertRequest, ::Prefab::ConfigServicePointer
+      rpc :GetConfig, ::Prefab::ConfigServicePointer, stream(::Prefab::Configs)
+      rpc :GetAllConfig, ::Prefab::ConfigServicePointer, ::Prefab::Configs
+      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

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.8.0 ruby lib
+# stub: prefab-cloud-ruby 0.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.8.0"
+  s.version = "0.11.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-02-24"
+  s.date = "2022-05-05"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
   if s.respond_to? :add_runtime_dependency then
     s.add_runtime_dependency(%q<concurrent-ruby>.freeze, ["~> 1.0", ">= 1.0.5"])
     s.add_runtime_dependency(%q<faraday>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<ld-eventsource>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<grpc>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<google-protobuf>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<googleapis-common-protos-types>.freeze, [">= 0"])
@@ -80,6 +81,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<concurrent-ruby>.freeze, ["~> 1.0", ">= 1.0.5"])
     s.add_dependency(%q<faraday>.freeze, [">= 0"])
+    s.add_dependency(%q<ld-eventsource>.freeze, [">= 0"])
     s.add_dependency(%q<grpc>.freeze, [">= 0"])
     s.add_dependency(%q<google-protobuf>.freeze, [">= 0"])
     s.add_dependency(%q<googleapis-common-protos-types>.freeze, [">= 0"])

data/run_test_harness_server.sh

@@ -1,2 +1,2 @@
-PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL=debug PREFAB_CLOUD_HTTP=true PREFAB_API_KEY="1|local_development_api_key" PREFAB_API_URL="localhost:50051" ruby -Ilib test/harness_server.rb
+PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL=debug PREFAB_CLOUD_HTTP=true PREFAB_GRPC_URL="localhost:50051" ruby -Ilib test/harness_server.rb
 #GRPC_TRACE=all GRPC_VERBOSITY=DEBUG PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL=debug PREFAB_CLOUD_HTTP=true PREFAB_API_KEY="1|local_development_api_key" PREFAB_API_URL="localhost:50051" ruby -Ilib test/harness_server.rb

data/test/harness_server.rb

@@ -15,31 +15,39 @@ class RackApp
 
     key = props["key"]
     namespace = props["namespace"]
-    environment = props["environment"]
+    api_key = props["api_key"]
     user_key = props["user_key"]
     is_feature_flag = !props["feature_flag"].nil?
-
+    puts props
     client = Prefab::Client.new(
-      api_key: "1-#{environment}-local_development_api_key", #sets environment
+      api_key: api_key,
       namespace: namespace,
     )
 
     puts "Key #{key}"
     puts "User #{user_key}"
-    puts "Environment #{environment}"
+    puts "api_key #{api_key}"
     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]
+
+    rescue Exception => e
+      puts "ERROR #{e.message}"
+      puts e.backtrace
+      [500, { "Content-Type" => "text/plain" }, e.message]
   end
 end
 

data/test/test_config_loader.rb

@@ -16,26 +16,26 @@ class TestConfigLoader < Minitest::Test
 
   def test_highwater
     assert_equal 0, @loader.highwater_mark
-    @loader.set(Prefab::ConfigDelta.new(id: 1, key: "sample_int", default: Prefab::ConfigValue.new(int: 456)))
+    @loader.set(Prefab::Config.new(id: 1, key: "sample_int", rows: [Prefab::ConfigRow.new(value: Prefab::ConfigValue.new(int: 456))]))
     assert_equal 1, @loader.highwater_mark
 
-    @loader.set(Prefab::ConfigDelta.new(id: 5, key: "sample_int", default: Prefab::ConfigValue.new(int: 456)))
+    @loader.set(Prefab::Config.new(id: 5, key: "sample_int", rows: [Prefab::ConfigRow.new(value: Prefab::ConfigValue.new(int: 456))]))
     assert_equal 5, @loader.highwater_mark
-    @loader.set(Prefab::ConfigDelta.new(id: 2, key: "sample_int", default: Prefab::ConfigValue.new(int: 456)))
+    @loader.set(Prefab::Config.new(id: 2, key: "sample_int", rows: [Prefab::ConfigRow.new(value: Prefab::ConfigValue.new(int: 456))]))
     assert_equal 5, @loader.highwater_mark
   end
 
   def test_keeps_most_recent
     assert_equal 0, @loader.highwater_mark
-    @loader.set(Prefab::ConfigDelta.new(id: 1, key: "sample_int", default: Prefab::ConfigValue.new(int: 1)))
+    @loader.set(Prefab::Config.new(id: 1, key: "sample_int", rows: [Prefab::ConfigRow.new(value: Prefab::ConfigValue.new(int: 1))]))
     assert_equal 1, @loader.highwater_mark
     should_be :int, 1, "sample_int"
 
-    @loader.set(Prefab::ConfigDelta.new(id: 4, key: "sample_int", default: Prefab::ConfigValue.new(int: 4)))
+    @loader.set(Prefab::Config.new(id: 4, key: "sample_int", rows: [Prefab::ConfigRow.new(value: Prefab::ConfigValue.new(int: 4))]))
     assert_equal 4, @loader.highwater_mark
     should_be :int, 4, "sample_int"
 
-    @loader.set(Prefab::ConfigDelta.new(id: 2, key: "sample_int", default: Prefab::ConfigValue.new(int: 2)))
+    @loader.set(Prefab::Config.new(id: 2, key: "sample_int", rows: [Prefab::ConfigRow.new(value: Prefab::ConfigValue.new(int: 2))]))
     assert_equal 4, @loader.highwater_mark
     should_be :int, 4, "sample_int"
   end
@@ -43,37 +43,37 @@ class TestConfigLoader < Minitest::Test
   def test_api_precedence
     should_be :int, 123, "sample_int"
 
-    @loader.set(Prefab::ConfigDelta.new(key: "sample_int", default: Prefab::ConfigValue.new(int: 456)))
+    @loader.set(Prefab::Config.new(key: "sample_int", rows: [Prefab::ConfigRow.new(value: Prefab::ConfigValue.new(int: 456))]))
     should_be :int, 456, "sample_int"
   end
 
   def test_api_deltas
     val = Prefab::ConfigValue.new(int: 456)
-    delta = Prefab::ConfigDelta.new(key: "sample_int", default: val)
-    @loader.set(delta)
+    config = Prefab::Config.new(key: "sample_int", rows: [Prefab::ConfigRow.new(value: val)])
+    @loader.set(config)
 
-    deltas = Prefab::ConfigDeltas.new
-    deltas.deltas << delta
-    assert_equal deltas, @loader.get_api_deltas
+    configs = Prefab::Configs.new
+    configs.configs << config
+    assert_equal configs, @loader.get_api_deltas
   end
 
   def test_loading_tombstones_removes_entries
     val = Prefab::ConfigValue.new(int: 456)
-    delta = Prefab::ConfigDelta.new(key: "sample_int", default: val)
-    @loader.set(delta)
+    config = Prefab::Config.new(key: "sample_int", rows: [Prefab::ConfigRow.new(value: val)])
+    @loader.set(config)
 
-    delta = Prefab::ConfigDelta.new(key: "sample_int", default: nil)
-    @loader.set(delta)
+    config = Prefab::Config.new(key: "sample_int", rows: [])
+    @loader.set(config)
 
-    deltas = Prefab::ConfigDeltas.new
-    assert_equal deltas, @loader.get_api_deltas
+    configs = Prefab::Configs.new
+    assert_equal configs, @loader.get_api_deltas
   end
 
   private
 
   def should_be(type, value, key)
-    assert_equal type, @loader.calc_config[key].default.type
-    assert_equal value, @loader.calc_config[key].default.send(type)
+    assert_equal type, @loader.calc_config[key].rows[0].value.type
+    assert_equal value, @loader.calc_config[key].rows[0].value.send(type)
   end
 
 end

data/test/test_config_resolver.rb

@@ -2,45 +2,58 @@ 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
 
     loaded_values = {
-      "key" => Prefab::ConfigDelta.new(
+      "key" => Prefab::Config.new(
         key: "key",
-        default: Prefab::ConfigValue.new(string: "value_no_env_default"),
-        envs: [{
-                 environment: "test",
-                 default: Prefab::ConfigValue.new(string: "value_none"),
-                 namespace_values: [
-                   {
-                     namespace: "projectA",
-                     config_value: Prefab::ConfigValue.new(string: "valueA")
-                   },
-                   {
-                     namespace: "projectB",
-                     config_value: Prefab::ConfigValue.new(string: "valueB")
-                   },
-                   {
-                     namespace: "projectB.subprojectX",
-                     config_value: Prefab::ConfigValue.new(string: "projectB.subprojectX")
-                   },
-                   {
-                     namespace: "projectB.subprojectY",
-                     config_value: Prefab::ConfigValue.new(string: "projectB.subprojectY")
-                   },
-                 ]
-               }]
+        rows: [
+          Prefab::ConfigRow.new(
+            value: Prefab::ConfigValue.new(string: "value_no_env_default"),
+          ),
+          Prefab::ConfigRow.new(
+            project_env_id: TEST_ENV_ID,
+            value: Prefab::ConfigValue.new(string: "value_none"),
+          ),
+          Prefab::ConfigRow.new(
+            project_env_id: TEST_ENV_ID,
+            namespace: "projectA",
+            value: Prefab::ConfigValue.new(string: "valueA"),
+          ),
+          Prefab::ConfigRow.new(
+            project_env_id: TEST_ENV_ID,
+            namespace: "projectB",
+            value: Prefab::ConfigValue.new(string: "valueB"),
+          ),
+          Prefab::ConfigRow.new(
+            project_env_id: TEST_ENV_ID,
+            namespace: "projectB.subprojectX",
+            value: Prefab::ConfigValue.new(string: "projectB.subprojectX"),
+          ),
+          Prefab::ConfigRow.new(
+            project_env_id: TEST_ENV_ID,
+            namespace: "projectB.subprojectY",
+            value: Prefab::ConfigValue.new(string: "projectB.subprojectY"),
+          ),
+
+        ]
       ),
-      "key2" => Prefab::ConfigDelta.new(
+      "key2" => Prefab::Config.new(
         key: "key2",
-        default: Prefab::ConfigValue.new(string: "valueB2"),
+        rows: [
+          value: Prefab::ConfigValue.new(string: "valueB2"),
+        ]
       )
     }
 
     @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
@@ -91,34 +104,34 @@ class TestConfigResolver < Minitest::Test
   end
 
   def test_special_ff_variant_copying
+
     @loader = MockConfigLoader.new
     loaded_values = {
-      "ff" => Prefab::ConfigDelta.new(
+      "ff" => Prefab::Config.new(
         key: "ff",
-        default: Prefab::ConfigValue.new(feature_flag: Prefab::FeatureFlag.new(
-          variants: [
-            Prefab::FeatureFlagVariant.new(string: "inactive"),
-            Prefab::FeatureFlagVariant.new(string: "default"),
-            Prefab::FeatureFlagVariant.new(string: "env"),
-          ],
-          inactive_variant_idx: 0,
-          default: Prefab::VariantDistribution.new(variant_idx: 1)
-        )),
-        envs: [
-          Prefab::EnvironmentValues.new(
-            environment: "test",
-            default: Prefab::ConfigValue.new(feature_flag: Prefab::FeatureFlag.new(
+        variants: [
+          Prefab::FeatureFlagVariant.new(string: "inactive"),
+          Prefab::FeatureFlagVariant.new(string: "default"),
+          Prefab::FeatureFlagVariant.new(string: "env"),
+        ],
+        rows: [
+          { value: Prefab::ConfigValue.new(feature_flag: Prefab::FeatureFlag.new(
+            inactive_variant_idx: 0,
+            rules: default_ff_rule(1),
+          )) },
+          { 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)))
-          )
+              rules: default_ff_rule(2),
+            )) }
         ]
       )
     }
     @loader.stub :calc_config, loaded_values do
       resolver = Prefab::ConfigResolver.new(MockBaseClient.new, @loader)
-      ff = resolver.get("ff")
-      assert_equal 3, ff.variants.size
-      assert_equal %w(inactive default env), ff.variants.map(&:string)
+      config = resolver.get_config("ff")
+      assert_equal 3, config.variants.size
+      assert_equal %w(inactive default env), config.variants.map(&:string)
     end
   end
 
@@ -127,13 +140,17 @@ class TestConfigResolver < Minitest::Test
     @loader = MockConfigLoader.new
 
     loaded_values = {
-      "Key:With:Colons" => Prefab::ConfigDelta.new(
+      "Key:With:Colons" => Prefab::Config.new(
         key: "Key:With:Colons",
-        default: Prefab::ConfigValue.new(string: "value"),
+        rows: [Prefab::ConfigRow.new(
+          value: Prefab::ConfigValue.new(string: "value")
+        )]
       ),
-      "proj:apikey" => Prefab::ConfigDelta.new(
+      "proj:apikey" => Prefab::Config.new(
         key: "proj:apikey",
-        default: Prefab::ConfigValue.new(string: "v2"),
+        rows: [Prefab::ConfigRow.new(
+          value: Prefab::ConfigValue.new(string: "v2")
+        )]
       )
     }
 
@@ -171,8 +188,11 @@ 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)
+    resolver = Prefab::ConfigResolver.new(MockBaseClient.new(namespace: namespace), loader)
+    resolver.project_env_id = project_env_id
+    resolver.update
+    resolver
   end
 
 end