Config: Improve caching tests in config_cluster.go

Signed-off-by: Michael Mayer <[email protected]>

Author: lastzero

internal/config/config.go

@@ -172,6 +172,9 @@ func NewConfig(ctx *cli.Context) *Config {
 	if optionsYaml := c.OptionsYaml(); fs.FileExists(optionsYaml) {
 		if err := c.options.Load(optionsYaml); err != nil {
 			log.Warnf("config: failed loading values from %s (%s)", clean.Log(optionsYaml), err)
+		} else if c.env == EnvDevelop {
+			// Reduce the log level to minimize noise in the test logs.
+			log.Tracef("config: overriding config with values from %s", clean.Log(optionsYaml))
 		} else {
 			log.Debugf("config: overriding config with values from %s", clean.Log(optionsYaml))
 		}

internal/config/config_cluster.go

@@ -203,8 +203,15 @@ func (c *Config) SaveJoinToken(customToken string) (token string, fileName strin
 		return "", "", fmt.Errorf("could not write cluster join token (%w)", err)
 	}
 
+	// Use an in-memory cache with a
+	// short TTL to cache the token.
 	if c.cache != nil {
 		c.cache.SetDefault(fileName, token)
+		c.options.JoinToken = ""
+	} else {
+		// Store token in Options
+		// if cache is unavailable.
+		c.options.JoinToken = token
 	}
 
 	return token, fileName, nil

internal/config/config_cluster_test.go

@@ -289,8 +289,11 @@ func TestConfig_Cluster(t *testing.T) {
 		c := NewConfig(ctx)
 		c.options.NodeRole = cluster.RolePortal
 
+		c.options.JoinToken = "onwnOVt-MZCCkA0z-YJXHnzJ"
 		token, tokenFile, err := c.SaveJoinToken("")
 		assert.NoError(t, err)
+		assert.Empty(t, c.options.JoinToken)
+		assert.Equal(t, token, c.JoinToken())
 		assert.True(t, rnd.IsJoinToken(token, false))
 		assert.FileExists(t, tokenFile)