From 688c4cd28bcb4c3a36ffc7e7f2dd73f708ae5506 Mon Sep 17 00:00:00 2001
From: Sergey Kozlov <s.kozlov@ctrl2go.solutions>
Date: Fri, 27 Sep 2024 18:18:24 +0300
Subject: [PATCH] feat: set custom tag name for envPrefix

* Support other names for envPrefix
---
 env.go      | 11 ++++++++++-
 env_test.go | 23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/env.go b/env.go
index fd2f1692..a991ce2f 100644
--- a/env.go
+++ b/env.go
@@ -135,6 +135,9 @@ type Options struct {
 	// TagName specifies another tag name to use rather than the default 'env'.
 	TagName string
 
+	// PrefixTagName specifies another prefix tag name to use rather than the default 'envPrefix'.
+	PrefixTagName string
+
 	// DefaultValueTagName specifies another default tag name to use rather than the default 'envDefault'.
 	DefaultValueTagName string
 
@@ -173,6 +176,7 @@ func (opts *Options) getRawEnv(s string) string {
 func defaultOptions() Options {
 	return Options{
 		TagName:             "env",
+		PrefixTagName:       "envPrefix",
 		DefaultValueTagName: "envDefault",
 		Environment:         toMap(os.Environ()),
 		FuncMap:             defaultTypeParsers(),
@@ -185,6 +189,9 @@ func customOptions(opt Options) Options {
 	if opt.TagName == "" {
 		opt.TagName = defOpts.TagName
 	}
+	if opt.PrefixTagName == "" {
+		opt.PrefixTagName = defOpts.PrefixTagName
+	}
 	if opt.DefaultValueTagName == "" {
 		opt.DefaultValueTagName = defOpts.DefaultValueTagName
 	}
@@ -209,6 +216,7 @@ func optionsWithSliceEnvPrefix(opts Options, index int) Options {
 	return Options{
 		Environment:           opts.Environment,
 		TagName:               opts.TagName,
+		PrefixTagName:         opts.PrefixTagName,
 		DefaultValueTagName:   opts.DefaultValueTagName,
 		RequiredIfNoDef:       opts.RequiredIfNoDef,
 		OnSet:                 opts.OnSet,
@@ -223,10 +231,11 @@ func optionsWithEnvPrefix(field reflect.StructField, opts Options) Options {
 	return Options{
 		Environment:           opts.Environment,
 		TagName:               opts.TagName,
+		PrefixTagName:         opts.PrefixTagName,
 		DefaultValueTagName:   opts.DefaultValueTagName,
 		RequiredIfNoDef:       opts.RequiredIfNoDef,
 		OnSet:                 opts.OnSet,
-		Prefix:                opts.Prefix + field.Tag.Get("envPrefix"),
+		Prefix:                opts.Prefix + field.Tag.Get(opts.PrefixTagName),
 		UseFieldNameByDefault: opts.UseFieldNameByDefault,
 		FuncMap:               opts.FuncMap,
 		rawEnvVars:            opts.rawEnvVars,
diff --git a/env_test.go b/env_test.go
index 121edc54..08e643b4 100644
--- a/env_test.go
+++ b/env_test.go
@@ -2190,3 +2190,26 @@ func TestParseWithOptionsRenamedDefault(t *testing.T) {
 	isNoErr(t, Parse(cfg))
 	isEqual(t, "foo", cfg.Str)
 }
+
+func TestParseWithOptionsRenamedPrefix(t *testing.T) {
+	type Config struct {
+		Str string `env:"STR"`
+	}
+	type ComplexConfig struct {
+		Foo Config `envPrefix:"FOO_" myPrefix:"BAR_"`
+	}
+
+	t.Setenv("FOO_STR", "101")
+	t.Setenv("BAR_STR", "202")
+	t.Setenv("APP_BAR_STR", "303")
+
+	cfg := &ComplexConfig{}
+	isNoErr(t, ParseWithOptions(cfg, Options{PrefixTagName: "myPrefix"}))
+	isEqual(t, "202", cfg.Foo.Str)
+
+	isNoErr(t, ParseWithOptions(cfg, Options{PrefixTagName: "myPrefix", Prefix: "APP_"}))
+	isEqual(t, "303", cfg.Foo.Str)
+
+	isNoErr(t, Parse(cfg))
+	isEqual(t, "101", cfg.Foo.Str)
+}