[Maint] Fix race condition issue

internal/config/data/config.go

@@ -6,7 +6,6 @@ package data
 import (
 	"fmt"
 	"io"
-	"os"
 	"sync"
 
 	"github.com/derailed/k9s/internal/client"
@@ -29,6 +28,8 @@ func NewConfig(ct *api.Context) *Config {
 
 // Validate ensures config is in norms.
 func (c *Config) Validate(conn client.Connection, ks KubeSettings) {
+	c.mx.Lock()
+	defer c.mx.Unlock()
 
 	if c.Context == nil {
 		c.Context = NewContext()
@@ -42,19 +43,3 @@ func (c *Config) Dump(w io.Writer) {
 
 	fmt.Fprintf(w, "%s\n", string(bb))
 }
-
-// Save saves the config to disk.
-func (c *Config) Save(path string) error {
-	c.mx.RLock()
-	defer c.mx.RUnlock()
-
-	if err := EnsureDirPath(path, DefaultDirMod); err != nil {
-		return err
-	}
-	cfg, err := yaml.Marshal(c)
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(path, cfg, DefaultFileMod)
-}

internal/config/data/dir.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"sync"
 
 	"github.com/derailed/k9s/internal/config/json"
 	"github.com/rs/zerolog/log"
@@ -18,6 +19,7 @@ import (
 // Dir tracks context configurations.
 type Dir struct {
 	root string
+	mx   sync.Mutex
 }
 
 // NewDir returns a new instance.
@@ -50,14 +52,32 @@ func (d *Dir) Load(n string, ct *api.Context) (*Config, error) {
 
 func (d *Dir) genConfig(path string, ct *api.Context) (*Config, error) {
 	cfg := NewConfig(ct)
-	if err := cfg.Save(path); err != nil {
+	if err := d.Save(path, cfg); err != nil {
 		return nil, err
 	}
 
 	return cfg, nil
 }
 
+func (d *Dir) Save(path string, c *Config) error {
+	d.mx.Lock()
+	defer d.mx.Unlock()
+
+	if err := EnsureDirPath(path, DefaultDirMod); err != nil {
+		return err
+	}
+	cfg, err := yaml.Marshal(c)
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(path, cfg, DefaultFileMod)
+}
+
 func (d *Dir) loadConfig(path string) (*Config, error) {
+	d.mx.Lock()
+	defer d.mx.Unlock()
+
 	bb, err := os.ReadFile(path)
 	if err != nil {
 		return nil, err

internal/config/k9s.go

@@ -78,7 +78,7 @@ func (k *K9s) Save() error {
 		data.MainConfigFile,
 	)
 
-	return k.getActiveConfig().Save(path)
+	return k.dir.Save(path, k.getActiveConfig())
 }
 
 // Merge merges k9s configs.
@@ -157,7 +157,6 @@ func (k *K9s) ActiveContextName() string {
 
 // ActiveContext returns the currently active context.
 func (k *K9s) ActiveContext() (*data.Context, error) {
-
 	if cfg := k.getActiveConfig(); cfg != nil && cfg.Context != nil {
 		return cfg.Context, nil
 	}

internal/ui/config.go

@@ -214,7 +214,7 @@ func (c *Configurator) activeConfig() (cluster string, context string, ok bool)
 	if err != nil {
 		return
 	}
-	cluster, context = ct.ClusterName, c.Config.K9s.ActiveContextName()
+	cluster, context = ct.GetClusterName(), c.Config.K9s.ActiveContextName()
 	if cluster != "" && context != "" {
 		ok = true
 	}
@@ -254,14 +254,13 @@ func (c *Configurator) loadSkinFile(s synchronizer) {
 	log.Debug().Msgf("Loading skin file: %q", skinFile)
 	if err := c.Styles.Load(skinFile); err != nil {
 		if errors.Is(err, os.ErrNotExist) {
-			s.Flash().Warnf("Skin file %q not found in skins dir: %s", filepath.Base(skinFile), config.AppSkinsDir)
+			log.Warn().Msgf("Skin file %q not found in skins dir: %s", filepath.Base(skinFile), config.AppSkinsDir)
 			c.updateStyles("")
 		} else {
-			s.Flash().Errf("Failed to parse skin file -- %s: %s.", filepath.Base(skinFile), err)
+			log.Error().Msgf("Failed to parse skin file -- %s: %s.", filepath.Base(skinFile), err)
 			c.updateStyles(skinFile)
 		}
 	} else {
-		s.Flash().Infof("Skin file loaded: %q", skinFile)
 		c.updateStyles(skinFile)
 	}
 }

internal/view/ns.go

@@ -70,7 +70,6 @@ func (n *Namespace) useNamespace(fqn string) {
 		return
 	}
 
-	n.App().Flash().Infof("Namespace %s is now active!", ns)
 	if err := n.App().Config.Save(); err != nil {
 		log.Error().Err(err).Msg("Config file save failed!")
 	}