Make config format a property of the Decoder

Fixes cristalhq#71
avast · May 12, 2021 · fbab766 · fbab766
1 parent 7b5914d
commit fbab766
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 9 deletions.
diff --git a/aconfig.go b/aconfig.go
@@ -8,14 +8,24 @@ import (
 	"strings"
 )
 
+type ConfigFormat string
+
+const (
+	JsonFormat ConfigFormat = "json"
+	YamlFormat ConfigFormat = "yaml"
+	TomlFormat ConfigFormat = "toml"
+	HclFormat ConfigFormat = "hcl"
+	EnvFormat ConfigFormat = "env"
+)
+
 const (
 	defaultValueTag = "default"
 	usageTag        = "usage"
-	jsonNameTag     = "json"
-	yamlNameTag     = "yaml"
-	tomlNameTag     = "toml"
-	hclNameTag      = "hcl"
-	envNameTag      = "env"
+	jsonNameTag     = string(JsonFormat)
+	yamlNameTag     = string(YamlFormat)
+	tomlNameTag     = string(TomlFormat)
+	hclNameTag      = string(HclFormat)
+	envNameTag      = string(EnvFormat)
 	flagNameTag     = "flag"
 )
 
@@ -96,6 +106,11 @@ type FileDecoder interface {
 	DecodeFile(filename string) (map[string]interface{}, error)
 }
 
+type FileDecoderWithFormat interface {
+	FileDecoder
+	FileFormat() ConfigFormat
+}
+
 // Field of the user configuration structure.
 // Done as an interface to export less things in lib.
 type Field interface {
@@ -287,6 +302,9 @@ func (l *Loader) loadFromFile() error {
 		}
 
 		tag := ext[1:]
+		if decFormat, ok := decoder.(FileDecoderWithFormat); ok {
+			tag = string(decFormat.FileFormat())
+		}
 
 		for _, field := range l.fields {
 			name := l.fullTag(field, tag)

diff --git a/aconfigdotenv/dotenv.go b/aconfigdotenv/dotenv.go
@@ -1,6 +1,7 @@
 package aconfigdotenv
 
 import (
+	"github.com/avast/aconfig"
 	"github.com/joho/godotenv"
 )
 
@@ -23,3 +24,7 @@ func (d *Decoder) DecodeFile(filename string) (map[string]interface{}, error) {
 	}
 	return res, nil
 }
+
+func (d *Decoder) FileFormat() aconfig.ConfigFormat {
+	return aconfig.EnvFormat
+}
diff --git a/aconfigdotenv/go.mod b/aconfigdotenv/go.mod
@@ -3,6 +3,6 @@ module github.com/avast/aconfig/aconfigdotenv
 go 1.15
 
 require (
-	github.com/avast/aconfig v0.11.4
+	github.com/avast/aconfig v0.14.0
 	github.com/joho/godotenv v1.3.0
 )
diff --git a/aconfighcl/go.mod b/aconfighcl/go.mod
@@ -3,6 +3,6 @@ module github.com/avast/aconfig/aconfighcl
 go 1.15
 
 require (
-	github.com/avast/aconfig v0.11.4
+	github.com/avast/aconfig v0.14.0
 	github.com/hashicorp/hcl v1.0.0
 )
diff --git a/aconfighcl/hcl.go b/aconfighcl/hcl.go
@@ -1,6 +1,7 @@
 package aconfighcl
 
 import (
+	"github.com/avast/aconfig"
 	"io/ioutil"
 
 	"github.com/hashicorp/hcl"
@@ -30,3 +31,7 @@ func (d *Decoder) DecodeFile(filename string) (map[string]interface{}, error) {
 	}
 	return raw, nil
 }
+
+func (d *Decoder) FileFormat() aconfig.ConfigFormat {
+	return aconfig.HclFormat
+}
diff --git a/aconfigtoml/go.mod b/aconfigtoml/go.mod
@@ -4,5 +4,5 @@ go 1.15
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/avast/aconfig v0.11.1
+	github.com/avast/aconfig v0.14.0
 )
diff --git a/aconfigtoml/toml.go b/aconfigtoml/toml.go
@@ -1,6 +1,7 @@
 package aconfigtoml
 
 import (
+	"github.com/avast/aconfig"
 	"os"
 
 	"github.com/BurntSushi/toml"
@@ -26,3 +27,7 @@ func (d *Decoder) DecodeFile(filename string) (map[string]interface{}, error) {
 	}
 	return raw, nil
 }
+
+func (d *Decoder) FileFormat() aconfig.ConfigFormat {
+	return aconfig.TomlFormat
+}
diff --git a/aconfigyaml/go.mod b/aconfigyaml/go.mod
@@ -3,6 +3,6 @@ module github.com/avast/aconfig/aconfigyaml
 go 1.15
 
 require (
-	github.com/avast/aconfig v0.11.1
+	github.com/avast/aconfig v0.14.0
 	gopkg.in/yaml.v2 v2.3.0
 )
diff --git a/aconfigyaml/yaml.go b/aconfigyaml/yaml.go
@@ -1,6 +1,7 @@
 package aconfigyaml
 
 import (
+	"github.com/avast/aconfig"
 	"os"
 
 	"gopkg.in/yaml.v2"
@@ -26,3 +27,7 @@ func (d *Decoder) DecodeFile(filename string) (map[string]interface{}, error) {
 	}
 	return raw, nil
 }
+
+func (d *Decoder) FileFormat() aconfig.ConfigFormat {
+	return aconfig.YamlFormat
+}
diff --git a/utils.go b/utils.go
@@ -134,6 +134,10 @@ func (d *jsonDecoder) DecodeFile(filename string) (map[string]interface{}, error
 	return raw, nil
 }
 
+func (d *jsonDecoder) FileFormat() ConfigFormat {
+	return JsonFormat
+}
+
 func normalize(curr interface{}) interface{} {
 	switch curr := curr.(type) {
 	case []interface{}: