Skip to content

enhancement: improve the equality check #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hgiasac merged 1 commit into from
Dec 13, 2025
Merged

enhancement: improve the equality check #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions any.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,10 @@ func (ev EnvAny) GetCustom(getFunc GetEnvFunc) (any, error) {
func (ev EnvAny) Equal(target EnvAny) bool {
isSameValue := (ev.Value == nil && target.Value == nil) ||
(ev.Value != nil && target.Value != nil && reflect.DeepEqual(ev.Value, target.Value))
if !isSameValue {
return false
}

isSameEnv := (ev.Variable == nil && target.Variable == nil) ||
return (ev.Variable == nil && target.Variable == nil) ||
(ev.Variable != nil && target.Variable != nil && *ev.Variable == *target.Variable)

return isSameValue && isSameEnv
}
150 changes: 0 additions & 150 deletions any_equal_test.go
View file
Open in desktop

This file was deleted.

145 changes: 145 additions & 0 deletions any_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,148 @@ func TestEnvAny_GetCustom(t *testing.T) {
})
}
}

func TestEnvAny_Equal(t *testing.T) {
testCases := []struct {
Name string
Input EnvAny
Target EnvAny
Expected bool
}{
{
Name: "both_nil",
Input: EnvAny{},
Target: EnvAny{},
Expected: true,
},
{
Name: "same_string_values",
Input: NewEnvAnyValue("hello"),
Target: NewEnvAnyValue("hello"),
Expected: true,
},
{
Name: "different_string_values",
Input: NewEnvAnyValue("hello"),
Target: NewEnvAnyValue("world"),
Expected: false,
},
{
Name: "same_int_values",
Input: NewEnvAnyValue(42),
Target: NewEnvAnyValue(42),
Expected: true,
},
{
Name: "different_int_values",
Input: NewEnvAnyValue(42),
Target: NewEnvAnyValue(100),
Expected: false,
},
{
Name: "same_float_values",
Input: NewEnvAnyValue(3.14),
Target: NewEnvAnyValue(3.14),
Expected: true,
},
{
Name: "different_float_values",
Input: NewEnvAnyValue(3.14),
Target: NewEnvAnyValue(2.718),
Expected: false,
},
{
Name: "same_bool_values",
Input: NewEnvAnyValue(true),
Target: NewEnvAnyValue(true),
Expected: true,
},
{
Name: "different_bool_values",
Input: NewEnvAnyValue(true),
Target: NewEnvAnyValue(false),
Expected: false,
},
{
Name: "same_map_values",
Input: NewEnvAnyValue(map[string]any{"key": "value"}),
Target: NewEnvAnyValue(map[string]any{"key": "value"}),
Expected: true,
},
{
Name: "different_map_values",
Input: NewEnvAnyValue(map[string]any{"key1": "value1"}),
Target: NewEnvAnyValue(map[string]any{"key2": "value2"}),
Expected: false,
},
{
Name: "same_slice_values",
Input: NewEnvAnyValue([]any{1, 2, 3}),
Target: NewEnvAnyValue([]any{1, 2, 3}),
Expected: true,
},
{
Name: "different_slice_values",
Input: NewEnvAnyValue([]any{1, 2, 3}),
Target: NewEnvAnyValue([]any{4, 5, 6}),
Expected: false,
},
{
Name: "same_variable_names",
Input: NewEnvAnyVariable("MY_VAR"),
Target: NewEnvAnyVariable("MY_VAR"),
Expected: true,
},
{
Name: "different_variable_names",
Input: NewEnvAnyVariable("VAR1"),
Target: NewEnvAnyVariable("VAR2"),
Expected: false,
},
{
Name: "same_value_and_variable",
Input: NewEnvAny("MY_VAR", "default"),
Target: NewEnvAny("MY_VAR", "default"),
Expected: true,
},
{
Name: "same_variable_different_value",
Input: NewEnvAny("MY_VAR", "value1"),
Target: NewEnvAny("MY_VAR", "value2"),
Expected: false,
},
{
Name: "different_variable_same_value",
Input: NewEnvAny("VAR1", "value"),
Target: NewEnvAny("VAR2", "value"),
Expected: false,
},
{
Name: "value_vs_variable",
Input: NewEnvAnyValue("hello"),
Target: NewEnvAnyVariable("MY_VAR"),
Expected: false,
},
{
Name: "different_types",
Input: NewEnvAnyValue("42"),
Target: NewEnvAnyValue(42),
Expected: false,
},
{
Name: "nil_value_vs_non_nil",
Input: NewEnvAnyVariable("MY_VAR"),
Target: NewEnvAnyValue("hello"),
Expected: false,
},
}

for _, tc := range testCases {
t.Run(tc.Name, func(t *testing.T) {
result := tc.Input.Equal(tc.Target)
if result != tc.Expected {
t.Errorf("Expected %v, got %v", tc.Expected, result)
}
})
}
}
44 changes: 24 additions & 20 deletions environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,18 @@ func (ev EnvString) IsZero() bool {
ev.Value == nil
}

