Use correct version of yaml (cortexproject#2908)

* Use correct version of yaml

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Fixed integration test

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Added basic get/post test

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Made the mockRuleStore thread safe(r)

Signed-off-by: Joe Elliott <number101010@gmail.com>

Author: joe-elliott

integration/e2ecortex/client.go

@@ -19,7 +19,7 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/pkg/rulefmt"
 	"github.com/prometheus/prometheus/prompb"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 var (

pkg/ruler/api.go

@@ -17,7 +17,7 @@ import (
 	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/prometheus/prometheus/pkg/rulefmt"
 	"github.com/weaveworks/common/user"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/cortexproject/cortex/pkg/ingester/client"
 	"github.com/cortexproject/cortex/pkg/ruler/rules"

pkg/ruler/api_test.go

@@ -6,11 +6,14 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"
 
+	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/require"
 	"github.com/weaveworks/common/user"
 
+	"github.com/cortexproject/cortex/pkg/ruler/rules"
 	"github.com/cortexproject/cortex/pkg/util/services"
 )
 
@@ -160,3 +163,49 @@ func TestRuler_alerts(t *testing.T) {
 
 	require.Equal(t, string(expectedResponse), string(body))
 }
+
+func TestRuler_Create(t *testing.T) {
+	cfg, cleanup := defaultRulerConfig(newMockRuleStore(make(map[string]rules.RuleGroupList)))
+	defer cleanup()
+
+	r, rcleanup := newTestRuler(t, cfg)
+	defer rcleanup()
+	defer services.StopAndAwaitTerminated(context.Background(), r) //nolint:errcheck
+
+	rules := `
+name: test
+interval: 15s
+rules:
+- record: up_rule
+  expr: up{}
+- alert: up_alert
+  expr: sum(up{}) > 1
+  for: 30s
+  annotations:
+    test: test
+  labels:
+    test: test
+`
+
+	router := mux.NewRouter()
+	router.Path("/api/v1/rules/{namespace}").Methods("POST").HandlerFunc(r.CreateRuleGroup)
+	router.Path("/api/v1/rules/{namespace}/{groupName}").Methods("GET").HandlerFunc(r.GetRuleGroup)
+
+	// POST
+	req := httptest.NewRequest("POST", "https://localhost:8080/api/v1/rules/namespace", strings.NewReader(rules))
+	req.Header.Add(user.OrgIDHeaderName, "user1")
+	ctx := user.InjectOrgID(req.Context(), "user1")
+	w := httptest.NewRecorder()
+
+	router.ServeHTTP(w, req.WithContext(ctx))
+	require.Equal(t, 202, w.Code)
+
+	// GET
+	req = httptest.NewRequest("GET", "https://localhost:8080/api/v1/rules/namespace/test", nil)
+	req.Header.Add(user.OrgIDHeaderName, "user1")
+	ctx = user.InjectOrgID(req.Context(), "user1")
+	w = httptest.NewRecorder()
+
+	router.ServeHTTP(w, req.WithContext(ctx))
+	require.Equal(t, 200, w.Code)
+}

pkg/ruler/store_mock_test.go

@@ -2,13 +2,15 @@ package ruler
 
 import (
 	"context"
+	"sync"
 	"time"
 
 	"github.com/cortexproject/cortex/pkg/ruler/rules"
 )
 
 type mockRuleStore struct {
 	rules map[string]rules.RuleGroupList
+	mtx   sync.Mutex
 }
 
 var (
@@ -77,10 +79,21 @@ func newMockRuleStore(rules map[string]rules.RuleGroupList) *mockRuleStore {
 }
 
 func (m *mockRuleStore) ListAllRuleGroups(ctx context.Context) (map[string]rules.RuleGroupList, error) {
-	return m.rules, nil
+	m.mtx.Lock()
+	defer m.mtx.Unlock()
+
+	copy := make(map[string]rules.RuleGroupList)
+	for k, v := range m.rules {
+		copy[k] = v
+	}
+
+	return copy, nil
 }
 
 func (m *mockRuleStore) ListRuleGroups(ctx context.Context, userID, namespace string) (rules.RuleGroupList, error) {
+	m.mtx.Lock()
+	defer m.mtx.Unlock()
+
 	userRules, exists := m.rules[userID]
 	if !exists {
 		return nil, rules.ErrUserNotFound
@@ -106,6 +119,9 @@ func (m *mockRuleStore) ListRuleGroups(ctx context.Context, userID, namespace st
 }
 
 func (m *mockRuleStore) GetRuleGroup(ctx context.Context, userID string, namespace string, group string) (*rules.RuleGroupDesc, error) {
+	m.mtx.Lock()
+	defer m.mtx.Unlock()
+
 	userRules, exists := m.rules[userID]
 	if !exists {
 		return nil, rules.ErrUserNotFound
@@ -125,6 +141,9 @@ func (m *mockRuleStore) GetRuleGroup(ctx context.Context, userID string, namespa
 }
 
 func (m *mockRuleStore) SetRuleGroup(ctx context.Context, userID string, namespace string, group *rules.RuleGroupDesc) error {
+	m.mtx.Lock()
+	defer m.mtx.Unlock()
+
 	userRules, exists := m.rules[userID]
 	if !exists {
 		userRules = rules.RuleGroupList{}
@@ -147,6 +166,9 @@ func (m *mockRuleStore) SetRuleGroup(ctx context.Context, userID string, namespa
 }
 
 func (m *mockRuleStore) DeleteRuleGroup(ctx context.Context, userID string, namespace string, group string) error {
+	m.mtx.Lock()
+	defer m.mtx.Unlock()
+
 	userRules, exists := m.rules[userID]
 	if !exists {
 		userRules = rules.RuleGroupList{}