Merge pull request #232 from bitnami-labs/upgrade

Upgrade to yaml.v3

config/config.go

@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 // ConfigFileName stores file of config
@@ -231,17 +231,15 @@ func (c *Config) CheckMissingResourceEnvvars() {
 }
 
 func (c *Config) Write() error {
-	b, err := yaml.Marshal(c)
+	f, err := os.OpenFile(getConfigFile(), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
 	if err != nil {
 		return err
 	}
+	defer f.Close()
 
-	err = ioutil.WriteFile(getConfigFile(), b, 0644)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	enc := yaml.NewEncoder(f)
+	enc.SetIndent(2) // compat with old versions of kubewatch
+	return enc.Encode(c)
 }
 
 func getConfigFile() string {

go.mod

@@ -26,7 +26,8 @@ require (
 	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 // indirect
 	golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/yaml.v2 v2.3.0
+	gopkg.in/yaml.v2 v2.3.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
 	k8s.io/api v0.16.8
 	k8s.io/apimachinery v0.16.8
 	k8s.io/client-go v0.16.8