fix flaky regex resolver e2e tests (#7506)

* fix flaky regex resolver e2e tests

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

* lint

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

---------

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

Author: SungJin1212

integration/querier_tenant_federation_test.go

@@ -210,11 +210,8 @@ func Test_TenantFederationRegexResolver_WhenSingleTenantMatched(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, 200, res.StatusCode)
 
-	// wait to upload blocks
-	require.NoError(t, ingester.WaitSumMetricsWithOptions(e2e.Greater(0), []string{"cortex_ingester_shipper_uploads_total"}, e2e.WaitMissingMetrics))
-
 	// wait to update knownUsers
-	require.NoError(t, querier.WaitSumMetricsWithOptions(e2e.Greater(0), []string{"cortex_regex_resolver_last_update_run_timestamp_seconds"}, e2e.WaitMissingMetrics))
+	require.NoError(t, querier.WaitSumMetrics(e2e.Equals(1), "cortex_regex_resolver_discovered_users"))
 
 	clientForMatchOneTenant, err = e2ecortex.NewClient(distributor.HTTPEndpoint(), queryFrontend.HTTPEndpoint(), "", "", "user-.+")
 	require.NoError(t, err)
@@ -377,13 +374,10 @@ func runQuerierTenantFederationTest_UseRegexResolver(t *testing.T, cfg querierTe
 		require.NoError(t, querier2.WaitSumMetrics(e2e.Equals(512*2), "cortex_ring_tokens_total"))
 	}
 
-	// wait to upload blocks
-	require.NoError(t, ingester.WaitSumMetricsWithOptions(e2e.Greater(0), []string{"cortex_ingester_shipper_uploads_total"}, e2e.WaitMissingMetrics))
-
 	// wait to update knownUsers
-	require.NoError(t, querier.WaitSumMetricsWithOptions(e2e.Greater(0), []string{"cortex_regex_resolver_last_update_run_timestamp_seconds"}, e2e.WaitMissingMetrics))
+	require.NoError(t, querier.WaitSumMetrics(e2e.Equals(float64(numUsers)), "cortex_regex_resolver_discovered_users"))
 	if cfg.shuffleShardingEnabled {
-		require.NoError(t, querier2.WaitSumMetricsWithOptions(e2e.Greater(0), []string{"cortex_regex_resolver_last_update_run_timestamp_seconds"}, e2e.WaitMissingMetrics))
+		require.NoError(t, querier2.WaitSumMetrics(e2e.Equals(float64(numUsers)), "cortex_regex_resolver_discovered_users"))
 	}
 
 	// query all tenants

pkg/querier/tenantfederation/regex_resolver.go

@@ -212,7 +212,7 @@ func (r *RegexResolver) validateAndReturnMatched(orgID string, matched []string)
 			// when querying for a newly created orgID, the query may not
 			// work because it has not been uploaded to object storage.
 			// To make the query work (not breaking existing behavior),
-			// paas the orgID if it is valid.
+			// pass the orgID if it is valid.
 			return []string{orgID}, nil
 		}