feat: added a way to get a whitelist from cleanup

moira-alert · Dec 23, 2019 · 458f579 · 458f579
1 parent b21fa4f
commit 458f579
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/cmd/cli/config.go b/cmd/cli/config.go
@@ -12,9 +12,8 @@ type config struct {
 }
 
 type cleanupConfig struct {
-	Whitelist               []string `yaml:"whitelist"`
-	Delete                  bool     `yaml:"delete"`
-	AddAnonymousToWhitelist bool     `json:"add_anonymous_to_whitelist"`
+	Delete                  bool `yaml:"delete"`
+	AddAnonymousToWhitelist bool `json:"add_anonymous_to_whitelist"`
 }
 
 func getDefault() config {
@@ -26,8 +25,5 @@ func getDefault() config {
 			Port:            "6379",
 			ConnectionLimit: 512,
 		},
-		Cleanup: cleanupConfig{
-			Whitelist: []string{},
-		},
 	}
 }
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -92,7 +92,6 @@ func main() {
 	}
 
 	if *cleanup {
-		logger.Debugf("User whitelist: %#v", confCleanup.Whitelist)
 		if err := handleCleanup(logger, dataBase, confCleanup); err != nil {
 			logger.Error(err)
 		}

diff --git a/cmd/cli/user.go b/cmd/cli/user.go
@@ -2,11 +2,17 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 	"os"
 
 	"github.com/moira-alert/moira"
 )
 
+type usersCleaning struct {
+	Users     []string `json:"users"`
+	Whitelist []string `json:"whitelist"`
+}
+
 func transferUserSubscriptionsAndContacts(database moira.Database, from, to string) error {
 	contactIDs, err := database.GetUserContactIDs(from)
 	if err != nil {
@@ -80,25 +86,29 @@ func deleteUser(database moira.Database, user string) error {
 }
 
 func handleCleanup(logger moira.Logger, database moira.Database, config cleanupConfig) error {
-	var users []string
+	clean := new(usersCleaning)
 
 	reader := json.NewDecoder(os.Stdin)
-
-	if err := reader.Decode(&users); err != nil {
+	if err := reader.Decode(clean); err != nil {
 		return err
 	}
 
-	return usersCleanup(logger, database, users, config)
+	fmt.Printf("%#v\n", clean)
+
+	return nil
+
+	//nolint
+	return usersCleanup(logger, database, clean.Whitelist, clean.Users, config)
 }
 
-func usersCleanup(logger moira.Logger, database moira.Database, users []string, config cleanupConfig) error {
+func usersCleanup(logger moira.Logger, database moira.Database, users, whitelist []string, config cleanupConfig) error {
 	if config.AddAnonymousToWhitelist {
-		config.Whitelist = append(config.Whitelist, "")
+		whitelist = append(whitelist, "")
 	}
 
-	usersMap := make(map[string]bool, len(users)+len(config.Whitelist))
+	usersMap := make(map[string]bool, len(users)+len(whitelist))
 
-	for _, user := range append(users, config.Whitelist...) {
+	for _, user := range append(users, whitelist...) {
 		usersMap[user] = true
 	}
 

diff --git a/cmd/cli/user_test.go b/cmd/cli/user_test.go
@@ -24,7 +24,6 @@ func TestUpdateUsers(t *testing.T) {
 	}
 
 	database := redis.NewDatabase(logger, conf.Redis.GetSettings(), redis.Cli)
-	conf.Cleanup.Whitelist = []string{"Nikolay", ""}
 
 	users := []string{"Aleksey", "Arkadiy", "Emil"}
 
@@ -40,7 +39,7 @@ func TestUpdateUsers(t *testing.T) {
 		}(t)
 
 		Convey("Test off notifications", func() {
-			So(usersCleanup(logger, database, users, conf.Cleanup), ShouldBeNil)
+			So(usersCleanup(logger, database, users, []string{"Nikolay", ""}, conf.Cleanup), ShouldBeNil)
 			for _, contact := range contacts {
 				subscription, err := database.GetSubscription("subscription_" + contact.ID)
 
@@ -56,7 +55,7 @@ func TestUpdateUsers(t *testing.T) {
 
 		Convey("Verify deletion of contacts and subscriptions", func() {
 			conf.Cleanup.Delete = true
-			So(usersCleanup(logger, database, users, conf.Cleanup), ShouldBeNil)
+			So(usersCleanup(logger, database, []string{}, users, conf.Cleanup), ShouldBeNil)
 			for _, contact := range contacts {
 				if !strings.Contains(contact.User, "Another") {
 					continue