fixed validator and added tests

Author: chillaq

lib/splitclient-rb/split_config.rb

@@ -712,15 +712,16 @@ def self.sanitize_fallback_config(fallback_config, validator, logger)
       end
 
       sanitized_global_fallback_treatment = fallback_config.global_fallback_treatment
-      if !fallback_config.global_fallback_treatment.nil? && !validator.validate_fallback_treatment(fallback_config.global_fallback_treatment)
+      if !fallback_config.global_fallback_treatment.nil? && !validator.validate_fallback_treatment('Config', fallback_config.global_fallback_treatment)
         logger.warn('Config: global fallbacktreatment parameter is discarded.')
-        sanitized_global_fallback_treatment = None
+        sanitized_global_fallback_treatment = nil
       end
 
-      sanitized_flag_fallback_treatments = Hash.new
+      sanitized_flag_fallback_treatments = nil
       if !fallback_config.by_flag_fallback_treatment.nil? && fallback_config.by_flag_fallback_treatment.is_a?(Hash)
+        sanitized_flag_fallback_treatments = Hash.new
         for feature_name in fallback_config.by_flag_fallback_treatment.keys()
-          if !validator.valid_split_name?('Config', feature_name) || !validator.validate_fallback_treatment(fallback_config.by_flag_fallback_treatment[feature_name])
+          if !validator.valid_split_name?('Config', feature_name) || !validator.validate_fallback_treatment('Config', fallback_config.by_flag_fallback_treatment[feature_name])
             logger.warn("Config: fallback treatment parameter for feature flag #{feature_name} is discarded.")
             next
           end   

lib/splitclient-rb/validators.rb

@@ -70,7 +70,7 @@ def valid_flag_sets(method, flag_sets)
           log_invalid_flag_set_type(method)
         elsif flag_set.is_a?(String) && flag_set.empty?
           log_invalid_flag_set_type(method)
-        elsif !flag_set.empty? && string_match?(flag_set.strip.downcase, method, Flagset_regex, log_invalid_match)
+        elsif !flag_set.empty? && string_match?(flag_set.strip.downcase, method, Flagset_regex, :log_invalid_match)
           valid_flag_sets.add(flag_set.strip.downcase)
         else
           log_invalid_flag_set_type(method)
@@ -79,6 +79,46 @@ def valid_flag_sets(method, flag_sets)
       !valid_flag_sets.empty? ? valid_flag_sets.to_a.sort :  []
     end
 
+    def validate_fallback_treatment(method, fallback_treatment)
+      if !fallback_treatment.is_a? Engine::Models::FallbackTreatment
+          @config.logger.warn("#{method}: Fallback treatment instance should be FallbackTreatment, input is discarded")
+          return false
+      end
+
+      if !fallback_treatment.treatment.is_a? String
+          @config.logger.warn("#{method}: Fallback treatment value should be str type, input is discarded")
+          return false
+      end    
+
+      return false unless string_match?(fallback_treatment.treatment, method, Fallback_treatment_regex, :log_invalid_fallback_treatment)
+
+      if fallback_treatment.treatment.size > Fallback_treatment_size
+          @config.logger.warn("#{method}: Fallback treatment size should not exceed #{Fallback_treatment_size} characters")
+          return false
+      end
+      
+      true
+    end
+
+    def valid_split_name?(method, split_name)
+      if split_name.nil?
+        log_nil(:split_name, method)
+        return false
+      end
+
+      unless string?(split_name)
+        log_invalid_type(:split_name, method)
+        return false
+      end
+
+      if empty_string?(split_name)
+        log_empty_string(:split_name, method)
+        return false
+      end
+
+      true
+    end
+
     private
 
     def string?(value)
@@ -95,7 +135,7 @@ def number_or_string?(value)
 
     def string_match?(value, method, regex_exp, log_if_invalid)
       if regex_exp.match(value) == nil
-        log_if_invalid(value, method)
+        method(log_if_invalid).call(value, method)
         false
       else
         true
@@ -134,25 +174,6 @@ def log_key_too_long(key, method)
       @config.logger.error("#{method}: #{key} is too long - must be #{@config.max_key_size} characters or less")
     end
 
-    def valid_split_name?(method, split_name)
-      if split_name.nil?
-        log_nil(:split_name, method)
-        return false
-      end
-
-      unless string?(split_name)
-        log_invalid_type(:split_name, method)
-        return false
-      end
-
-      if empty_string?(split_name)
-        log_empty_string(:split_name, method)
-        return false
-      end
-
-      true
-    end
-
     def valid_key?(method, key)
       if key.nil?
         log_nil(:key, method)
