adds config format arg to read

shubhang93 · Aug 14, 2024 · 4408c2a · 4408c2a
1 parent 683311d
commit 4408c2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -65,10 +65,10 @@ func ReadFromFile(path string) (TPLAgent, error) {
 	if err != nil {
 		return TPLAgent{}, fatal.NewError(fmt.Errorf("read config:%w", err))
 	}
-	return Read(confFile)
+	return Read(confFile, "json")
 }
 
-func Read(rr io.Reader) (TPLAgent, error) {
+func Read(rr io.Reader, configFormat string) (TPLAgent, error) {
 	var c TPLAgent
 	if err := json.NewDecoder(rr).Decode(&c); err != nil {
 		return TPLAgent{}, fatal.NewError(fmt.Errorf("config decode error:%w", err))

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -132,7 +132,7 @@ func Test_readConfig(t *testing.T) {
 				},
 			},
 		}
-		c, err := Read(strings.NewReader(configJSON))
+		c, err := Read(strings.NewReader(configJSON), "json")
 		if err != nil {
 			t.Errorf("error reading config:%v", err)
 			return
@@ -195,7 +195,7 @@ func Test_readConfig(t *testing.T) {
   }
 }
 `
-		conf, err := Read(strings.NewReader(configJSON))
+		conf, err := Read(strings.NewReader(configJSON), "json")
 		if err != nil {
 			t.Errorf("error reading config:%v\n", err)
 			return
@@ -240,7 +240,7 @@ func Test_config_fatalErrors(t *testing.T) {
 		buff.Reset()
 		buff.Write(jsonCfg)
 
-		_, err = Read(&buff)
+		_, err = Read(&buff, "json")
 		if !fatal.Is(err) {
 			t.Error("expected fatal error")
 			return
@@ -273,7 +273,7 @@ func Test_config_fatalErrors(t *testing.T) {
 			return
 		}
 
-		_, err = Read(&buff)
+		_, err = Read(&buff, "json")
 		if !fatal.Is(err) {
 			t.Error("expected fatal error")
 		}