prefab-cloud-ruby 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba7ffe3b2a36411bb03bf96ba0c00d7155cd8d9281ebb6b8ee7463d05f8c3e86
-  data.tar.gz: 4b2a90345f8383fecc38ec50399b3ddb59c08adf7a480e3de4a50c05e029b85f
+  metadata.gz: 99c0376c6062b2d2ae5c51c5f5cfd15841255e706946e01558cb0dde9e7a4672
+  data.tar.gz: 699a13518c92d9c8fcc4f45b8c501b4d96836c49353c762fb50f7f4410546287
 SHA512:
-  metadata.gz: a4600a4dd4016ffa2041489776a748fc8cd2678401a0039e1f321b3e6a3ff83492cb78224503ff0feb35ad93762ee2078d0cd3c0788590b668ad317b4b597b5b
-  data.tar.gz: c203ac482b994da015cb49114dafd795f9b8795d5308ad45beb9c81004a09da7706e36d9fb65f2c351477f08dcf652f4e4c75444edc5914cbb4c21894eb7b830
+  metadata.gz: c598fd1f773d2a846b78b06375e10b19053685a7b0a42fc1324a7e129ec27d5ab5494b795ceed32856144e58395f7414ae6540ff704ef1cb137f07f62ab5cfde
+  data.tar.gz: 4d576e90e3823359b81211b70f70b566c5fe1489314733d0ebd0ed6b9af966299111d79f1eb38a5ce019153ff9241e3d5f86440031b30aace7187c7c63194c56

data/.github/workflows/ruby.yml

@@ -41,3 +41,6 @@ jobs:
       run: bundle exec rake
       env:
         PREFAB_INTEGRATION_TEST_API_KEY: ${{ secrets.PREFAB_INTEGRATION_TEST_API_KEY }}
