@@ -125,23 +125,29 @@ func TestLimits_Validate(t *testing.T) {
125125			expected : errInvalidLabelValue ,
126126		},
127127		"utf8: external-labels utf8 label name and value" : {
128- 			limits :   Limits {RulerExternalLabels : labels .FromStrings ("test.utf8.metric" , "😄" )},
129- 			expected : nil ,
128+ 			limits :               Limits {RulerExternalLabels : labels .FromStrings ("test.utf8.metric" , "😄" )},
129+ 			expected :             nil ,
130+ 			nameValidationScheme : model .UTF8Validation ,
130131		},
131132		"utf8: external-labels invalid label name" : {
132- 			limits :   Limits {RulerExternalLabels : labels .FromStrings ("test.\xc5 .metric" , "😄" )},
133- 			expected : errInvalidLabelName ,
133+ 			limits :               Limits {RulerExternalLabels : labels .FromStrings ("test.\xc5 .metric" , "😄" )},
134+ 			expected :             errInvalidLabelName ,
135+ 			nameValidationScheme : model .UTF8Validation ,
134136		},
135137		"utf8: external-labels invalid label value" : {
136- 			limits :   Limits {RulerExternalLabels : labels .FromStrings ("test.utf8.metric" , "test.\xc5 .value" )},
137- 			expected : errInvalidLabelValue ,
138+ 			limits :               Limits {RulerExternalLabels : labels .FromStrings ("test.utf8.metric" , "test.\xc5 .value" )},
139+ 			expected :             errInvalidLabelValue ,
140+ 			nameValidationScheme : model .UTF8Validation ,
138141		},
139142	}
140143
141144	for  testName , testData  :=  range  tests  {
142- 
143145		t .Run (testName , func (t  * testing.T ) {
144- 			assert .ErrorIs (t , testData .limits .Validate (testData .nameValidationScheme , testData .shardByAllLabels , testData .activeSeriesMetricsEnabled ), testData .expected )
146+ 			nameValidationScheme  :=  model .LegacyValidation 
147+ 			if  testData .nameValidationScheme  ==  model .UTF8Validation  {
148+ 				nameValidationScheme  =  testData .nameValidationScheme 
149+ 			}
150+ 			assert .ErrorIs (t , testData .limits .Validate (nameValidationScheme , testData .shardByAllLabels , testData .activeSeriesMetricsEnabled ), testData .expected )
145151		})
146152	}
147153}
0 commit comments