chore: remove refactor changes

Author: Namyalg

remoteconfig/remoteconfig.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package remoteconfig allows clients to use Firebase Remote Config.
+// Package remoteconfig allows clients to use Firebase Remote Config with Go.
 package remoteconfig
 
 import (

remoteconfig/server_config.go

@@ -15,7 +15,6 @@
 package remoteconfig
 
 import (
-	"slices"
 	"strconv"
 	"strings"
 )
@@ -27,8 +26,8 @@ type ValueSource int
 const (
 	sourceUnspecified ValueSource = iota
 	Static                        // Static represents a statically defined value.
-	Remote                        // Remote represents a value fetched from a remote source.
-	Default                       // Default represents a default value.
+	Remote                        // Default represents a default value.
+	Default                       // Remote represents a value fetched from a remote source.
 )
 
 // Value defines the interface for configuration values.
@@ -39,50 +38,39 @@ type value struct {
 
 // Default Values for config parameters.
 const (
-	defaultValueForBoolean = false
-	defaultValueForString  = ""
-	defaultValueForNumber  = 0
+	DefaultValueForBoolean = false
+	DefaultValueForString  = ""
+	DefaultValueForNumber  = 0
 )
 
 var booleanTruthyValues = []string{"1", "true", "t", "yes", "y", "on"}
 
 // ServerConfig is the implementation of the ServerConfig interface.
 type ServerConfig struct {
-	configValues map[string]value
+	ConfigValues map[string]value
 }
 
 // NewServerConfig creates a new ServerConfig instance.
-func newServerConfig(configValues map[string]value) *ServerConfig {
-	return &ServerConfig{configValues: configValues}
+func NewServerConfig(configValues map[string]value) *ServerConfig {
+	return &ServerConfig{ConfigValues: configValues}
 }
 
 // GetBoolean returns the boolean value associated with the given key.
-//
-// It returns true if the string value is "1", "true", "t", "yes", "y", or "on" (case-insensitive).
-// Otherwise, or if the key is not found, it returns the default boolean value (false).
 func (s *ServerConfig) GetBoolean(key string) bool {
 	return s.getValue(key).asBoolean()
 }
 
 // GetInt returns the integer value associated with the given key.
-//
-// If the parameter value cannot be parsed as an integer, or if the key is not found,
-// it returns the default numeric value (0).
 func (s *ServerConfig) GetInt(key string) int {
 	return s.getValue(key).asInt()
 }
 
 // GetFloat returns the float value associated with the given key.
-//
-// If the parameter value cannot be parsed as a float64, or if the key is not found,
-// it returns the default numeric value (0).
 func (s *ServerConfig) GetFloat(key string) float64 {
 	return s.getValue(key).asFloat()
 }
 
 // GetString returns the string value associated with the given key.
-//
-// If the key is not found, it returns the default string value ("").
 func (s *ServerConfig) GetString(key string) string {
 	return s.getValue(key).asString()
 }
@@ -94,16 +82,16 @@ func (s *ServerConfig) GetValueSource(key string) ValueSource {
 
 // getValue returns the value associated with the given key.
 func (s *ServerConfig) getValue(key string) *value {
-	if val, ok := s.configValues[key]; ok {
+	if val, ok := s.ConfigValues[key]; ok {
 		return &val
 	}
-	return newValue(Static, defaultValueForString)
+	return newValue(Static, "")
 }
 
 // newValue creates a new value instance.
 func newValue(source ValueSource, customValue string) *value {
 	if customValue == "" {
-		customValue = defaultValueForString
+		customValue = DefaultValueForString
 	}
 	return &value{source: source, value: customValue}
 }
@@ -116,21 +104,27 @@ func (v *value) asString() string {
 // asBoolean returns the value as a boolean.
 func (v *value) asBoolean() bool {
 	if v.source == Static {
-		return defaultValueForBoolean
+		return DefaultValueForBoolean
+	}
+
+	for _, truthyValue := range booleanTruthyValues {
+		if strings.ToLower(v.value) == truthyValue {
+			return true
+		}
 	}
 
-	return slices.Contains(booleanTruthyValues, strings.ToLower(v.value))
+	return false
 }
 
 // asInt returns the value as an integer.
 func (v *value) asInt() int {
 	if v.source == Static {
-		return defaultValueForNumber
+		return DefaultValueForNumber
 	}
 	num, err := strconv.Atoi(v.value)
 
 	if err != nil {
-		return defaultValueForNumber
+		return DefaultValueForNumber
 	}
 
 	return num
@@ -139,12 +133,12 @@ func (v *value) asInt() int {
 // asFloat returns the value as an integer.
 func (v *value) asFloat() float64 {
 	if v.source == Static {
-		return defaultValueForNumber
+		return DefaultValueForNumber
 	}
 	num, err := strconv.ParseFloat(v.value, 64)
 
 	if err != nil {
-		return defaultValueForNumber
+		return DefaultValueForNumber
 	}
 
 	return num

remoteconfig/server_template.go

@@ -28,17 +28,16 @@ import (
 
 // serverTemplateData stores the internal representation of the server template.
 type serverTemplateData struct {
-	// A list of conditions in descending order by priority.
-	Conditions []namedCondition `json:"conditions,omitempty"`
-
-	// Map of parameter keys to their optional default values and optional conditional values.
 	Parameters map[string]parameter `json:"parameters,omitempty"`
 
-	// Version information for the current Remote Config template.
-	Version version `json:"version,omitempty"`
+	Conditions []namedCondition `json:"conditions,omitempty"`
+
+	Version struct {
+		VersionNumber string `json:"versionNumber"`
+		IsLegacy      bool   `json:"isLegacy"`
+	} `json:"version"`
 
-	// Current Remote Config template ETag.
-	ETag string `json:"etag,omitempty"`
+	ETag string `json:"etag"`
 }
 
 // ServerTemplate represents a template with configuration data, cache, and service information.
@@ -58,8 +57,8 @@ func newServerTemplate(rcClient *rcClient, defaultConfig map[string]any) (*Serve
 			continue
 		}
 
-		if s, ok := value.(string); ok {
-			stringifiedConfig[key] = s
+		if stringVal, ok := value.(string); ok {
+			stringifiedConfig[key] = stringVal
 			continue
 		}
 
@@ -159,5 +158,5 @@ func (s *ServerTemplate) Evaluate(context map[string]any) (*ServerConfig, error)
 			config[key] = value{source: Remote, value: *parameter.DefaultValue.Value}
 		}
 	}
-	return newServerConfig(config), nil
+	return NewServerConfig(config), nil
 }

remoteconfig/server_template_test.go

@@ -100,8 +100,12 @@ func TestServerTemplateToJSONSuccess(t *testing.T) {
 				},
 			},
 		},
-		Version: version{
+		Version: struct {
+			VersionNumber string "json:\"versionNumber\""
+			IsLegacy      bool   "json:\"isLegacy\""
+		}{
 			VersionNumber: testVersion,
+			IsLegacy:      true,
 		},
 		ETag: testEtag,
 	}
@@ -111,13 +115,12 @@ func TestServerTemplateToJSONSuccess(t *testing.T) {
 		t.Fatalf("ServerTemplate.ToJSON failed: %v", err)
 	}
 
-	expectedJSON := `{"parameters":{"test_param_one":{"defaultValue":{"value":"test_value_one"}}},"version":{"versionNumber":"test-version"},"etag":"test-etag"}`
+	expectedJSON := `{"parameters":{"test_param_one":{"defaultValue":{"value":"test_value_one"}}},"version":{"versionNumber":"test-version","isLegacy":true},"etag":"test-etag"}`
 	if json != expectedJSON {
 		t.Fatalf("ServerTemplate.ToJSON returned incorrect json: %v want %v", json, expectedJSON)
 	}
 }
 
-// Verifies that Evaluate returns the explicit default value defined in the template (with Remote source) when the template has no conditions.
 func TestServerTemplateReturnsDefaultFromRemote(t *testing.T) {
 	paramVal := valueOne
 	template := &ServerTemplate{}
@@ -129,7 +132,10 @@ func TestServerTemplateReturnsDefaultFromRemote(t *testing.T) {
 				},
 			},
 		},
-		Version: version{
+		Version: struct {
+			VersionNumber string "json:\"versionNumber\""
+			IsLegacy      bool   "json:\"isLegacy\""
+		}{
 			VersionNumber: testVersion,
 		},
 		ETag: testEtag,
@@ -155,8 +161,6 @@ func TestServerTemplateReturnsDefaultFromRemote(t *testing.T) {
 	}
 }
 
-// Verifies that Evaluate correctly handles the UseInAppDefault flag for a parameter's default value,
-// returning the provided in-app default (with Default source) if available, or the static default (with Static source) otherwise.
 func TestEvaluateReturnsInAppDefault(t *testing.T) {
 	booleanTrue := true
 	td := &serverTemplateData{
@@ -167,7 +171,10 @@ func TestEvaluateReturnsInAppDefault(t *testing.T) {
 				},
 			},
 		},
-		Version: version{
+		Version: struct {
+			VersionNumber string "json:\"versionNumber\""
+			IsLegacy      bool   "json:\"isLegacy\""
+		}{
 			VersionNumber: testVersion,
 		},
 		ETag: testEtag,
@@ -220,7 +227,6 @@ func TestEvaluateReturnsInAppDefault(t *testing.T) {
 	}
 }
 
-// Verifies that Evaluate returns the explicit conditional value (with Remote source) when the associated condition evaluates to true
 func TestEvaluate_WithACondition_ReturnsConditionalRemoteValue(t *testing.T) {
 	vOne := valueOne
 	vTwo := valueTwo
@@ -260,7 +266,10 @@ func TestEvaluate_WithACondition_ReturnsConditionalRemoteValue(t *testing.T) {
 				},
 			},
 		},
-		Version: version{
+		Version: struct {
+			VersionNumber string "json:\"versionNumber\""
+			IsLegacy      bool   "json:\"isLegacy\""
+		}{
 			VersionNumber: testVersion,
 		},
 		ETag: testEtag,
@@ -286,8 +295,6 @@ func TestEvaluate_WithACondition_ReturnsConditionalRemoteValue(t *testing.T) {
 	}
 }
 
-// Verifies that Evaluate returns the in-app default value (with Default source) when a condition evaluates to true,
-// and its corresponding conditional value specifies UseInAppDefault.
 func TestEvaluate_WithACondition_ReturnsConditionalInAppDefaultValue(t *testing.T) {
 	vOne := valueOne
 	boolTrue := true
@@ -328,7 +335,10 @@ func TestEvaluate_WithACondition_ReturnsConditionalInAppDefaultValue(t *testing.
 				},
 			},
 		},
-		Version: version{
+		Version: struct {
+			VersionNumber string "json:\"versionNumber\""
+			IsLegacy      bool   "json:\"isLegacy\""
+		}{
 			VersionNumber: testVersion,
 		},
 		ETag: testEtag,

remoteconfig/server_template_types.go

@@ -111,46 +111,3 @@ type parameterValue struct {
 	// If true, indicates that the in-app default value is to be used for the parameter
 	UseInAppDefault *bool `json:"useInAppDefault,omitempty"`
 }
-
-// Structure representing a Remote Config template version.
-// Output only, except for the version description. Contains metadata about a particular
-// version of the Remote Config template. All fields are set at the time the specified Remote Config template is published.
-type version struct {
-	// The version number of a Remote Config template.
-	VersionNumber string `json:"versionNumber,omitempty"`
-
-	// The timestamp of when this version of the Remote Config template was written to the
-	// Remote Config backend.
-	UpdateTime string `json:"updateTime,omitempty"`
-
-	// The origin of the template update action.
-	UpdateOrigin string `json:"updateOrigin,omitempty"`
-
-	// The type of the template update action.
-	UpdateType string `json:"updateType,omitempty"`
-
-	// Aggregation of all metadata fields about the account that performed the update.
-	UpdateUser *remoteConfigUser `json:"updateUser,omitempty"`
-
-	// The user-provided description of the corresponding Remote Config template.
-	Description string `json:"description,omitempty"`
-
-	// The version number of the Remote Config template that has become the current version
-	// due to a rollback. Only present if this version is the result of a rollback.
-	RollbackSource string `json:"rollbackSource,omitempty"`
-
-	// Indicates whether this Remote Config template was published before version history was supported.
-	IsLegacy bool `json:"isLegacy,omitempty"`
-}
-
-// Represents a Remote Config user.
-type remoteConfigUser struct {
-	// Email address. Output only.
-	Email string `json:"email,omitempty"`
-
-	// Display name. Output only.
-	Name string `json:"name,omitempty"`
-
-	// Image URL. Output only.
-	ImageURL string `json:"imageUrl,omitempty"`
-}