+        PREFAB_INTEGRATION_TEST_ENCRYPTION_KEY: ${{ secrets.PREFAB_INTEGRATION_TEST_ENCRYPTION_KEY }}
+        NOT_A_NUMBER: "abcd"
+        IS_A_NUMBER: "1234"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.4.5 - 2024-01-31
+
+- Refactor out a `should_log?` method (#170)
+
+## 1.4.4 - 2024-01-26
+
+- Raise when ENV var is missing
+
 ## 1.4.3 - 2024-01-17
 
 - Updated proto definition file

data/VERSION

@@ -1 +1 @@
-1.4.3
+1.4.5

data/lib/prefab/config_value_unwrapper.rb

@@ -68,8 +68,7 @@ module Prefab
         if :ENV_VAR == config_value.provided.source
           raw = ENV[config_value.provided.lookup]
           if raw.nil?
-            LOG.warn "ENV Variable #{config_value.provided.lookup} not found. Using empty string."
-            new(Prefab::ConfigValueWrapper.wrap(""), resolver)
+            raise Prefab::Errors::MissingEnvVarError.new("Missing environment variable #{config_value.provided.lookup}")
           else
             coerced = coerce_into_type(raw, config, config_value.provided.lookup)
             new(Prefab::ConfigValueWrapper.wrap(coerced, confidential: config_value.confidential), resolver)

data/lib/prefab/errors/missing_env_var_error.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Prefab
+  module Errors
+    class MissingEnvVarError < Prefab::Error
+      def initialize(message)
+        super(message)
+      end
+    end
+  end
+end

data/lib/prefab/logger_client.rb

@@ -75,9 +75,9 @@ module Prefab
 
     def log(message, path, progname, severity, log_context = {})
       severity ||= ::Logger::UNKNOWN
-      @log_path_aggregator&.push(path, severity)
 
-      return true if @logdev.nil? || severity < level_of(path) || @silences[local_log_id]
+      return true if !should_log? severity, path
+      return true if @logdev.nil? || @silences[local_log_id]
 
       progname = @progname if progname.nil?
 
@@ -96,6 +96,11 @@ module Prefab
       true
     end
 
+    def should_log?(severity, path)
+      @log_path_aggregator&.push(path, severity)
+      severity >= level_of(path)
+    end
+
     def debug(progname = nil, **log_context, &block)
       add_internal(DEBUG, nil, progname, caller_locations(1, 1)[0], log_context, &block)
     end

data/lib/prefab/resolved_config_presenter.rb

@@ -65,7 +65,11 @@ module Prefab
             if v.nil?
               elements << 'tombstone'
             else
-              value = @resolver.evaluate(v[:config])&.reportable_value
+              value = begin
+                @resolver.evaluate(v[:config])&.reportable_value
+              rescue StandardError => e
+                "ERROR EVALUATING: #{e.class} #{e.message}"
+              end
               elements << value.to_s.slice(0..34).ljust(35)
               elements << value.class.to_s.slice(0..6).ljust(7)
               elements << "Match: #{v[:match]}".slice(0..29).ljust(30)

data/lib/prefab-cloud-ruby.rb

@@ -20,6 +20,7 @@ require 'prefab/errors/initialization_timeout_error'
 require 'prefab/errors/invalid_api_key_error'
 require 'prefab/errors/missing_default_error'
 require 'prefab/errors/env_var_parse_error'
+require 'prefab/errors/missing_env_var_error'
 require 'prefab/errors/uninitialized_error'
 require 'prefab/options'
 require 'prefab/static_logger'

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 1.4.3 ruby lib
+# stub: prefab-cloud-ruby 1.4.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "1.4.3"
+  s.version = "1.4.5"
 
   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 = "2024-01-17"
+  s.date = "2024-01-31"
   s.description = "Feature Flags, Live Config, and Dynamic Log Levels as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["console".freeze]
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
     "lib/prefab/errors/initialization_timeout_error.rb",
     "lib/prefab/errors/invalid_api_key_error.rb",
     "lib/prefab/errors/missing_default_error.rb",
+    "lib/prefab/errors/missing_env_var_error.rb",
     "lib/prefab/errors/uninitialized_error.rb",
     "lib/prefab/evaluation.rb",
     "lib/prefab/evaluation_summary_aggregator.rb",

data/test/integration_test.rb

@@ -9,7 +9,7 @@ class IntegrationTest
     @input = parse_input(test_data['input'])
     @expected = parse_expected(test_data['expected'])
     @data = test_data['data']
-    @expected_data = test_data['expected_data']
+    @expected_data = test_data['expected_data'] || []
     @aggregator = test_data['aggregator']
     @endpoint = test_data['endpoint']
     @test_client = capture_telemetry(base_client)
@@ -96,6 +96,13 @@ class IntegrationTest
     case error_type
     when 'missing_default' then Prefab::Errors::MissingDefaultError
     when 'initialization_timeout' then Prefab::Errors::InitializationTimeoutError
+    when 'unable_to_decrypt' then OpenSSL::Cipher::CipherError
+    when 'missing_env_var' then Prefab::Errors::MissingEnvVarError
+    when 'unable_to_coerce_env_var' then Prefab::Errors::EnvVarParseError
+    else
+      unless error_type.nil?
+        throw "Unknown error type: #{error_type}"
+      end
     end
   end
 

data/test/integration_test_helpers.rb

@@ -34,14 +34,16 @@ module IntegrationTestHelpers
     end
   end
 
+  SEVERITY_LOOKUP = Prefab::LogPathAggregator::SEVERITY_KEY.invert
+
   def self.prepare_post_data(it)
     case it.aggregator
     when "log_path"
       aggregator = it.test_client.log_path_aggregator
 
-      it.data.each do |(path, data)|
-        data.each_with_index do |count, severity|
-          count.times { aggregator.push(path, severity) }
+      it.data.each do |data|
+        data['counts'].each_pair do |severity, count|
+          count.times { aggregator.push(data['logger_name'], SEVERITY_LOOKUP[severity]) }
         end
       end
 
@@ -113,23 +115,23 @@ module IntegrationTestHelpers
     when "example_contexts"
       aggregator = it.test_client.example_contexts_aggregator
 
-      it.data.each do |hash|
-        aggregator.record(Prefab::Context.new(hash))
+      it.data.each do |key, values|
+        aggregator.record(Prefab::Context.new({ key => values }))
       end
 
       expected_data = []
-      it.expected_data.each do |data|
+      it.expected_data.each do |k, vs|
         expected_data << PrefabProto::ExampleContext.new(
           timestamp: 0,
           contextSet: PrefabProto::ContextSet.new(
-            contexts: data.map do |(k, vs)|
+            contexts: [
               PrefabProto::Context.new(
                 type: k,
-                values: vs.map do |v|
-                  [v["key"], PrefabProto::ConfigValue.new(v["value_type"] => v["value"])]
+                values: vs.each_pair.map do |key, value|
+                  [key, Prefab::ConfigValueWrapper.wrap(value)]
                 end.to_h
               )
-            end
+            ]
           )
         )
       end

data/test/test_config_value_unwrapper.rb

@@ -154,7 +154,9 @@ class TestConfigValueUnwrapper < Minitest::Test
       lookup: "NON_EXISTENT_ENV_VAR_NAME"
     )
     config_value = PrefabProto::ConfigValue.new(provided: value)
-    assert_equal '', unwrap(config_value, CONFIG, EMPTY_CONTEXT)
+    assert_raises(Prefab::Errors::MissingEnvVarError) do
+      unwrap(config_value, CONFIG, EMPTY_CONTEXT)
+    end
   end
 
   def test_unwrapping_encrypted_values_decrypts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -241,6 +241,7 @@ files:
 - lib/prefab/errors/initialization_timeout_error.rb
 - lib/prefab/errors/invalid_api_key_error.rb
 - lib/prefab/errors/missing_default_error.rb
+- lib/prefab/errors/missing_env_var_error.rb
 - lib/prefab/errors/uninitialized_error.rb
 - lib/prefab/evaluation.rb
 - lib/prefab/evaluation_summary_aggregator.rb