Skip to content

All fields required option #207

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 1 commit into
base: master
Choose a base branch
from
Open

All fields required option #207

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
25 changes: 21 additions & 4 deletions envconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ import (
// ErrInvalidSpecification indicates that a specification is of the wrong type.
var ErrInvalidSpecification = errors.New("specification must be a struct pointer")

var gatherRegexp = regexp.MustCompile("([^A-Z]+|[A-Z]+[^A-Z]+|[A-Z]+)")
var acronymRegexp = regexp.MustCompile("([A-Z]+)([A-Z][^A-Z]+)")
var (
gatherRegexp = regexp.MustCompile("([^A-Z]+|[A-Z]+[^A-Z]+|[A-Z]+)")
acronymRegexp = regexp.MustCompile("([A-Z]+)([A-Z][^A-Z]+)")
)

// A ParseError occurs when an environment variable cannot be converted to
// the type required by a struct field during assignment.
Expand Down Expand Up @@ -180,8 +182,23 @@ func CheckDisallowed(prefix string, spec interface{}) error {
return nil
}

type Config struct {
AllRequired bool
}

func WithAllRequired() func(*Config) {
return func(c *Config) {
c.AllRequired = true
}
}

// Process populates the specified struct based on environment variables
func Process(prefix string, spec interface{}) error {
func Process(prefix string, spec interface{}, opts ...func(*Config)) error {
conf := Config{}
for _, o := range opts {
o(&conf)
}

infos, err := gatherInfo(prefix, spec)

for _, info := range infos {
Expand All @@ -202,7 +219,7 @@ func Process(prefix string, spec interface{}) error {

req := info.Tags.Get("required")
if !ok && def == "" {
if isTrue(req) {
if isTrue(req) || conf.AllRequired {
key := info.Key
if info.Alt != "" {
key = info.Alt
Expand Down