// Equal checks if this instance equals the target value.
func (ev EnvString) Equal(target EnvString) bool {
isSameValue := (ev.Value == nil && target.Value == nil) ||
(ev.Value != nil && target.Value != nil && *ev.Value == *target.Value)
if !isSameValue {
return false
}

return (ev.Variable == nil && target.Variable == nil) ||
(ev.Variable != nil && target.Variable != nil && *ev.Variable == *target.Variable)
}

// Get gets literal value or from system environment.
func (ev EnvString) Get() (string, error) {
if ev.IsZero() {
Expand Down Expand Up @@ -127,17 +139,6 @@ func (ev EnvString) GetCustom(getFunc GetEnvFunc) (string, error) {
return "", getEnvVariableValueRequiredError(ev.Variable)
}

// Equal checks if this instance equals the target value.
func (ev EnvString) Equal(target EnvString) bool {
isSameValue := (ev.Value == nil && target.Value == nil) ||
(ev.Value != nil && target.Value != nil && *ev.Value == *target.Value)

isSameEnv := (ev.Variable == nil && target.Variable == nil) ||
(ev.Variable != nil && target.Variable != nil && *ev.Variable == *target.Variable)

return isSameValue && isSameEnv
}

// EnvInt represents either a literal integer or an environment reference.
type EnvInt struct {
Value *int64 `json:"value,omitempty" jsonschema:"anyof_required=value" mapstructure:"value" yaml:"value,omitempty"`
Expand Down Expand Up @@ -176,11 +177,12 @@ func (ev EnvInt) IsZero() bool {
func (ev EnvInt) Equal(target EnvInt) bool {
isSameValue := (ev.Value == nil && target.Value == nil) ||
(ev.Value != nil && target.Value != nil && *ev.Value == *target.Value)
if !isSameValue {
return false
}

isSameEnv := (ev.Variable == nil && target.Variable == nil) ||
return (ev.Variable == nil && target.Variable == nil) ||
(ev.Variable != nil && target.Variable != nil && *ev.Variable == *target.Variable)

return isSameValue && isSameEnv
}

// UnmarshalJSON implements json.Unmarshaler.
Expand Down Expand Up @@ -300,11 +302,12 @@ func (ev EnvBool) IsZero() bool {
func (ev EnvBool) Equal(target EnvBool) bool {
isSameValue := (ev.Value == nil && target.Value == nil) ||
(ev.Value != nil && target.Value != nil && *ev.Value == *target.Value)
if !isSameValue {
return false
}

isSameEnv := (ev.Variable == nil && target.Variable == nil) ||
return (ev.Variable == nil && target.Variable == nil) ||
(ev.Variable != nil && target.Variable != nil && *ev.Variable == *target.Variable)

return isSameValue && isSameEnv
}

// UnmarshalJSON implements json.Unmarshaler.
Expand Down Expand Up @@ -424,11 +427,12 @@ func (ev EnvFloat) IsZero() bool {
func (ev EnvFloat) Equal(target EnvFloat) bool {
isSameValue := (ev.Value == nil && target.Value == nil) ||
(ev.Value != nil && target.Value != nil && *ev.Value == *target.Value)
if !isSameValue {
return false
}

isSameEnv := (ev.Variable == nil && target.Variable == nil) ||
return (ev.Variable == nil && target.Variable == nil) ||
(ev.Variable != nil && target.Variable != nil && *ev.Variable == *target.Variable)

return isSameValue && isSameEnv
}

// UnmarshalJSON implements json.Unmarshaler.
Expand Down
Loading
Loading