Skip to content

use fmt.Sprintf for tag name #27

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

use fmt.Sprintf for tag name #27

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e11c2e
use fmt.Sprintf for tag name
jpascal Dec 2, 2020
f063852
typo
jpascal Dec 2, 2020
6e3296d
typo
jpascal Dec 2, 2020
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
14 changes: 8 additions & 6 deletions envdecode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ type Decoder interface {
// time.ParseDuration() function and *url.URL is supported via the
// url.Parse() function. Slices are supported for all above mentioned
// primitive types. Semicolon is used as delimiter in environment variables.
func Decode(target interface{}) error {
nFields, err := decode(target, false)
func Decode(target interface{}, args ...interface{}) error {
nFields, err := decode(target, false, args...)
if err != nil {
return err
}
Expand All @@ -75,8 +75,8 @@ func Decode(target interface{}) error {

// StrictDecode is similar to Decode except all fields will have an implicit
// ",strict" on all fields.
func StrictDecode(target interface{}) error {
nFields, err := decode(target, true)
func StrictDecode(target interface{}, args ...interface{}) error {
nFields, err := decode(target, true, args...)
if err != nil {
return err
}
Expand All @@ -90,7 +90,7 @@ func StrictDecode(target interface{}) error {
return nil
}

func decode(target interface{}, strict bool) (int, error) {
func decode(target interface{}, strict bool, args ...interface{}) (int, error) {
s := reflect.ValueOf(target)
if s.Kind() != reflect.Ptr || s.IsNil() {
return 0, ErrInvalidTarget
Expand Down Expand Up @@ -129,7 +129,7 @@ func decode(target interface{}, strict bool) (int, error) {
break
}

n, err := decode(ss, strict)
n, err := decode(ss, strict, args...)
if err != nil {
return 0, err
}
Expand All @@ -145,6 +145,8 @@ func decode(target interface{}, strict bool) (int, error) {
continue
}

tag = fmt.Sprintf(tag, args...)

parts := strings.Split(tag, ",")
env := os.Getenv(parts[0])

Expand Down