return LoaderFunc from predefined loaders

gojekfarm · Aug 23, 2023 · e1a7788 · e1a7788
1 parent 0d9015b
commit e1a7788
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 27 deletions.
diff --git a/examples/xload/main.go b/examples/xload/main.go
@@ -38,11 +38,9 @@ func main() {
 		ctx,
 		cfg,
 		xload.FieldTagName("env"),
-		xload.WithLoader(
-			xload.SerialLoader(
-				yamlLoader,
-				xload.OSLoader(), // OSLoader values take precedence over yaml
-			),
+		xload.SerialLoader(
+			yamlLoader,
+			xload.OSLoader(), // OSLoader values take precedence over yaml
 		),
 	)
 	if err != nil {
@@ -74,11 +72,9 @@ func main() {
 		rcfg,
 		xload.Concurrency(5), // use xload.Concurrency to load values concurrently
 		xload.FieldTagName("env"),
-		xload.WithLoader(
-			xload.SerialLoader(
-				reqYamlLoader,
-				businessConfigLoader(), // businessConfigLoader values take precedence over yaml
-			),
+		xload.SerialLoader(
+			reqYamlLoader,
+			businessConfigLoader(), // businessConfigLoader values take precedence over yaml
 		),
 	)
 	if err != nil {

diff --git a/xload/async_test.go b/xload/async_test.go
@@ -33,7 +33,7 @@ func TestLoad_Async(t *testing.T) {
 
 	err := Load(context.Background(), &cfg,
 		Concurrency(3),
-		WithLoader(LoaderFunc(loader)),
+		LoaderFunc(loader),
 	)
 	assert.NoError(t, err)
 
@@ -87,7 +87,7 @@ func TestLoad_Async_Error(t *testing.T) {
 
 	err := Load(context.Background(), &cfg,
 		Concurrency(2),
-		WithLoader(LoaderFunc(loader)),
+		LoaderFunc(loader),
 	)
 	assert.Error(t, err)
 

diff --git a/xload/example_test.go b/xload/example_test.go
@@ -58,7 +58,7 @@ func ExampleLoad_customLoader() {
 		context.Background(),
 		&conf,
 		xload.FieldTagName("env"),
-		xload.WithLoader(loader),
+		loader,
 	)
 	if err != nil {
 		panic(err)
@@ -159,19 +159,19 @@ func ExampleLoad_transformFieldName() {
 	var conf AppConf
 
 	// transform converts key from MYAPP_HOST to myapp.host
-	transform := func(next xload.Loader) xload.Loader {
-		return xload.LoaderFunc(func(ctx context.Context, key string) (string, error) {
+	transform := func(next xload.Loader) xload.LoaderFunc {
+		return func(ctx context.Context, key string) (string, error) {
 			newKey := strings.ReplaceAll(key, "_", ".")
 			newKey = strings.ToLower(newKey)
 
 			return next.Load(ctx, newKey)
-		})
+		}
 	}
 
 	err := xload.Load(
 		context.Background(),
 		&conf,
-		xload.WithLoader(transform(xload.OSLoader())),
+		transform(xload.OSLoader()),
 	)
 	if err != nil {
 		panic(err)
@@ -270,7 +270,7 @@ func ExampleLoad_concurrentLoading() {
 		&conf,
 		xload.Concurrency(3), // load 3 keys concurrently
 		xload.FieldTagName("env"),
-		xload.WithLoader(loader),
+		loader,
 	)
 	if err != nil {
 		panic(err)

diff --git a/xload/loader.go b/xload/loader.go
@@ -24,21 +24,21 @@ func PrefixLoader(prefix string, loader Loader) LoaderFunc {
 }
 
 // OSLoader loads values from the OS environment.
-func OSLoader() Loader {
-	return LoaderFunc(func(ctx context.Context, key string) (string, error) {
+func OSLoader() LoaderFunc {
+	return func(ctx context.Context, key string) (string, error) {
 		v, ok := os.LookupEnv(key)
 		if !ok {
 			return "", nil
 		}
 
 		return v, nil
-	})
+	}
 }
 
 // SerialLoader loads values from multiple loaders.
 // Last non-empty value wins.
-func SerialLoader(loaders ...Loader) Loader {
-	return LoaderFunc(func(ctx context.Context, key string) (string, error) {
+func SerialLoader(loaders ...Loader) LoaderFunc {
+	return func(ctx context.Context, key string) (string, error) {
 		var lastNonEmpty string
 
 		for _, loader := range loaders {
@@ -53,7 +53,7 @@ func SerialLoader(loaders ...Loader) Loader {
 		}
 
 		return lastNonEmpty, nil
-	})
+	}
 }
 
 func (f LoaderFunc) apply(opts *options) { opts.loader = f }
diff --git a/xload/maps.go b/xload/maps.go
@@ -28,6 +28,8 @@ func FlattenMap(m map[string]interface{}, sep string) map[string]string {
 	return flatten(m, "", sep)
 }
 
+func (m MapLoader) apply(opts *options) { opts.loader = m }
+
 func flatten(m map[string]interface{}, prefix string, sep string) map[string]string {
 	flattened := make(map[string]string)
 

diff --git a/xload/options_test.go b/xload/options_test.go
@@ -36,7 +36,7 @@ func TestOptions(t *testing.T) {
 		},
 		{
 			name: "loader",
-			opts: []Option{WithLoader(MapLoader{"A": "1"})},
+			opts: []Option{MapLoader{"A": "1"}},
 			want: &options{
 				tagName:     defaultKey,
 				loader:      MapLoader{"A": "1"},

diff --git a/xload/providers/yaml/example_test.go b/xload/providers/yaml/example_test.go
@@ -32,7 +32,7 @@ func Example() {
 		panic(err)
 	}
 
-	err = xload.Load(ctx, &cfg, xload.WithLoader(loader))
+	err = xload.Load(ctx, &cfg, loader)
 	if err != nil {
 		panic(err)
 	}
@@ -73,7 +73,7 @@ func Example_nestedStruct() {
 		panic(err)
 	}
 
-	err = xload.Load(ctx, &cfg, xload.WithLoader(loader))
+	err = xload.Load(ctx, &cfg, loader)
 	if err != nil {
 		panic(err)
 	}