Update CHANGELOG.md

Co-authored-by: Marco Pracucci <[email protected]>

Update CHANGELOG.md

Co-authored-by: Marco Pracucci <[email protected]>

Update pkg/ruler/ruler_test.go

Co-authored-by: Marco Pracucci <[email protected]>

Update pkg/util/http_test.go

Co-authored-by: Marco Pracucci <[email protected]>

Update pkg/alertmanager/api_test.go

Co-authored-by: Marco Pracucci <[email protected]>

Update pkg/alertmanager/api_test.go

Co-authored-by: Marco Pracucci <[email protected]>

Update pkg/alertmanager/api.go

Co-authored-by: Marco Pracucci <[email protected]>

fix review comments

Signed-off-by: allenzhli <[email protected]>

Author: Allenzhli

CHANGELOG.md

@@ -27,8 +27,8 @@
 * [ENHANCEMENT] Ruler: added the following metrics when ruler sharding is enabled: #3916
   * `cortex_ruler_clients`
   * `cortex_ruler_client_request_duration_seconds`
-* [ENHANCEMENT] Alertmanager: Add API endpoint to list all tenant alertmanager configs: `GET /multitenant_alertmanager/configs`. #3259
-* [ENHANCEMENT] Ruler: Add API endpoint to list all tenant ruler rule groups: `GET /ruler/rule_groups`. #3259
+* [ENHANCEMENT] Alertmanager: Add API endpoint to list all tenant alertmanager configs: `GET /multitenant_alertmanager/configs`. #3529
+* [ENHANCEMENT] Ruler: Add API endpoint to list all tenant ruler rule groups: `GET /ruler/rule_groups`. #3529
 * [ENHANCEMENT] Query-frontend/scheduler: added querier forget delay (`-query-frontend.querier-forget-delay` and `-query-scheduler.querier-forget-delay`) to mitigate the blast radius in the event queriers crash because of a repeatedly sent "query of death" when shuffle-sharding is enabled. #3901
 * [ENHANCEMENT] Query-frontend: reduced memory allocations when serializing query response. #3964
 * [ENHANCEMENT] Querier / ruler: some optimizations to PromQL query engine. #3934 #3989

pkg/alertmanager/api.go

@@ -11,7 +11,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/cortexproject/cortex/pkg/alertmanager/alertspb"
-	"github.com/cortexproject/cortex/pkg/chunk"
 	"github.com/cortexproject/cortex/pkg/tenant"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/concurrency"
@@ -213,7 +212,7 @@ func (am *MultitenantAlertmanager) ListAllConfigs(w http.ResponseWriter, r *http
 
 	err = concurrency.ForEachUser(r.Context(), userIDs, fetchConcurrency, func(ctx context.Context, userID string) error {
 		cfg, err := am.store.GetAlertConfig(ctx, userID)
-		if errors.Is(err, chunk.ErrStorageObjectNotFound) {
+		if errors.Is(err, alertspb.ErrNotFound) {
 			return nil
 		} else if err != nil {
 			return errors.Wrapf(err, "failed to fetch alertmanager config for user %s", userID)

pkg/alertmanager/api_test.go

@@ -283,7 +283,9 @@ receivers:
 	resp := w.Result()
 	require.Equal(t, http.StatusOK, resp.StatusCode)
 	require.Equal(t, "application/yaml", resp.Header.Get("Content-Type"))
-	body, _ := ioutil.ReadAll(resp.Body)
-	old, _ := yaml.Marshal(testCases)
+	body, err := ioutil.ReadAll(resp.Body)
+	require.NoError(t, err)
+	old, err := yaml.Marshal(testCases)
+	require.NoError(t, err)
 	require.YAMLEq(t, string(old), string(body))
 }

pkg/ruler/ruler.go

@@ -24,7 +24,6 @@ import (
 	"github.com/weaveworks/common/user"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/cortexproject/cortex/pkg/chunk"
 	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/cortexproject/cortex/pkg/ring"
 	ring_client "github.com/cortexproject/cortex/pkg/ring/client"
@@ -866,9 +865,7 @@ func (r *Ruler) ListAllRules(w http.ResponseWriter, req *http.Request) {
 
 	err = concurrency.ForEachUser(req.Context(), userIDs, fetchRulesConcurrency, func(ctx context.Context, userID string) error {
 		rg, err := r.store.ListRuleGroupsForUserAndNamespace(ctx, userID, "")
-		if errors.Is(err, chunk.ErrStorageObjectNotFound) {
-			return nil
-		} else if err != nil {
+		if err != nil {
 			return errors.Wrapf(err, "failed to fetch ruler config for user %s", userID)
 		}
 		data := map[string]map[string][]rulefmt.RuleGroup{userID: rg.Formatted()}

pkg/ruler/ruler_test.go

@@ -856,7 +856,6 @@ func TestRuler_ListAllRules(t *testing.T) {
 	router := mux.NewRouter()
 	router.Path("/ruler/rule_groups").Methods(http.MethodGet).HandlerFunc(r.ListAllRules)
 
-	// Verify namespace1 rules are there.
 	req := requestFor(t, http.MethodGet, "https://localhost:8080/ruler/rule_groups", nil, "")
 	w := httptest.NewRecorder()
 	router.ServeHTTP(w, req)
@@ -868,12 +867,12 @@ func TestRuler_ListAllRules(t *testing.T) {
 	require.Equal(t, http.StatusOK, resp.StatusCode)
 	require.Equal(t, "application/yaml", resp.Header.Get("Content-Type"))
 
-	// Testing the running rules for user1 in the mock store
 	gs := make(map[string]map[string][]rulefmt.RuleGroup) // user:namespace:[]rulefmt.RuleGroup
 	for userID := range mockRules {
 		gs[userID] = mockRules[userID].Formatted()
 	}
-	expectedResponse, _ := yaml.Marshal(gs)
+	expectedResponse, err := yaml.Marshal(gs)
+	require.NoError(t, err)
 	require.YAMLEq(t, string(expectedResponse), string(body))
 }
 

pkg/util/http_test.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v2"
 
 	"github.com/cortexproject/cortex/pkg/cortexpb"
@@ -114,7 +115,8 @@ func TestStreamWriteYAMLResponse(t *testing.T) {
 		}
 		tt.value[ts.Name] = &ts
 	}
-	d, _ := yaml.Marshal(tt.value)
+	d, err := yaml.Marshal(tt.value)
+	require.NoError(t, err)
 	tt.expectedOutput = string(d)
 	w := httptest.NewRecorder()