Tests for getting all configs

Fixes earlier commit

Author: jml

pkg/configs/db/postgres/postgres.go

@@ -169,11 +169,11 @@ func (d DB) SetRulesConfig(userID string, oldConfig, newConfig configs.RulesConf
 }
 
 func (d DB) findRulesConfigs(filter squirrel.Sqlizer) (map[string]configs.VersionedRulesConfig, error) {
-	rows, err := d.Select("id", "owner_id", "config ->> 'alertmanager_config'").
+	rows, err := d.Select("id", "owner_id", "config ->> 'rules_files'").
 		Options("DISTINCT ON (owner_id)").
 		From("configs").
 		Where(filter).
-		Where("config @> 'alertmanager_config' AND config ->> 'alertmanager_config' <> ''").
+		Where("config ->> 'rules_files' <> '{}'").
 		OrderBy("owner_id, id DESC").
 		Query()
 	if err != nil {
@@ -184,7 +184,12 @@ func (d DB) findRulesConfigs(filter squirrel.Sqlizer) (map[string]configs.Versio
 	for rows.Next() {
 		var cfg configs.VersionedRulesConfig
 		var userID string
-		err = rows.Scan(&cfg.ID, &userID, &cfg.Config)
+		var cfgBytes []byte
+		err = rows.Scan(&cfg.ID, &userID, &cfgBytes)
+		if err != nil {
+			return nil, err
+		}
+		err = json.Unmarshal(cfgBytes, &cfg.Config)
 		if err != nil {
 			return nil, err
 		}

pkg/ruler/api_test.go

@@ -23,16 +23,18 @@ const (
 )
 
 var (
-	app      *API
-	database db.DB
-	counter  int
+	app        *API
+	database   db.DB
+	counter    int
+	privateAPI RulesAPI
 )
 
 // setup sets up the environment for the tests.
 func setup(t *testing.T) {
 	database = dbtest.Setup(t)
 	app = NewAPI(database)
 	counter = 0
+	privateAPI = dbStore{db: database}
 }
 
 // cleanup cleans up the environment after a test.
@@ -178,74 +180,62 @@ func Test_PostConfig_MultipleUsers(t *testing.T) {
 	assert.True(t, config2.ID > config1.ID, "%v > %v", config2.ID, config1.ID)
 }
 
-// // GetAllConfigs returns an empty list of configs if there aren't any.
-// func Test_GetAllConfigs_Empty(t *testing.T) {
-// 	setup(t)
-// 	defer cleanup(t)
-
-// 	w := request(t, "GET", c.PrivateEndpoint, nil)
-// 	assert.Equal(t, http.StatusOK, w.Code)
-// 	var found api.ConfigsView
-// 	err := json.Unmarshal(w.Body.Bytes(), &found)
-// 	assert.NoError(t, err, "Could not unmarshal JSON")
-// 	assert.Equal(t, api.ConfigsView{Configs: map[string]configs.View{}}, found)
-// }
-
-// // GetAllConfigs returns all created configs.
-// func Test_GetAllConfigs(t *testing.T) {
-// 	setup(t)
-// 	defer cleanup(t)
-
-// 	userID := makeUserID()
-// 	config := makeRulerConfig()
-
-// 	view := c.post(t, userID, config)
-// 	w := request(t, "GET", c.PrivateEndpoint, nil)
-// 	assert.Equal(t, http.StatusOK, w.Code)
-// 	var found api.ConfigsView
-// 	err := json.Unmarshal(w.Body.Bytes(), &found)
-// 	assert.NoError(t, err, "Could not unmarshal JSON")
-// 	assert.Equal(t, api.ConfigsView{Configs: map[string]configs.View{
-// 		userID: view,
-// 	}}, found)
-// }
-
-// // GetAllConfigs returns the *newest* versions of all created configs.
-// func Test_GetAllConfigs_Newest(t *testing.T) {
-// 	setup(t)
-// 	defer cleanup(t)
-
-// 	userID := makeUserID()
-
-// 	c.post(t, userID, makeRulerConfig())
-// 	c.post(t, userID, makeRulerConfig())
-// 	lastCreated := c.post(t, userID, makeRulerConfig())
-
-// 	w := request(t, "GET", c.PrivateEndpoint, nil)
-// 	assert.Equal(t, http.StatusOK, w.Code)
-// 	var found api.ConfigsView
-// 	err := json.Unmarshal(w.Body.Bytes(), &found)
-// 	assert.NoError(t, err, "Could not unmarshal JSON")
-// 	assert.Equal(t, api.ConfigsView{Configs: map[string]configs.View{
-// 		userID: lastCreated,
-// 	}}, found)
-// }
-
-// func Test_GetConfigs_IncludesNewerConfigsAndExcludesOlder(t *testing.T) {
-// 	setup(t)
-// 	defer cleanup(t)
-
-// 	c.post(t, makeUserID(), makeRulerConfig())
-// 	config2 := c.post(t, makeUserID(), makeRulerConfig())
-// 	userID3 := makeUserID()
-// 	config3 := c.post(t, userID3, makeRulerConfig())
-
-// 	w := request(t, "GET", fmt.Sprintf("%s?since=%d", c.PrivateEndpoint, config2.ID), nil)
-// 	assert.Equal(t, http.StatusOK, w.Code)
-// 	var found api.ConfigsView
-// 	err := json.Unmarshal(w.Body.Bytes(), &found)
-// 	assert.NoError(t, err, "Could not unmarshal JSON")
-// 	assert.Equal(t, api.ConfigsView{Configs: map[string]configs.View{
-// 		userID3: config3,
-// 	}}, found)
-// }
+// GetAllConfigs returns an empty list of configs if there aren't any.
+func Test_GetAllConfigs_Empty(t *testing.T) {
+	setup(t)
+	defer cleanup(t)
+
+	configs, err := privateAPI.GetConfigs(0)
+	assert.NoError(t, err, "error getting configs")
+	assert.Equal(t, 0, len(configs))
+}
+
+// GetAllConfigs returns all created configs.
+func Test_GetAllConfigs(t *testing.T) {
+	setup(t)
+	defer cleanup(t)
+
+	userID := makeUserID()
+	config := makeRulerConfig()
+	view := post(t, userID, nil, config)
+
+	found, err := privateAPI.GetConfigs(0)
+	assert.NoError(t, err, "error getting configs")
+	assert.Equal(t, map[string]configs.VersionedRulesConfig{
+		userID: view,
+	}, found)
+}
+
+// GetAllConfigs returns the *newest* versions of all created configs.
+func Test_GetAllConfigs_Newest(t *testing.T) {
+	setup(t)
+	defer cleanup(t)
+
+	userID := makeUserID()
+
+	config1 := post(t, userID, nil, makeRulerConfig())
+	config2 := post(t, userID, config1.Config, makeRulerConfig())
+	lastCreated := post(t, userID, config2.Config, makeRulerConfig())
+
+	found, err := privateAPI.GetConfigs(0)
+	assert.NoError(t, err, "error getting configs")
+	assert.Equal(t, map[string]configs.VersionedRulesConfig{
+		userID: lastCreated,
+	}, found)
+}
+
+func Test_GetConfigs_IncludesNewerConfigsAndExcludesOlder(t *testing.T) {
+	setup(t)
+	defer cleanup(t)
+
+	post(t, makeUserID(), nil, makeRulerConfig())
+	config2 := post(t, makeUserID(), nil, makeRulerConfig())
+	userID3 := makeUserID()
+	config3 := post(t, userID3, nil, makeRulerConfig())
+
+	found, err := privateAPI.GetConfigs(config2.ID)
+	assert.NoError(t, err, "error getting configs")
+	assert.Equal(t, map[string]configs.VersionedRulesConfig{
+		userID3: config3,
+	}, found)
+}