refactor: delete a NumOverrides error

pkg/alertmanager/multitenant_test.go

@@ -558,8 +558,7 @@ receivers:
 				flagext.DefaultValues(&limits)
 				limits.AlertmanagerReceiversBlockPrivateAddresses = firewallEnabled
 
-				overrides, err := validation.NewOverrides(limits, nil)
-				require.NoError(t, err)
+				overrides := validation.NewOverrides(limits, nil)
 
 				// Start the alertmanager.
 				reg := prometheus.NewPedanticRegistry()
@@ -1778,8 +1777,7 @@ func TestAlertmanager_StateReplicationWithSharding(t *testing.T) {
 				var limits validation.Limits
 				flagext.DefaultValues(&limits)
 
-				overrides, err := validation.NewOverrides(limits, nil)
-				require.NoError(t, err)
+				overrides := validation.NewOverrides(limits, nil)
 
 				reg := prometheus.NewPedanticRegistry()
 				am, err := createMultitenantAlertmanager(amConfig, nil, nil, mockStore, ringStore, overrides, log.NewNopLogger(), reg)
@@ -1976,8 +1974,7 @@ func TestAlertmanager_StateReplicationWithSharding_InitialSyncFromPeers(t *testi
 				var limits validation.Limits
 				flagext.DefaultValues(&limits)
 
-				overrides, err := validation.NewOverrides(limits, nil)
-				require.NoError(t, err)
+				overrides := validation.NewOverrides(limits, nil)
 
 				reg := prometheus.NewPedanticRegistry()
 				am, err := createMultitenantAlertmanager(amConfig, nil, nil, mockStore, ringStore, overrides, log.NewNopLogger(), reg)

pkg/compactor/compactor_paritioning_test.go

@@ -1435,8 +1435,7 @@ func prepareForPartitioning(t *testing.T, compactorCfg Config, bucketClient objs
 		flagext.DefaultValues(limits)
 	}
 
-	overrides, err := validation.NewOverrides(*limits, nil)
-	require.NoError(t, err)
+	overrides := validation.NewOverrides(*limits, nil)
 
 	bucketClientFactory := func(ctx context.Context) (objstore.InstrumentedBucket, error) {
 		return bucketClient, nil

pkg/compactor/compactor_test.go

@@ -1585,8 +1585,7 @@ func prepare(t *testing.T, compactorCfg Config, bucketClient objstore.Instrument
 		flagext.DefaultValues(limits)
 	}
 
-	overrides, err := validation.NewOverrides(*limits, nil)
-	require.NoError(t, err)
+	overrides := validation.NewOverrides(*limits, nil)
 
 	bucketClientFactory := func(ctx context.Context) (objstore.InstrumentedBucket, error) {
 		return bucketClient, nil
@@ -2295,7 +2294,7 @@ func TestCompactor_GetShardSizeForUser(t *testing.T) {
 		cfg.ShardingRing.KVStore.Mock = kvstore
 
 		// Compactor will get its own temp dir for storing local files.
-		overrides, _ := validation.NewOverrides(validation.Limits{}, tenantLimits)
+		overrides := validation.NewOverrides(validation.Limits{}, tenantLimits)
 		compactor, _, tsdbPlanner, _, _ := prepare(t, cfg, inmem, nil)
 		compactor.limits = overrides
 		//compactor.limits.tenantLimits = tenantLimits
@@ -2344,7 +2343,7 @@ func TestCompactor_GetShardSizeForUser(t *testing.T) {
 		cfg.ShardingRing.KVStore.Mock = kvstore
 
 		// Compactor will get its own temp dir for storing local files.
-		overrides, _ := validation.NewOverrides(validation.Limits{}, tenantLimits)
+		overrides := validation.NewOverrides(validation.Limits{}, tenantLimits)
 		compactor, _, tsdbPlanner, _, _ := prepare(t, cfg, inmem, nil)
 		compactor.limits = overrides
 		//compactor.limits.tenantLimits = tenantLimits

pkg/compactor/partition_compaction_grouper_test.go

@@ -2048,8 +2048,7 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) {
 			limits := &validation.Limits{
 				CompactorPartitionSeriesCount: 4,
 			}
-			overrides, err := validation.NewOverrides(*limits, nil)
-			require.NoError(t, err)
+			overrides := validation.NewOverrides(*limits, nil)
 
 			// Setup mocking of the ring so that the grouper will own all the shards
 			rs := ring.ReplicationSet{

pkg/compactor/shuffle_sharding_grouper_test.go

@@ -330,8 +330,7 @@ func TestShuffleShardingGrouper_Groups(t *testing.T) {
 			}
 
 			limits := &validation.Limits{}
-			overrides, err := validation.NewOverrides(*limits, nil)
-			require.NoError(t, err)
+			overrides := validation.NewOverrides(*limits, nil)
 
 			// Setup mocking of the ring so that the grouper will own all the shards
 			rs := ring.ReplicationSet{

pkg/cortex/modules.go

@@ -199,11 +199,11 @@ func (t *Cortex) initRuntimeConfig() (services.Service, error) {
 	return serv, err
 }
 
-func (t *Cortex) initOverrides() (serv services.Service, err error) {
-	t.Overrides, err = validation.NewOverrides(t.Cfg.LimitsConfig, t.TenantLimits)
+func (t *Cortex) initOverrides() (services.Service, error) {
+	t.Overrides = validation.NewOverrides(t.Cfg.LimitsConfig, t.TenantLimits)
 	// overrides don't have operational state, nor do they need to do anything more in starting/stopping phase,
 	// so there is no need to return any service.
-	return nil, err
+	return nil, nil
 }
 
 func (t *Cortex) initOverridesExporter() (services.Service, error) {

pkg/distributor/distributor_test.go

@@ -2488,8 +2488,7 @@ func BenchmarkDistributor_Push(b *testing.B) {
 			}
 			distributorCfg.UseStreamPush = false
 
-			overrides, err := validation.NewOverrides(limits, nil)
-			require.NoError(b, err)
+			overrides := validation.NewOverrides(limits, nil)
 
 			// Start the distributor.
 			distributor, err := New(distributorCfg, clientConfig, overrides, ingestersRing, true, prometheus.NewRegistry(), log.NewNopLogger())
@@ -3121,8 +3120,7 @@ func prepare(tb testing.TB, cfg prepConfig) ([]*Distributor, []*mockIngester, []
 			cfg.limits.HAMaxClusters = 100
 		}
 
-		overrides, err := validation.NewOverrides(*cfg.limits, nil)
-		require.NoError(tb, err)
+		overrides := validation.NewOverrides(*cfg.limits, nil)
 
 		reg := prometheus.NewPedanticRegistry()
 		d, err := New(distributorCfg, clientConfig, overrides, ingestersRing, true, reg, log.NewNopLogger())
@@ -4336,8 +4334,7 @@ func TestDistributor_PushLabelSetMetrics(t *testing.T) {
 		{Hash: 4, LabelSet: labels.FromStrings("cluster", "four")},
 		{Hash: 2, LabelSet: labels.EmptyLabels()},
 	}
-	ds[0].limits, err = validation.NewOverrides(limits, nil)
-	require.NoError(t, err)
+	ds[0].limits = validation.NewOverrides(limits, nil)
 	ds[0].updateLabelSetMetrics()
 	// Old label set metrics are removed. New label set metrics will be added when
 	// new requests come in.

pkg/distributor/ingestion_rate_strategy_test.go

@@ -97,8 +97,7 @@ func TestIngestionRateStrategy(t *testing.T) {
 			var nativeHistogramsStrategy limiter.RateLimiterStrategy
 
 			// Init limits overrides
-			overrides, err := validation.NewOverrides(testData.limits, nil)
-			require.NoError(t, err)
+			overrides := validation.NewOverrides(testData.limits, nil)
 
 			// Instance the strategy
 			switch testData.limits.IngestionRateStrategy {

pkg/ingester/ingester_test.go

@@ -4010,10 +4010,7 @@ func prepareIngesterWithBlocksStorageAndLimits(t testing.TB, ingesterCfg Config,
 
 	bucketDir := t.TempDir()
 
-	overrides, err := validation.NewOverrides(limits, tenantLimits)
-	if err != nil {
-		return nil, err
-	}
+	overrides := validation.NewOverrides(limits, tenantLimits)
 
 	ingesterCfg.BlocksStorageConfig.TSDB.Dir = dataDir
 	ingesterCfg.BlocksStorageConfig.Bucket.Backend = "filesystem"
@@ -4180,8 +4177,7 @@ func TestIngester_OpenExistingTSDBOnStartup(t *testing.T) {
 		t.Run(testName, func(t *testing.T) {
 			limits := defaultLimitsTestConfig()
 
-			overrides, err := validation.NewOverrides(limits, nil)
-			require.NoError(t, err)
+			overrides := validation.NewOverrides(limits, nil)
 
 			// Create a temporary directory for TSDB
 			tempDir := t.TempDir()
@@ -5395,8 +5391,7 @@ func TestHeadCompactionOnStartup(t *testing.T) {
 
 	limits := defaultLimitsTestConfig()
 
-	overrides, err := validation.NewOverrides(limits, nil)
-	require.NoError(t, err)
+	overrides := validation.NewOverrides(limits, nil)
 
 	ingesterCfg := defaultIngesterTestConfig(t)
 	ingesterCfg.BlocksStorageConfig.TSDB.Dir = tempDir

pkg/ingester/limiter_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/validation"
@@ -221,8 +220,7 @@ func runLimiterMaxFunctionTest(
 			limits := validation.Limits{IngestionTenantShardSize: testData.shardSize}
 			applyLimits(&limits, testData.localLimit, testData.globalLimit)
 
-			overrides, err := validation.NewOverrides(limits, nil)
-			require.NoError(t, err)
+			overrides := validation.NewOverrides(limits, nil)
 
 			// Assert on default sharding strategy.
 			limiter := NewLimiter(overrides, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, testData.ringZoneAwarenessEnabled, "")
@@ -286,11 +284,10 @@ func TestLimiter_AssertMaxSeriesPerMetric(t *testing.T) {
 			ring.On("ZonesCount").Return(1)
 
 			// Mock limits
-			limits, err := validation.NewOverrides(validation.Limits{
+			limits := validation.NewOverrides(validation.Limits{
 				MaxLocalSeriesPerMetric:  testData.maxLocalSeriesPerMetric,
 				MaxGlobalSeriesPerMetric: testData.maxGlobalSeriesPerMetric,
 			}, nil)
-			require.NoError(t, err)
 
 			limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, false, "")
 			actual := limiter.AssertMaxSeriesPerMetric("test", testData.series)
@@ -348,11 +345,10 @@ func TestLimiter_AssertMaxMetadataPerMetric(t *testing.T) {
 			ring.On("ZonesCount").Return(1)
 
 			// Mock limits
-			limits, err := validation.NewOverrides(validation.Limits{
+			limits := validation.NewOverrides(validation.Limits{
 				MaxLocalMetadataPerMetric:  testData.maxLocalMetadataPerMetric,
 				MaxGlobalMetadataPerMetric: testData.maxGlobalMetadataPerMetric,
 			}, nil)
-			require.NoError(t, err)
 
 			limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, false, "")
 			actual := limiter.AssertMaxMetadataPerMetric("test", testData.metadata)
@@ -411,11 +407,10 @@ func TestLimiter_AssertMaxSeriesPerUser(t *testing.T) {
 			ring.On("ZonesCount").Return(1)
 
 			// Mock limits
-			limits, err := validation.NewOverrides(validation.Limits{
+			limits := validation.NewOverrides(validation.Limits{
 				MaxLocalSeriesPerUser:  testData.maxLocalSeriesPerUser,
 				MaxGlobalSeriesPerUser: testData.maxGlobalSeriesPerUser,
 			}, nil)
-			require.NoError(t, err)
 
 			limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, false, "")
 			actual := limiter.AssertMaxSeriesPerUser("test", testData.series)
@@ -496,8 +491,7 @@ func TestLimiter_AssertMaxSeriesPerLabelSet(t *testing.T) {
 			ring.On("ZonesCount").Return(1)
 
 			// Mock limits
-			limits, err := validation.NewOverrides(testData.limits, nil)
-			require.NoError(t, err)
+			limits := validation.NewOverrides(testData.limits, nil)
 
 			limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, false, "")
 			actual := limiter.AssertMaxSeriesPerLabelSet("test", labels.FromStrings("foo", "bar"), func(limits []validation.LimitsPerLabelSet, limit validation.LimitsPerLabelSet) (int, error) {
@@ -558,11 +552,10 @@ func TestLimiter_AssertMaxMetricsWithMetadataPerUser(t *testing.T) {
 			ring.On("ZonesCount").Return(1)
 
 			// Mock limits
-			limits, err := validation.NewOverrides(validation.Limits{
+			limits := validation.NewOverrides(validation.Limits{
 				MaxLocalMetricsWithMetadataPerUser:  testData.maxLocalMetadataPerUser,
 				MaxGlobalMetricsWithMetadataPerUser: testData.maxGlobalMetadataPerUser,
 			}, nil)
-			require.NoError(t, err)
 
 			limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, false, "")
 			actual := limiter.AssertMaxMetricsWithMetadataPerUser("test", testData.metadata)
@@ -579,13 +572,12 @@ func TestLimiter_FormatError(t *testing.T) {
 	ring.On("ZonesCount").Return(1)
 
 	// Mock limits
-	limits, err := validation.NewOverrides(validation.Limits{
+	limits := validation.NewOverrides(validation.Limits{
 		MaxGlobalSeriesPerUser:              100,
 		MaxGlobalSeriesPerMetric:            20,
 		MaxGlobalMetricsWithMetadataPerUser: 10,
 		MaxGlobalMetadataPerMetric:          3,
 	}, nil)
-	require.NoError(t, err)
 
 	limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, true, 3, false, "please contact administrator to raise it")
 	lbls := labels.FromStrings(labels.MetricName, "testMetric")

pkg/ingester/user_metrics_metadata_test.go

@@ -34,8 +34,7 @@ func Test_UserMetricsMetadata(t *testing.T) {
 		false)
 
 	limits := validation.Limits{}
-	overrides, err := validation.NewOverrides(limits, nil)
-	require.NoError(t, err)
+	overrides := validation.NewOverrides(limits, nil)
 	limiter := NewLimiter(overrides, nil, util.ShardingStrategyDefault, true, 1, false, "")
 
 	tests := []struct {

pkg/ingester/user_state_test.go

@@ -79,8 +79,7 @@ func TestMetricCounter(t *testing.T) {
 
 			limits := validation.Limits{MaxLocalSeriesPerMetric: tc.localLimit}
 
-			overrides, err := validation.NewOverrides(limits, nil)
-			require.NoError(t, err)
+			overrides := validation.NewOverrides(limits, nil)
 
 			// We're testing code that's not dependent on sharding strategy, replication factor, etc. To simplify the test,
 			// we use local limit only.

pkg/parquetconverter/converter_test.go

@@ -174,8 +174,7 @@ func prepare(t *testing.T, cfg Config, bucketClient objstore.InstrumentedBucket,
 		flagext.DefaultValues(limits)
 	}
 
-	overrides, err := validation.NewOverrides(*limits, nil)
-	require.NoError(t, err)
+	overrides := validation.NewOverrides(*limits, nil)
 
 	scanner, err := users.NewScanner(cortex_tsdb.UsersScannerConfig{
 		Strategy: cortex_tsdb.UserScanStrategyList,
@@ -242,8 +241,7 @@ func TestConverter_BlockConversionFailure(t *testing.T) {
 	flagext.DefaultValues(&storageCfg)
 	limits := &validation.Limits{}
 	flagext.DefaultValues(limits)
-	overrides, err := validation.NewOverrides(*limits, nil)
-	require.NoError(t, err)
+	overrides := validation.NewOverrides(*limits, nil)
 	limits.ParquetConverterEnabled = true
 
 	// Create a filesystem bucket for initial block upload

pkg/querier/distributor_queryable_test.go

@@ -97,8 +97,7 @@ func TestDistributorQuerier_SelectShouldHonorQueryIngestersWithin(t *testing.T)
 				require.NoError(t, err)
 
 				limits := DefaultLimitsConfig()
-				overrides, err := validation.NewOverrides(limits, nil)
-				require.NoError(t, err)
+				overrides := validation.NewOverrides(limits, nil)
 
 				start, end, err := validateQueryTimeRange(ctx, "test", testData.queryMinT, testData.queryMaxT, overrides, 0)
 				require.NoError(t, err)

pkg/querier/parquet_queryable_test.go

@@ -414,8 +414,7 @@ func defaultOverrides(t *testing.T, queryVerticalShardSize int) *validation.Over
 	flagext.DefaultValues(&limits)
 	limits.QueryVerticalShardSize = queryVerticalShardSize
 
-	overrides, err := validation.NewOverrides(limits, nil)
-	require.NoError(t, err)
+	overrides := validation.NewOverrides(limits, nil)
 	return overrides
 }