Merge pull request #52 from antonmashko/feat/default-value-on-no-var-…

…injection

feat: return no value on injection missing env var

config_field.go

@@ -138,7 +138,11 @@ func (s *externalSource) Value() (interface{}, option.ConfigSource) {
 	str, cs = envInjF(str)
 	switch cs {
 	case option.EnvVariable:
-		return (&envSource{name: str}).Value()
+		v, cs = (&envSource{name: str}).Value()
+		if cs == option.NoConfigValue {
+			return nil, option.NoConfigValue
+		}
+		return v, option.EnvVariable
 	default:
 		return v, option.ExternalSource
 	}

external/external_json_test.go

@@ -201,6 +201,35 @@ func TestJsonConfig_IncorrectType_Err(t *testing.T) {
 	}
 }
 
+func TestJsonConfig_NilPointerNilInterface_Ok(t *testing.T) {
+	json := `{"foo":null,"bar":null}`
+	tc := struct {
+		Foo *string     `json:"foo"`
+		Bar interface{} `json:"bar"`
+	}{}
+	if err := envconf.Parse(&tc, option.WithExternal(jsonconf.Json([]byte(json)))); err != nil {
+		t.Errorf("expected error but got nil")
+	}
+	if tc.Foo != nil || tc.Bar != nil {
+		t.Fatalf("unexpected result. expected nil got %v", tc)
+	}
+}
+
+func TestJsonConfig_NilPointerStruct_Ok(t *testing.T) {
+	json := `{"foo":null}`
+	tc := struct {
+		Foo *struct {
+			Bar string `json:"bar"`
+		} `json:"foo"`
+	}{}
+	if err := envconf.Parse(&tc, option.WithExternal(jsonconf.Json([]byte(json)))); err != nil {
+		t.Errorf("expected error but got nil")
+	}
+	if tc.Foo != nil {
+		t.Fatalf("unexpected result. expected nil got %v", *tc.Foo)
+	}
+}
+
 func TestJsonConfig_Array_Ok(t *testing.T) {
 	json := `{"foo":[2, 3, 4, 5]}`
 	tc := struct {
@@ -347,6 +376,32 @@ func TestJsonConfig_EnvVarInjection_Ok(t *testing.T) {
 	}
 }
 
+func TestJsonConfig_InjectionWithoutEnvVarDefaultValue_Ok(t *testing.T) {
+	json := `{
+		"foo": {
+			"bar": "${.env.JSON_TEST_ENVVAR_INJECTION}"
+		}
+	}`
+	tc := struct {
+		Foo struct {
+			Bar string `json:"bar" default:"foo_bar"`
+		}
+	}{}
+
+	expectedValue := "foo_bar"
+	err := envconf.Parse(&tc,
+		option.WithExternal(jsonconf.Json([]byte(json))),
+		option.WithExternalInjection(),
+	)
+	if err != nil {
+		t.Fatalf("failed to external parse. err=%s", err)
+	}
+
+	if tc.Foo.Bar != expectedValue {
+		t.Fatalf("incorrect result. expected=%s actual=%s", expectedValue, tc.Foo.Bar)
+	}
+}
+
 func TestJsonConfig_EnvVarInjectionFromCollection_Ok(t *testing.T) {
 	json := `{
 		"foo": [{