From 0ac3aa24bf2e4ada9c26fd9ef5b7f0ae8c6b6cfb Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Mon, 22 Jan 2024 09:06:33 -0500 Subject: Use go-fsimpl to read from datasources (#1336) * Use go-fsimpl to read from datasources Signed-off-by: Dave Henderson * trying to fix windows bug Signed-off-by: Dave Henderson * attempts to fix some of the path madness Signed-off-by: Dave Henderson * remove 'HOME' from expected env vars Signed-off-by: Dave Henderson * more tweaks Signed-off-by: Dave Henderson * lint fix Signed-off-by: Dave Henderson --------- Signed-off-by: Dave Henderson --- funcs/data.go | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'funcs') diff --git a/funcs/data.go b/funcs/data.go index e9ce7fa5..32f5b2da 100644 --- a/funcs/data.go +++ b/funcs/data.go @@ -5,6 +5,7 @@ import ( "github.com/hairyhenderson/gomplate/v4/conv" "github.com/hairyhenderson/gomplate/v4/data" + "github.com/hairyhenderson/gomplate/v4/internal/parsers" ) // DataNS - @@ -65,75 +66,75 @@ type DataFuncs struct { // JSON - func (f *DataFuncs) JSON(in interface{}) (map[string]interface{}, error) { - return data.JSON(conv.ToString(in)) + return parsers.JSON(conv.ToString(in)) } // JSONArray - func (f *DataFuncs) JSONArray(in interface{}) ([]interface{}, error) { - return data.JSONArray(conv.ToString(in)) + return parsers.JSONArray(conv.ToString(in)) } // YAML - func (f *DataFuncs) YAML(in interface{}) (map[string]interface{}, error) { - return data.YAML(conv.ToString(in)) + return parsers.YAML(conv.ToString(in)) } // YAMLArray - func (f *DataFuncs) YAMLArray(in interface{}) ([]interface{}, error) { - return data.YAMLArray(conv.ToString(in)) + return parsers.YAMLArray(conv.ToString(in)) } // TOML - func (f *DataFuncs) TOML(in interface{}) (interface{}, error) { - return data.TOML(conv.ToString(in)) + return parsers.TOML(conv.ToString(in)) } // CSV - func (f *DataFuncs) CSV(args ...string) ([][]string, error) { - return data.CSV(args...) + return parsers.CSV(args...) } // CSVByRow - func (f *DataFuncs) CSVByRow(args ...string) (rows []map[string]string, err error) { - return data.CSVByRow(args...) + return parsers.CSVByRow(args...) } // CSVByColumn - func (f *DataFuncs) CSVByColumn(args ...string) (cols map[string][]string, err error) { - return data.CSVByColumn(args...) + return parsers.CSVByColumn(args...) } // CUE - func (f *DataFuncs) CUE(in interface{}) (interface{}, error) { - return data.CUE(conv.ToString(in)) + return parsers.CUE(conv.ToString(in)) } // ToCSV - func (f *DataFuncs) ToCSV(args ...interface{}) (string, error) { - return data.ToCSV(args...) + return parsers.ToCSV(args...) } // ToCUE - func (f *DataFuncs) ToCUE(in interface{}) (string, error) { - return data.ToCUE(in) + return parsers.ToCUE(in) } // ToJSON - func (f *DataFuncs) ToJSON(in interface{}) (string, error) { - return data.ToJSON(in) + return parsers.ToJSON(in) } // ToJSONPretty - func (f *DataFuncs) ToJSONPretty(indent string, in interface{}) (string, error) { - return data.ToJSONPretty(indent, in) + return parsers.ToJSONPretty(indent, in) } // ToYAML - func (f *DataFuncs) ToYAML(in interface{}) (string, error) { - return data.ToYAML(in) + return parsers.ToYAML(in) } // ToTOML - func (f *DataFuncs) ToTOML(in interface{}) (string, error) { - return data.ToTOML(in) + return parsers.ToTOML(in) } -- cgit v1.2.3