@@ -2,18 +2,16 @@ package utils
22
33import (
44 "encoding/json"
5- "fmt"
5+
6+ "github.com/mattfenwick/collections/pkg/file"
67 "github.com/pkg/errors"
7- log "github.com/sirupsen/logrus"
8- "io/fs"
9- "io/ioutil"
10- "os"
8+ "github.com/sirupsen/logrus"
119 "sigs.k8s.io/yaml"
1210)
1311
1412func DoOrDie (err error ) {
1513 if err != nil {
16- log .Fatalf ("%+v" , err )
14+ logrus .Fatalf ("%+v" , err )
1715 }
1816}
1917
@@ -23,28 +21,6 @@ func JsonStringNoIndent(obj interface{}) string {
2321 return string (bytes )
2422}
2523
26- func JsonString (obj interface {}) string {
27- bytes , err := json .MarshalIndent (obj , "" , " " )
28- DoOrDie (errors .Wrapf (err , "unable to marshal json" ))
29- return string (bytes )
30- }
31-
32- func ParseJson [T any ](bs []byte ) (* T , error ) {
33- var t T
34- if err := json .Unmarshal (bs , & t ); err != nil {
35- return nil , errors .Wrapf (err , "unable to unmarshal json" )
36- }
37- return & t , nil
38- }
39-
40- func ParseJsonFromFile [T any ](path string ) (* T , error ) {
41- bytes , err := ReadFileBytes (path )
42- if err != nil {
43- return nil , err
44- }
45- return ParseJson [T ](bytes )
46- }
47-
4824func ParseYaml [T any ](bs []byte ) (* T , error ) {
4925 var t T
5026 if err := yaml .Unmarshal (bs , & t ); err != nil {
@@ -62,15 +38,15 @@ func ParseYamlStrict[T any](bs []byte) (*T, error) {
6238}
6339
6440func ParseYamlFromFile [T any ](path string ) (* T , error ) {
65- bytes , err := ReadFileBytes (path )
41+ bytes , err := file . Read (path )
6642 if err != nil {
6743 return nil , err
6844 }
6945 return ParseYaml [T ](bytes )
7046}
7147
7248func ParseYamlFromFileStrict [T any ](path string ) (* T , error ) {
73- bytes , err := ReadFileBytes (path )
49+ bytes , err := file . Read (path )
7450 if err != nil {
7551 return nil , err
7652 }
@@ -82,49 +58,3 @@ func YamlString(obj interface{}) string {
8258 DoOrDie (errors .Wrapf (err , "unable to marshal yaml" ))
8359 return string (bytes )
8460}
85-
86- func PrintJson (obj interface {}) {
87- fmt .Printf ("%s\n " , JsonString (obj ))
88- }
89-
90- func DumpJSON (obj interface {}) string {
91- bytes , err := json .MarshalIndent (obj , "" , " " )
92- DoOrDie (err )
93- return string (bytes )
94- }
95-
96- func WriteJsonToFile (obj interface {}, path string ) error {
97- content := DumpJSON (obj )
98- return WriteFile (path , content , 0644 )
99- }
100-
101- func PrintJSON (obj interface {}) {
102- fmt .Printf ("%s\n " , DumpJSON (obj ))
103- }
104-
105- func DoesFileExist (path string ) bool {
106- if _ , err := os .Stat (path ); err == nil {
107- return true
108- } else if errors .Is (err , os .ErrNotExist ) {
109- return false
110- } else {
111- panic (errors .Wrapf (err , "unable to determine if file %s exists" , path ))
112- }
113- }
114-
115- // WriteFile wraps calls to ioutil.WriteFile, ensuring that errors are wrapped in a stack trace
116- func WriteFile (filename string , contents string , perm fs.FileMode ) error {
117- return errors .Wrapf (ioutil .WriteFile (filename , []byte (contents ), perm ), "unable to write file %s" , filename )
118- }
119-
120- // ReadFile wraps calls to ioutil.ReadFile, ensuring that errors are wrapped in a stack trace
121- func ReadFile (filename string ) (string , error ) {
122- bytes , err := ioutil .ReadFile (filename )
123- return string (bytes ), errors .Wrapf (err , "unable to read file %s" , filename )
124- }
125-
126- // ReadFileBytes wraps calls to ioutil.ReadFile, ensuring that errors are wrapped in a stack trace
127- func ReadFileBytes (filename string ) ([]byte , error ) {
128- bytes , err := ioutil .ReadFile (filename )
129- return bytes , errors .Wrapf (err , "unable to read file %s" , filename )
130- }
0 commit comments