fix test

Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>

Author: SungJin1212

integration/utf8_test.go

@@ -133,7 +133,7 @@ overrides:
 	require.NoError(t, writeFileToSharedDir(s, "alertmanager_configs", []byte{}))
 
 	// Start Cortex.
-	cortex := e2ecortex.NewSingleBinary("cortex", flags, "", 9009, 9095)
+	cortex := e2ecortex.NewSingleBinary("cortex", flags, "")
 	require.NoError(t, s.StartAndWaitReady(cortex))
 
 	groupLabels := map[string]string{
@@ -215,9 +215,9 @@ func Test_PushQuery_UTF8(t *testing.T) {
 
 	metadata := []prompb.MetricMetadata{
 		{
-			MetricFamilyName: fmt.Sprintf("metadata.name"),
-			Help:             fmt.Sprintf("metadata.help"),
-			Unit:             fmt.Sprintf("metadata.unit"),
+			MetricFamilyName: "metadata.name",
+			Help:             "metadata.help",
+			Unit:             "metadata.unit",
 		},
 	}
 

pkg/cortex/cortex.go

@@ -383,7 +383,7 @@ func New(cfg Config) (*Cortex, error) {
 	}
 
 	// set name validation scheme
-	model.NameValidationScheme = cfg.NameValidationScheme
+	model.NameValidationScheme = cfg.NameValidationScheme //nolint:staticcheck
 
 	cortex.setupThanosTracing()
 	cortex.setupGRPCHeaderForwarding()

pkg/cortex/cortex_test.go

@@ -46,6 +46,7 @@ func TestCortex(t *testing.T) {
 		// these values are set as defaults but since we aren't registering them, we
 		// need to include the defaults here. These were hardcoded in a previous version
 		// of weaveworks server.
+		NameValidationScheme: model.LegacyValidation,
 		Server: server.Config{
 			GRPCListenNetwork: server.DefaultNetwork,
 			HTTPListenNetwork: server.DefaultNetwork,
@@ -252,9 +253,10 @@ func TestGrpcAuthMiddleware(t *testing.T) {
 	prepareGlobalMetricsRegistry(t)
 
 	cfg := Config{
-		AuthEnabled: true, // We must enable this to enable Auth middleware for gRPC server.
-		Server:      getServerConfig(t),
-		Target:      []string{API}, // Something innocent that doesn't require much config.
+		AuthEnabled:          true, // We must enable this to enable Auth middleware for gRPC server.
+		Server:               getServerConfig(t),
+		Target:               []string{API}, // Something innocent that doesn't require much config.
+		NameValidationScheme: model.LegacyValidation,
 	}
 
 	msch := &mockGrpcServiceHandler{}

pkg/distributor/distributor_test.go

@@ -3198,8 +3198,6 @@ func prepare(tb testing.TB, cfg prepConfig) ([]*Distributor, []*mockIngester, []
 		if cfg.nameValidationScheme == model.UTF8Validation {
 			distributorCfg.NameValidationScheme = cfg.nameValidationScheme
 		}
-		// set name validation scheme
-		model.NameValidationScheme = distributorCfg.NameValidationScheme
 
 		if cfg.shuffleShardEnabled {
 			distributorCfg.ShardingStrategy = util.ShardingStrategyShuffle

pkg/util/validation/limits_test.go

@@ -125,23 +125,29 @@ func TestLimits_Validate(t *testing.T) {
 			expected: errInvalidLabelValue,
 		},
 		"utf8: external-labels utf8 label name and value": {
-			limits:   Limits{RulerExternalLabels: labels.FromStrings("test.utf8.metric", "😄")},
-			expected: nil,
+			limits:               Limits{RulerExternalLabels: labels.FromStrings("test.utf8.metric", "😄")},
+			expected:             nil,
+			nameValidationScheme: model.UTF8Validation,
 		},
 		"utf8: external-labels invalid label name": {
-			limits:   Limits{RulerExternalLabels: labels.FromStrings("test.\xc5.metric", "😄")},
-			expected: errInvalidLabelName,
+			limits:               Limits{RulerExternalLabels: labels.FromStrings("test.\xc5.metric", "😄")},
+			expected:             errInvalidLabelName,
+			nameValidationScheme: model.UTF8Validation,
 		},
 		"utf8: external-labels invalid label value": {
-			limits:   Limits{RulerExternalLabels: labels.FromStrings("test.utf8.metric", "test.\xc5.value")},
-			expected: errInvalidLabelValue,
+			limits:               Limits{RulerExternalLabels: labels.FromStrings("test.utf8.metric", "test.\xc5.value")},
+			expected:             errInvalidLabelValue,
+			nameValidationScheme: model.UTF8Validation,
 		},
 	}
 
 	for testName, testData := range tests {
-
 		t.Run(testName, func(t *testing.T) {
-			assert.ErrorIs(t, testData.limits.Validate(testData.nameValidationScheme, testData.shardByAllLabels, testData.activeSeriesMetricsEnabled), testData.expected)
+			nameValidationScheme := model.LegacyValidation
+			if testData.nameValidationScheme == model.UTF8Validation {
+				nameValidationScheme = testData.nameValidationScheme
+			}
+			assert.ErrorIs(t, testData.limits.Validate(nameValidationScheme, testData.shardByAllLabels, testData.activeSeriesMetricsEnabled), testData.expected)
 		})
 	}
 }