Skip to content

fix: default value for GetCustom method #10

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
Mar 9, 2026
Merged

fix: default value for GetCustom method #10

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
3 changes: 2 additions & 1 deletion any.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package goenvconf

import (
"encoding/json"
"errors"
"os"
"reflect"
)
Expand Down Expand Up @@ -60,7 +61,7 @@ func (ev EnvAny) Get() (any, error) {
func (ev EnvAny) GetCustom(getFunc GetEnvFunc) (any, error) {
if ev.Variable != nil && *ev.Variable != "" {
rawValue, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return nil, err
}

Expand Down
15 changes: 11 additions & 4 deletions environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,14 @@ func (ev EnvString) GetCustom(getFunc GetEnvFunc) (string, error) {
}

if ev.Variable != nil && *ev.Variable != "" {
return getFunc(*ev.Variable)
value, err := getFunc(*ev.Variable)
if err == nil {
return value, nil
}

if !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return "", err
}
Comment thread
hgiasac marked this conversation as resolved.
}

if ev.Value != nil {
Expand Down Expand Up @@ -205,7 +212,7 @@ func (ev EnvInt) GetCustom(getFunc GetEnvFunc) (int64, error) {

if ev.Variable != nil && *ev.Variable != "" {
rawValue, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return 0, err
}

Expand Down Expand Up @@ -309,7 +316,7 @@ func (ev EnvBool) GetCustom(getFunc GetEnvFunc) (bool, error) {

if ev.Variable != nil && *ev.Variable != "" {
rawValue, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return false, err
}

Expand Down Expand Up @@ -413,7 +420,7 @@ func (ev EnvFloat) GetCustom(getFunc GetEnvFunc) (float64, error) {

if ev.Variable != nil && *ev.Variable != "" {
rawValue, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return 0, err
}

Expand Down
9 changes: 5 additions & 4 deletions map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package goenvconf

import (
"errors"
"maps"
"os"
)
Expand Down Expand Up @@ -67,7 +68,7 @@ func (ev EnvMapString) Get() (map[string]string, error) {
func (ev EnvMapString) GetCustom(getFunc GetEnvFunc) (map[string]string, error) {
if ev.Variable != nil && *ev.Variable != "" {
rawValue, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return nil, err
}

Expand Down Expand Up @@ -141,7 +142,7 @@ func (ev EnvMapInt) Get() (map[string]int64, error) {
func (ev EnvMapInt) GetCustom(getFunc GetEnvFunc) (map[string]int64, error) {
if ev.Variable != nil && *ev.Variable != "" {
rawValue, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return nil, err
}

Expand Down Expand Up @@ -215,7 +216,7 @@ func (ev EnvMapFloat) Get() (map[string]float64, error) {
func (ev EnvMapFloat) GetCustom(getFunc GetEnvFunc) (map[string]float64, error) {
if ev.Variable != nil && *ev.Variable != "" {
rawValue, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return nil, err
}

Expand Down Expand Up @@ -289,7 +290,7 @@ func (ev EnvMapBool) Get() (map[string]bool, error) {
func (ev EnvMapBool) GetCustom(getFunc GetEnvFunc) (map[string]bool, error) {
if ev.Variable != nil && *ev.Variable != "" {
rawValue, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return nil, err
}

Expand Down
9 changes: 5 additions & 4 deletions slice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package goenvconf

import (
"errors"
"fmt"
"os"
"slices"
Expand Down Expand Up @@ -87,7 +88,7 @@ func (ev EnvStringSlice) GetCustom(getFunc GetEnvFunc) ([]string, error) {

if ev.Variable != nil && *ev.Variable != "" {
value, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return nil, err
}

Expand Down Expand Up @@ -187,7 +188,7 @@ func (ev EnvIntSlice) GetCustom(getFunc GetEnvFunc) ([]int64, error) {

if ev.Variable != nil && *ev.Variable != "" {
value, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return nil, err
}

Expand Down Expand Up @@ -290,7 +291,7 @@ func (ev EnvFloatSlice) GetCustom(getFunc GetEnvFunc) ([]float64, error) {

if ev.Variable != nil && *ev.Variable != "" {
value, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return nil, err
}

Expand Down Expand Up @@ -393,7 +394,7 @@ func (ev EnvBoolSlice) GetCustom(getFunc GetEnvFunc) ([]bool, error) {

if ev.Variable != nil && *ev.Variable != "" {
value, err := getFunc(*ev.Variable)
if err != nil {
if err != nil && !errors.Is(err, ErrEnvironmentVariableValueRequired) {
return nil, err
}

Expand Down
Loading