fix per PR comments

Signed-off-by: Jacob Lisi <[email protected]>

Author: jtlisi

pkg/ruler/api.go

@@ -129,14 +129,14 @@ func respondError(logger log.Logger, w http.ResponseWriter, msg string) {
 func (r *Ruler) rules(w http.ResponseWriter, req *http.Request) {
 	logger := util.WithContext(req.Context(), util.Logger)
 	userID, ctx, err := user.ExtractOrgIDFromHTTPRequest(req)
-	if err != nil {
+	if err != nil || userID == "" {
 		level.Error(logger).Log("msg", "error extracting org id from context", "err", err)
 		respondError(logger, w, "no valid org id found")
 		return
 	}
 
 	w.Header().Set("Content-Type", "application/json")
-	rgs, err := r.GetRules(ctx, userID)
+	rgs, err := r.GetRules(ctx)
 
 	if err != nil {
 		respondError(logger, w, err.Error())
@@ -221,14 +221,14 @@ func (r *Ruler) rules(w http.ResponseWriter, req *http.Request) {
 func (r *Ruler) alerts(w http.ResponseWriter, req *http.Request) {
 	logger := util.WithContext(req.Context(), util.Logger)
 	userID, ctx, err := user.ExtractOrgIDFromHTTPRequest(req)
-	if err != nil {
+	if err != nil || userID == "" {
 		level.Error(logger).Log("msg", "error extracting org id from context", "err", err)
 		respondError(logger, w, "no valid org id found")
 		return
 	}
 
 	w.Header().Set("Content-Type", "application/json")
-	rgs, err := r.GetRules(ctx, userID)
+	rgs, err := r.GetRules(ctx)
 
 	if err != nil {
 		respondError(logger, w, err.Error())

pkg/ruler/ruler.go

@@ -472,9 +472,14 @@ func (r *Ruler) newManager(ctx context.Context, userID string) (*promRules.Manag
 
 // GetRules retrieves the running rules from this ruler and all running rulers in the ring if
 // sharding is enabled
-func (r *Ruler) GetRules(ctx context.Context, userID string) ([]*GroupStateDesc, error) {
+func (r *Ruler) GetRules(ctx context.Context) ([]*GroupStateDesc, error) {
+	userID, err := user.ExtractOrgID(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("no user id found in context")
+	}
+
 	if r.cfg.EnableSharding {
-		return r.getShardedRules(ctx, userID)
+		return r.getShardedRules(ctx)
 	}
 
 	return r.getLocalRules(userID)
@@ -564,7 +569,7 @@ func (r *Ruler) getLocalRules(userID string) ([]*GroupStateDesc, error) {
 	return groupDescs, nil
 }
 
-func (r *Ruler) getShardedRules(ctx context.Context, userID string) ([]*GroupStateDesc, error) {
+func (r *Ruler) getShardedRules(ctx context.Context) ([]*GroupStateDesc, error) {
 	rulers, err := r.ring.GetAll()
 	if err != nil {
 		return nil, err

pkg/ruler/rules/rules.proto

@@ -14,7 +14,7 @@ option (gogoproto.unmarshaler_all) = true;
 
 // RuleGroupDesc is a proto representation of a cortex rule group
 message RuleGroupDesc {
-  reserved 5;
+  reserved 5, 7, 8;
   string name = 1;
   string namespace = 2;
   google.protobuf.Duration interval = 3
@@ -25,7 +25,7 @@ message RuleGroupDesc {
 
 // RuleDesc is a proto representation of a Prometheus Rule
 message RuleDesc {
-  reserved 7 to 10;
+  reserved 7 to 12;
   string expr = 1;
   string record = 2;
   string alert = 3;