golang/config-loader
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[feat] add load opts fromEnv #3

Merged
root merged 3 commits from feature/add-from-env-config into develop 2020-06-11 03:04:37 +00:00
Conversation 0 Commits 3 Files Changed 5 +4 -6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 855a1f508c - Show all commits

10
loader_test.go
View File

@ -67,7 +67,6 @@ func TestLoad(t *testing.T) {
{ {
name: "test load json file with default", name: "test load json file with default",
args: args{ args: args{
i: &Config{},
opts: &LoadOptions{ opts: &LoadOptions{
ConfigFile: &ConfigFile{ ConfigFile: &ConfigFile{
Type: ConfigFileTypeJSON, Type: ConfigFileTypeJSON,
@ -80,7 +79,6 @@ func TestLoad(t *testing.T) {
{ {
name: "test load yaml file with default", name: "test load yaml file with default",
args: args{ args: args{
i: &Config{},
opts: &LoadOptions{ opts: &LoadOptions{
ConfigFile: &ConfigFile{ ConfigFile: &ConfigFile{
Type: ConfigFileTypeYAML, Type: ConfigFileTypeYAML,
@ -93,7 +91,6 @@ func TestLoad(t *testing.T) {
{ {
name: "test load toml file with default", name: "test load toml file with default",
args: args{ args: args{
i: &Config{},
opts: &LoadOptions{ opts: &LoadOptions{
ConfigFile: &ConfigFile{ ConfigFile: &ConfigFile{
Type: ConfigFileTypeTOML, Type: ConfigFileTypeTOML,
@ -106,7 +103,6 @@ func TestLoad(t *testing.T) {
{ {
name: "test load json file with default and env", name: "test load json file with default and env",
args: args{ args: args{
i: &Config{},
opts: &LoadOptions{ opts: &LoadOptions{
ConfigFile: &ConfigFile{ ConfigFile: &ConfigFile{
Type: ConfigFileTypeJSON, Type: ConfigFileTypeJSON,
@ -120,15 +116,17 @@ func TestLoad(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
src := Config{}
tt.args.i = &src
if err := Load(tt.args.i, tt.args.opts); (err != nil) != tt.wantErr { if err := Load(tt.args.i, tt.args.opts); (err != nil) != tt.wantErr {
t.Errorf("Load() error = %v, wantErr %v", err, tt.wantErr) t.Errorf("Load() error = %v, wantErr %v", err, tt.wantErr)
} }
if tt.args.opts != nil && tt.args.opts.FromEnv { if tt.args.opts != nil && tt.args.opts.FromEnv {
if !reflect.DeepEqual(tt.args.i, expectedWithEnv) { if !reflect.DeepEqual(src, expectedWithEnv) {
t.Errorf("Load and expected not match") t.Errorf("Load and expected not match")
} }
} else { } else {
if !reflect.DeepEqual(tt.args.i, expected) { if !reflect.DeepEqual(src, expected) {
t.Errorf("Load and expected not match") t.Errorf("Load and expected not match")
} }
} }