Wire in alerting for sync and update command failures

Author: NamelessOne91

cmd/sync.go

@@ -9,13 +9,23 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
+	"github.com/uyuni-project/minima/alerts"
 	"github.com/uyuni-project/minima/get"
 	"github.com/uyuni-project/minima/updates"
 	yaml "gopkg.in/yaml.v2"
 )
 
 const sccUrl = "https://scc.suse.com"
 
+// Config maps the configuration in minima.yaml
+type Config struct {
+	Alerts  alerts.AlertsConfig
+	Storage get.StorageConfig
+	SCC     get.SCC
+	OBS     updates.OBS
+	HTTP    []get.HTTPRepoConfig
+}
+
 // syncCmd represents the sync command
 var (
 	syncCmd = &cobra.Command{
@@ -54,18 +64,34 @@ var (
 		Run: func(cmd *cobra.Command, args []string) {
 			initConfig()
 
-			var errorflag bool = false
-			syncers, err := syncersFromConfig(cfgString)
+			config, err := parseConfig(cfgString)
+			if err != nil {
+				log.Fatal(err)
+			}
+
+			syncers, err := syncersFromConfig(config)
+			if err != nil {
+				log.Fatal(err)
+			}
+
+			alertsManager, err := alerts.NewAlertsManager(config.Alerts)
 			if err != nil {
 				log.Fatal(err)
-				errorflag = true
 			}
+
+			var errorflag bool = false
 			for _, syncer := range syncers {
-				log.Printf("Processing repo: %s", syncer.URL.String())
+				repo := syncer.URL.String()
+				log.Printf("Processing repo: %s", repo)
+
 				err := syncer.StoreRepo()
 				if err != nil {
 					log.Println(err)
 					errorflag = true
+
+					if err := alertsManager.DispatchAlert(repo, err); err != nil {
+						log.Fatal(err)
+					}
 				} else {
 					log.Println("...done.")
 				}
@@ -80,19 +106,7 @@ var (
 	skipLegacyPackages bool
 )
 
-// Config maps the configuration in minima.yaml
-type Config struct {
-	Storage get.StorageConfig
-	SCC     get.SCC
-	OBS     updates.OBS
-	HTTP    []get.HTTPRepoConfig
-}
-
-func syncersFromConfig(configString string) ([]*get.Syncer, error) {
-	config, err := parseConfig(configString)
-	if err != nil {
-		return nil, err
-	}
+func syncersFromConfig(config Config) ([]*get.Syncer, error) {
 	//---passing the flag value to a global variable in get package, to disables syncing of i586 and i686 rpms (usually inside x86_64)
 	get.SkipLegacy = skipLegacyPackages
 

cmd/updates.go

@@ -28,6 +28,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
+	"github.com/uyuni-project/minima/alerts"
 	"github.com/uyuni-project/minima/get"
 	"github.com/uyuni-project/minima/updates"
 	yaml "gopkg.in/yaml.v2"
@@ -147,18 +148,41 @@ func muFindAndSync() {
 			os.Exit(3)
 		}
 
-		syncers, err := syncersFromConfig(string(byteChunk))
+		config, err := parseConfig(string(byteChunk))
+		if err != nil {
+			log.Fatalf("Error parsing configuration: %v", err)
+		}
+
+		syncers, err := syncersFromConfig(config)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		alertsManager, err := alerts.NewAlertsManager(config.Alerts)
 		if err != nil {
 			log.Fatal(err)
 		}
 
+		var errorflag bool = false
 		for _, syncer := range syncers {
-			log.Printf("Processing repo: %s", syncer.URL.String())
+			repo := syncer.URL.String()
+			log.Printf("Processing repo: %s", repo)
+
 			err := syncer.StoreRepo()
 			if err != nil {
-				log.Fatal(err)
+				log.Println(err)
+				errorflag = true
+
+				if err := alertsManager.DispatchAlert(repo, err); err != nil {
+					log.Fatal(err)
+				}
+			} else {
+				log.Println("...done.")
 			}
-			log.Println("...done.")
+		}
+
+		if errorflag {
+			os.Exit(1)
 		}
 	}
 }