move "memberlist" to a const

Signed-off-by: Trevor Whitney <trevorjwhitney@gmail.com>
grafana · Oct 7, 2021 · 0c71dba · 0c71dba
1 parent e424763
commit 0c71dba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/pkg/loki/config_wrapper.go b/pkg/loki/config_wrapper.go
@@ -43,6 +43,8 @@ func (c *ConfigWrapper) Clone() flagext.Registerer {
 	}(*c)
 }
 
+const memberlistStr = "memberlist"
+
 // ApplyDynamicConfig satisfies WithCommonCloneable interface, and applies all rules for setting Loki
 // config values from the common section of the Loki config file.
 // This method's purpose is to simplify Loki's config in an opinionated way so that Loki can be run
@@ -70,9 +72,9 @@ func (c *ConfigWrapper) ApplyDynamicConfig() cfg.Source {
 		}
 
 		if len(r.MemberlistKV.JoinMembers) > 0 {
-			r.Ingester.LifecyclerConfig.RingConfig.KVStore.Store = "memberlist"
-			r.Distributor.DistributorRing.KVStore.Store = "memberlist"
-			r.Ruler.Ring.KVStore.Store = "memberlist"
+			r.Ingester.LifecyclerConfig.RingConfig.KVStore.Store = memberlistStr
+			r.Distributor.DistributorRing.KVStore.Store = memberlistStr
+			r.Ruler.Ring.KVStore.Store = memberlistStr
 		}
 
 		return nil

diff --git a/pkg/loki/config_wrapper_test.go b/pkg/loki/config_wrapper_test.go
@@ -108,9 +108,9 @@ memberlist:
 
 			config, _ := testContext(configFileString, nil)
 
-			assert.EqualValues(t, "memberlist", config.Ingester.LifecyclerConfig.RingConfig.KVStore.Store)
-			assert.EqualValues(t, "memberlist", config.Distributor.DistributorRing.KVStore.Store)
-			assert.EqualValues(t, "memberlist", config.Ruler.Ring.KVStore.Store)
+			assert.EqualValues(t, memberlistStr, config.Ingester.LifecyclerConfig.RingConfig.KVStore.Store)
+			assert.EqualValues(t, memberlistStr, config.Distributor.DistributorRing.KVStore.Store)
+			assert.EqualValues(t, memberlistStr, config.Ruler.Ring.KVStore.Store)
 		})
 
 		t.Run("explicit ring configs provided via config file are preserved", func(t *testing.T) {
@@ -127,8 +127,8 @@ distributor:
 
 			assert.EqualValues(t, "etcd", config.Distributor.DistributorRing.KVStore.Store)
 
-			assert.EqualValues(t, "memberlist", config.Ingester.LifecyclerConfig.RingConfig.KVStore.Store)
-			assert.EqualValues(t, "memberlist", config.Ruler.Ring.KVStore.Store)
+			assert.EqualValues(t, memberlistStr, config.Ingester.LifecyclerConfig.RingConfig.KVStore.Store)
+			assert.EqualValues(t, memberlistStr, config.Ruler.Ring.KVStore.Store)
 		})
 
 		t.Run("explicit ring configs provided via command line are preserved", func(t *testing.T) {
@@ -141,8 +141,8 @@ memberlist:
 
 			assert.EqualValues(t, "inmemory", config.Ruler.Ring.KVStore.Store)
 
-			assert.EqualValues(t, "memberlist", config.Ingester.LifecyclerConfig.RingConfig.KVStore.Store)
-			assert.EqualValues(t, "memberlist", config.Distributor.DistributorRing.KVStore.Store)
+			assert.EqualValues(t, memberlistStr, config.Ingester.LifecyclerConfig.RingConfig.KVStore.Store)
+			assert.EqualValues(t, memberlistStr, config.Distributor.DistributorRing.KVStore.Store)
 		})
 	})
 }