Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions binding.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ type tagConfig struct {
}

var tagConfigCache sync.Map
var optionalTypePkgPath = reflect.TypeOf(Optional[int]{}).PkgPath()

func cloneTagConfig(cfg tagConfig) tagConfig {
if len(cfg.oneof) == 0 {
Expand Down Expand Up @@ -653,6 +654,13 @@ func isOptionalType(t reflect.Type) bool {
if t.Kind() != reflect.Struct {
return false
}
if t.PkgPath() != optionalTypePkgPath {
return false
}
name := t.Name()
if name != "Optional" && !strings.HasPrefix(name, "Optional[") {
return false
}
if t.NumField() != 2 {
return false
}
Expand Down
39 changes: 39 additions & 0 deletions binding_bind_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,45 @@ func TestBindStruct_OptionalField(t *testing.T) {
})
}

func TestBindStruct_ValueSetLookalikeStructIsNotOptional(t *testing.T) {
type ValueSet struct {
Value int
Set bool
}
type Config struct {
Flag ValueSet
}

data := map[string]mergedEntry{
"flag.value": {value: "42", sourceName: "env"},
"flag.set": {value: "true", sourceName: "env"},
}

var cfg Config
var provFields []FieldProvenance
errors := bindStruct(reflect.ValueOf(&cfg), data, &provFields, "", "")

if len(errors) > 0 {
t.Fatalf("unexpected errors: %v", errors)
}

if cfg.Flag.Value != 42 {
t.Errorf("Flag.Value = %d, want %d", cfg.Flag.Value, 42)
}
if !cfg.Flag.Set {
t.Errorf("Flag.Set = %v, want true", cfg.Flag.Set)
}

valueProv := findProvenance(provFields, "Flag.Value")
if valueProv == nil {
t.Fatal("Flag.Value provenance not found")
}
setProv := findProvenance(provFields, "Flag.Set")
if setProv == nil {
t.Fatal("Flag.Set provenance not found")
}
}

func TestBindStruct_MultipleErrors(t *testing.T) {
type Config struct {
Host string `conf:"required"`
Expand Down