Config values must retrun default values from invalid get operations

Author: Pijush Chakraborty

firebase_admin/remote_config.py

@@ -479,7 +479,7 @@ def evaluate_custom_signal_condition(self, custom_signal_condition,
             return not self._compare_strings(target_custom_signal_values,
                                              actual_custom_signal_value,
                                              lambda target, actual: target in actual)
-        if (custom_signal_operator == CustomSignalOperator.STRING_EXACTLY_MATCHES.value):
+        if custom_signal_operator == CustomSignalOperator.STRING_EXACTLY_MATCHES.value:
             return self._compare_strings(target_custom_signal_values,
                                          actual_custom_signal_value,
                                          lambda target, actual: target.strip() == actual.strip())
@@ -676,7 +676,7 @@ def as_string(self) -> str:
         """Returns the value as a string."""
         if self.source == 'static':
             return self.DEFAULT_VALUE_FOR_STRING
-        return self.value
+        return str(self.value)
 
     def as_boolean(self) -> bool:
         """Returns the value as a boolean."""
@@ -688,13 +688,19 @@ def as_int(self) -> float:
         """Returns the value as a number."""
         if self.source == 'static':
             return self.DEFAULT_VALUE_FOR_INTEGER
-        return self.value
+        try:
+            return int(self.value)
+        except ValueError:
+            return self.DEFAULT_VALUE_FOR_INTEGER
 
     def as_float(self) -> float:
         """Returns the value as a number."""
         if self.source == 'static':
             return self.DEFAULT_VALUE_FOR_FLOAT_NUMBER
-        return float(self.value)
+        try:
+            return float(self.value)
+        except ValueError:
+            return self.DEFAULT_VALUE_FOR_FLOAT_NUMBER
 
     def get_source(self) -> ValueSource:
         """Returns the source of the value."""

tests/test_remote_config.py

@@ -67,11 +67,16 @@
     'version': VERSION_INFO,
     }
 
-SEMENTIC_VERSION_LESS_THAN_TRUE = [CustomSignalOperator.SEMANTIC_VERSION_LESS_THAN.value, ['12.1.3.444'], '12.1.3.443', True]
-SEMENTIC_VERSION_EQUAL_TRUE = [CustomSignalOperator.SEMANTIC_VERSION_EQUAL.value, ['12.1.3.444'], '12.1.3.444', True]
-SEMANTIC_VERSION_GREATER_THAN_FALSE = [CustomSignalOperator.SEMANTIC_VERSION_LESS_THAN.value, ['12.1.3.4'], '12.1.3.4', False]
-SEMANTIC_VERSION_INVALID_FORMAT_STRING = [CustomSignalOperator.SEMANTIC_VERSION_LESS_THAN.value, ['12.1.3.444'], '12.1.3.abc', False]
-SEMANTIC_VERSION_INVALID_FORMAT_NEGATIVE_INTEGER = [CustomSignalOperator.SEMANTIC_VERSION_LESS_THAN.value, ['12.1.3.444'], '12.1.3.-2', False]
+SEMENTIC_VERSION_LESS_THAN_TRUE = [
+    CustomSignalOperator.SEMANTIC_VERSION_LESS_THAN.value, ['12.1.3.444'], '12.1.3.443', True]
+SEMENTIC_VERSION_EQUAL_TRUE = [
+    CustomSignalOperator.SEMANTIC_VERSION_EQUAL.value, ['12.1.3.444'], '12.1.3.444', True]
+SEMANTIC_VERSION_GREATER_THAN_FALSE = [
+    CustomSignalOperator.SEMANTIC_VERSION_LESS_THAN.value, ['12.1.3.4'], '12.1.3.4', False]
+SEMANTIC_VERSION_INVALID_FORMAT_STRING = [
+    CustomSignalOperator.SEMANTIC_VERSION_LESS_THAN.value, ['12.1.3.444'], '12.1.3.abc', False]
+SEMANTIC_VERSION_INVALID_FORMAT_NEGATIVE_INTEGER = [
+    CustomSignalOperator.SEMANTIC_VERSION_LESS_THAN.value, ['12.1.3.444'], '12.1.3.-2', False]
 
 class TestEvaluate:
     @classmethod
@@ -279,7 +284,7 @@ def test_evaluate_default_when_no_param(self):
         )
         server_config = server_template.evaluate()
         assert server_config.get_boolean('promo_enabled') == default_config.get('promo_enabled')
-        assert server_config.get_int('promo_discount') == default_config.get('promo_discount')
+        assert server_config.get_int('promo_discount') == int(default_config.get('promo_discount'))
 
     def test_evaluate_default_when_no_default_value(self):
         app = firebase_admin.get_app()
@@ -341,7 +346,7 @@ def test_evaluate_return_numeric_value(self):
             template_data=ServerTemplateData('etag', template_data)
         )
         server_config = server_template.evaluate()
-        assert server_config.get_int('dog_age') == default_config.get('dog_age')
+        assert server_config.get_int('dog_age') == int(default_config.get('dog_age'))
 
     def test_evaluate_return_boolean_value(self):
         app = firebase_admin.get_app()
@@ -757,16 +762,21 @@ def evaluate_random_assignments(self, condition, num_of_assignments, mock_app, d
 
         return eval_true_count
 
-    @pytest.mark.parametrize('custom_signal_opearator, target_custom_signal_value, actual_custom_signal_value, parameter_value', 
-                             [
-                                 SEMENTIC_VERSION_LESS_THAN_TRUE,
-                                 SEMANTIC_VERSION_GREATER_THAN_FALSE,
-                                 SEMENTIC_VERSION_EQUAL_TRUE,
-                                 SEMANTIC_VERSION_INVALID_FORMAT_NEGATIVE_INTEGER,
-                                 SEMANTIC_VERSION_INVALID_FORMAT_STRING
-                             ])
-    def test_evaluate_custom_signal_semantic_version(self, custom_signal_opearator, 
-                                                     target_custom_signal_value, actual_custom_signal_value, parameter_value):
+    @pytest.mark.parametrize(
+        'custom_signal_opearator, \
+            target_custom_signal_value, actual_custom_signal_value, parameter_value',
+        [
+            SEMENTIC_VERSION_LESS_THAN_TRUE,
+            SEMANTIC_VERSION_GREATER_THAN_FALSE,
+            SEMENTIC_VERSION_EQUAL_TRUE,
+            SEMANTIC_VERSION_INVALID_FORMAT_NEGATIVE_INTEGER,
+            SEMANTIC_VERSION_INVALID_FORMAT_STRING
+        ])
+    def test_evaluate_custom_signal_semantic_version(self,
+                                                     custom_signal_opearator,
+                                                     target_custom_signal_value,
+                                                     actual_custom_signal_value,
+                                                     parameter_value):
         app = firebase_admin.get_app()
         condition = {
             'name': 'is_true',