Merge pull request lindenlab#1 from lindenlab/parse-into-base-structs

Parse Into Base Structs

Version

@@ -1 +1 @@
-0.3.0
+0.4.0

env.go

@@ -93,6 +93,11 @@ func doParse(ref reflect.Value, prefix string, funcMap CustomParsers) error {
 			continue
 		}
 		if value == "" {
+			if reflect.Struct == refField.Kind() {
+				if err := doParse(refField, prefix, funcMap); err != nil {
+					errorList = append(errorList, err.Error())
+				}
+			}
 			continue
 		}
 		if err := set(refField, refTypeField, value, funcMap); err != nil {

env_test.go

@@ -69,6 +69,15 @@ type InnerStruct struct {
 	Number uint   `env:"innernum"`
 }
 
+type DerivedStruct struct {
+	BaseStruct
+}
+
+type BaseStruct struct {
+	Inner  string `env:"innervar"`
+	Number uint   `env:"innernum"`
+}
+
 func TestParsesEnv(t *testing.T) {
 	os.Setenv("somevar", "somevalue")
 	os.Setenv("othervar", "true")
@@ -169,6 +178,21 @@ func TestParsesEnvInnerInvalid(t *testing.T) {
 	assert.Error(t, Parse(&cfg))
 }
 
+func TestParsesEnvDerived(t *testing.T) {
+	os.Setenv("innervar", "someinnervalue")
+	defer os.Clearenv()
+	cfg := DerivedStruct{}
+	assert.NoError(t, Parse(&cfg))
+	assert.Equal(t, "someinnervalue", cfg.Inner)
+}
+
+func TestParsesEnvDerivedInvalid(t *testing.T) {
+	os.Setenv("innernum", "-547")
+	defer os.Clearenv()
+	cfg := DerivedStruct{}
+	assert.Error(t, Parse(&cfg))
+}
+
 func TestEmptyVars(t *testing.T) {
 	cfg := Config{}
 	assert.NoError(t, Parse(&cfg))