handle embedded struct more generally

containous · Mar 6, 2018 · 6e12bb4 · 6e12bb4
1 parent f9b3fec
commit 6e12bb4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/envsource.go b/envsource.go
@@ -85,7 +85,7 @@ func (e *envSource) analyzeStruct(configType reflect.Type, currentPath path) ([]
 		}
 		// If we're facing an embedded struct
 		if field.Anonymous {
-			values, err := e.analyzeStruct(field.Type, currentPath)
+			values, err := e.analyzeValue(field.Type, currentPath)
 
 			if err != nil {
 				return []*envValue{}, err

diff --git a/envsource_analyzestruct_test.go b/envsource_analyzestruct_test.go
@@ -552,6 +552,23 @@ func TestAnalyzeStruct(t *testing.T) {
 			},
 			testAnalyzeStructShouldSucceed,
 		},
+		{
+			"WithAWebBasicAuth",
+			&struct {
+				Basic     *Basic
+				UsersFile string
+			}{}, []*envValue{
+				&envValue{"UserZero", path{"Basic", "0"}},
+				&envValue{"UserOne", path{"Basic", "1"}},
+				&envValue{"path/to/file", path{"UsersFile"}},
+			},
+			map[string]string{
+				"BASIC_0":    "UserZero",
+				"BASIC_1":    "UserOne",
+				"USERS_FILE": "path/to/file",
+			},
+			testAnalyzeStructShouldSucceed,
+		},
 	}
 
 	for _, testCase := range testCases {