@@ -329,29 +350,8 @@ def valid_properties?(properties)
       true
     end
 
-    def validate_fallback_treatment(method, fallback_treatment)
-      if !fallback_treatment.is_a? Engine::Models::FallbackTreatment
-          @config.logger.warn("#{method}: Fallback treatment instance should be FallbackTreatment, input is discarded")
-          return false
-      end
-
-      if !fallback_treatment.treatment.is_a? String
-          @config.logger.warn("#{method}: Fallback treatment value should be str type, input is discarded")
-          return false
-      end    
-
-      return false unless string_match?(fallback_treatment.treatment, method, Fallback_treatment_regex)
-
-      if fallback_treatment.treatment.size > Fallback_treatment_size
-          @config.logger.warn("#{method}: Fallback treatment size should not exceed %s characters", Fallback_treatment_size)
-          return false
-      end            
-      
-      true
-    end
-
     def log_invalid_fallback_treatment(key, method)
-      @config.logger.warn("#{method}: Invalid treatment #{key}, Fallback treatment should match regex %s", Fallback_treatment_regex)
+      @config.logger.warn("#{method}: Invalid treatment #{key}, Fallback treatment should match regex #{Fallback_treatment_regex}")
     end
   end
 end

spec/splitclient/split_config_spec.rb

@@ -180,5 +180,33 @@
       configs = SplitIoClient::SplitConfig.new(flag_sets_filter: ['1set', 12])
       expect(configs.flag_sets_filter).to eq ['1set']
     end
+
+    it 'test fallback treatment validations' do
+      configs = SplitIoClient::SplitConfig.new(fallback_treatments: 0)
+      expect(configs.fallback_treatments_configuration.is_a?(SplitIoClient::Engine::Models::FallbackTreatmentsConfiguration)).to eq true
+      expect(configs.fallback_treatments_configuration.global_fallback_treatment).to eq nil
+      expect(configs.fallback_treatments_configuration.by_flag_fallback_treatment).to eq nil
+
+      configs = SplitIoClient::SplitConfig.new(fallback_treatments: SplitIoClient::Engine::Models::FallbackTreatmentsConfiguration.new)
+      expect(configs.fallback_treatments_configuration.is_a?(SplitIoClient::Engine::Models::FallbackTreatmentsConfiguration)).to eq true
+      expect(configs.fallback_treatments_configuration.global_fallback_treatment).to eq nil
+      expect(configs.fallback_treatments_configuration.by_flag_fallback_treatment).to eq nil
+
+      configs = SplitIoClient::SplitConfig.new(fallback_treatments: SplitIoClient::Engine::Models::FallbackTreatmentsConfiguration.new('on-global', {'feature' => 'on_45-c'}))
+      expect(configs.fallback_treatments_configuration.global_fallback_treatment.is_a?(SplitIoClient::Engine::Models::FallbackTreatment)).to eq true
+      expect(configs.fallback_treatments_configuration.global_fallback_treatment.treatment).to eq 'on-global'
+      expect(configs.fallback_treatments_configuration.global_fallback_treatment.config).to eq nil
+      expect(configs.fallback_treatments_configuration.by_flag_fallback_treatment['feature'].is_a?(SplitIoClient::Engine::Models::FallbackTreatment)).to eq true
+      expect(configs.fallback_treatments_configuration.by_flag_fallback_treatment['feature'].treatment).to eq 'on_45-c'
+      expect(configs.fallback_treatments_configuration.by_flag_fallback_treatment['feature'].config).to eq nil
+
+      configs = SplitIoClient::SplitConfig.new(fallback_treatments: SplitIoClient::Engine::Models::FallbackTreatmentsConfiguration.new('on-gl/obal', {'feature' => "0" * 300}))
+      expect(configs.fallback_treatments_configuration.global_fallback_treatment).to eq nil
+      expect(configs.fallback_treatments_configuration.by_flag_fallback_treatment).to eq Hash.new
+
+      configs = SplitIoClient::SplitConfig.new(fallback_treatments: SplitIoClient::Engine::Models::FallbackTreatmentsConfiguration.new(SplitIoClient::Engine::Models::FallbackTreatment.new('on-gl$#obal'), {"" => "treat"}))
+      expect(configs.fallback_treatments_configuration.global_fallback_treatment).to eq nil
+      expect(configs.fallback_treatments_configuration.by_flag_fallback_treatment).to eq Hash.new
+    end
   end
 end