Skip to content

struct: map slices of pointers #406

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
team-humaki wants to merge 1 commit into
base: main
Choose a base branch
from
+65 −10
Open

struct: map slices of pointers #406

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
35 changes: 25 additions & 10 deletions struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,13 @@ func setSliceWithProperType(key *Key, field reflect.Value, delim string, allowSh
var vals interface{}
var err error

sliceOf := field.Type().Elem().Kind()
elemType := field.Type().Elem()
isPtrElem := elemType.Kind() == reflect.Pointer
valueType := elemType
if isPtrElem {
valueType = elemType.Elem()
}
sliceOf := valueType.Kind()
switch sliceOf {
case reflect.String:
vals = strs
Expand All @@ -113,31 +119,40 @@ func setSliceWithProperType(key *Key, field reflect.Value, delim string, allowSh
case reflectTime:
vals, err = key.parseTimesFormat(time.RFC3339, strs, true, false)
default:
return fmt.Errorf("unsupported type '[]%s'", sliceOf)
return fmt.Errorf("unsupported type '[]%s'", field.Type().Elem().Kind())
}
if err != nil && isStrict {
return err
}

slice := reflect.MakeSlice(field.Type(), numVals, numVals)
for i := 0; i < numVals; i++ {
var v interface{}
switch sliceOf {
case reflect.String:
slice.Index(i).Set(reflect.ValueOf(vals.([]string)[i]))
v = vals.([]string)[i]
case reflect.Int:
slice.Index(i).Set(reflect.ValueOf(vals.([]int)[i]))
v = vals.([]int)[i]
case reflect.Int64:
slice.Index(i).Set(reflect.ValueOf(vals.([]int64)[i]))
v = vals.([]int64)[i]
case reflect.Uint:
slice.Index(i).Set(reflect.ValueOf(vals.([]uint)[i]))
v = vals.([]uint)[i]
case reflect.Uint64:
slice.Index(i).Set(reflect.ValueOf(vals.([]uint64)[i]))
v = vals.([]uint64)[i]
case reflect.Float64:
slice.Index(i).Set(reflect.ValueOf(vals.([]float64)[i]))
v = vals.([]float64)[i]
case reflect.Bool:
slice.Index(i).Set(reflect.ValueOf(vals.([]bool)[i]))
v = vals.([]bool)[i]
case reflectTime:
slice.Index(i).Set(reflect.ValueOf(vals.([]time.Time)[i]))
v = vals.([]time.Time)[i]
}
rv := reflect.ValueOf(v)
if isPtrElem {
pv := reflect.New(rv.Type())
pv.Elem().Set(rv)
slice.Index(i).Set(pv)
} else {
slice.Index(i).Set(rv)
}
}
field.Set(slice)
Expand Down
40 changes: 40 additions & 0 deletions struct_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,46 @@ AllowedIPs = 10.2.0.6/32,fd00:2::6/128
})
}

func TestMapToPointerSlices(t *testing.T) {
t.Run("map allowshadow keys to []*string", func(t *testing.T) {
type Config struct {
Users []*string `ini:"user,allowshadow"`
}

f, err := LoadSources(LoadOptions{AllowShadows: true}, []byte(`user=foo
user=bar
user=baz
`))
require.NoError(t, err)

cfg := new(Config)
require.NoError(t, f.MapTo(cfg))
require.Len(t, cfg.Users, 3)
require.NotNil(t, cfg.Users[0])
require.NotNil(t, cfg.Users[1])
require.NotNil(t, cfg.Users[2])
assert.Equal(t, "foo", *cfg.Users[0])
assert.Equal(t, "bar", *cfg.Users[1])
assert.Equal(t, "baz", *cfg.Users[2])
})

t.Run("map delimited values to []*int", func(t *testing.T) {
type Config struct {
Nums []*int `delim:","`
}

f, err := Load([]byte(`Nums=1,2,3`))
require.NoError(t, err)

cfg := new(Config)
require.NoError(t, f.MapTo(cfg))
require.Len(t, cfg.Nums, 3)
assert.Equal(t, 1, *cfg.Nums[0])
assert.Equal(t, 2, *cfg.Nums[1])
assert.Equal(t, 3, *cfg.Nums[2])
})
}

// Inspired by https://github.com/go-ini/ini/issues/196
func TestMapToAndReflectFromStructWithShadows(t *testing.T) {
t.Run("map to struct and then reflect with shadows should generate original config content", func(t *testing.T) {
Expand Down