Refactor codebase

cmd/detect.go

@@ -1,12 +1,11 @@
 package cmd
 
 import (
-	"strconv"
-
-	"github.com/boringtools/git-alerts/common"
-	"github.com/boringtools/git-alerts/gh"
-	"github.com/boringtools/git-alerts/logger"
-	"github.com/boringtools/git-alerts/secrets"
+	"github.com/boringtools/git-alerts/pkg/common"
+	"github.com/boringtools/git-alerts/pkg/github"
+	"github.com/boringtools/git-alerts/pkg/secrets"
+	"github.com/boringtools/git-alerts/pkg/ui"
+	"github.com/boringtools/git-alerts/pkg/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -15,29 +14,19 @@ var detectCmd = &cobra.Command{
 	Short: "Scan with secrets detection",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
-		envs := map[string]string{
-			"org":                 org,
-			"rfp":                 report,
-			"command":             cmd.Use,
-			"csv":                 strconv.FormatBool(csv),
-			"trufflehog":          strconv.FormatBool(trufflehog),
-			"trufflehog-verified": strconv.FormatBool(trufflehogVerified),
-			"gitleaks":            strconv.FormatBool(gitleaks),
-		}
-		common.SetEnvs(envs)
-
-		gh.Connecter()
-		secrets.GetSecrets()
+		common.Command = cmd.Use
+		github.Connecter()
+		secrets.RunSecretsScan()
 
-		logger.LogP("Scan ended : ", common.GetTime())
+		ui.PrintSuccess("Scan Ended : %s", utils.GetCurrentTime())
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(detectCmd)
-	detectCmd.PersistentFlags().BoolVarP(&trufflehog, "trufflehog", "t", false, "Scan secrets using Trufflehog")
-	detectCmd.PersistentFlags().BoolVarP(&trufflehogVerified, "trufflehog-verified", "v", true, "Scan Trufflehog verified secrets")
-	detectCmd.PersistentFlags().BoolVarP(&gitleaks, "gitleaks", "g", false, "Scan secrets using Gitleaks")
+	detectCmd.PersistentFlags().BoolVarP(&common.TrufflehogScan, "trufflehog", "t", false, "Scan secrets using Trufflehog")
+	detectCmd.PersistentFlags().BoolVarP(&common.TrufflehogVerifiedScan, "trufflehog-verified", "v", true, "Scan secrets using Trufflehog verified option")
+	detectCmd.PersistentFlags().BoolVarP(&common.GitleaksScan, "gitleaks", "g", false, "Scan secrets using Gitleaks")
 
 	detectCmd.MarkFlagsOneRequired("trufflehog", "trufflehog-verified", "gitleaks")
 }

cmd/monitor.go

@@ -1,13 +1,14 @@
 package cmd
 
 import (
-	"strconv"
+	"os"
 
-	"github.com/boringtools/git-alerts/common"
-	"github.com/boringtools/git-alerts/gh"
+	"github.com/boringtools/git-alerts/pkg/common"
+	"github.com/boringtools/git-alerts/pkg/github"
+	"github.com/boringtools/git-alerts/pkg/notification"
+	"github.com/boringtools/git-alerts/pkg/ui"
+	"github.com/boringtools/git-alerts/pkg/utils"
 
-	"github.com/boringtools/git-alerts/logger"
-	"github.com/boringtools/git-alerts/reporter"
 	"github.com/spf13/cobra"
 )
 
@@ -16,25 +17,29 @@ var monitorCmd = &cobra.Command{
 	Short: "Monitor public repositories",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
+		common.Command = cmd.Use
 
-		envs := map[string]string{
-			"org":     org,
-			"rfp":     report,
-			"command": cmd.Use,
-			"csv":     strconv.FormatBool(csv),
-			"slack":   strconv.FormatBool(slack),
+		if common.SlackNotification {
+			_, isSlackHook := os.LookupEnv("SLACK_HOOK")
+
+			if !isSlackHook {
+				ui.PrintError("SLACK_HOOK is not configured in ENV variable")
+				os.Exit(1)
+			}
 		}
 
-		common.SetEnvs(envs)
+		if !utils.IsPreviousScanFileExists() {
+			ui.PrintError("Previous scan files not found, Please consider running SCAN command first")
+			os.Exit(1)
+		}
 
-		common.CheckScanFiles()
-		gh.Connecter()
-		reporter.Notify()
-		logger.LogP("Scan ended : ", common.GetTime())
+		github.Connecter()
+		notification.Notify()
+		ui.PrintSuccess("Scan Ended : %s", utils.GetCurrentTime())
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(monitorCmd)
-	monitorCmd.PersistentFlags().BoolVarP(&slack, "slack-alert", "s", false, "Slack notification")
+	monitorCmd.PersistentFlags().BoolVarP(&common.SlackNotification, "slack-alert", "s", false, "Slack notification")
 }

cmd/root.go

@@ -3,24 +3,14 @@ package cmd
 import (
 	"os"
 
+	"github.com/boringtools/git-alerts/pkg/common"
 	"github.com/spf13/cobra"
 )
 
-var (
-	org    string
-	report string
-	csv    bool
-	slack  bool
-	trufflehog bool
-	trufflehogVerified bool
-	gitleaks bool
-)
-
 var rootCmd = &cobra.Command{
 	Use:   "git-alerts",
 	Short: "A Public Git repository & misconfiguration detection tool",
 	Long:  ``,
-	// Run: func(cmd *cobra.Command, args []string) { },
 }
 
 func Execute() {
@@ -31,9 +21,7 @@ func Execute() {
 }
 
 func init() {
-	rootCmd.PersistentFlags().StringVarP(&org, "org", "o", "", "GitHub organization name")
+	rootCmd.PersistentFlags().StringVarP(&common.GitHubOrg, "org", "o", "", "GitHub organization name")
 	rootCmd.MarkPersistentFlagRequired("org")
-	rootCmd.PersistentFlags().BoolVarP(&csv, "csv", "c", false, "CSV report format")
-	rootCmd.PersistentFlags().StringVarP(&report, "report-path", "r", "/tmp/", "Report file path")
-
+	rootCmd.PersistentFlags().StringVarP(&common.ReportPath, "report-path", "r", "/tmp/", "Report file path")
 }

cmd/scan.go

@@ -1,11 +1,10 @@
 package cmd
 
 import (
-	"strconv"
-
-	"github.com/boringtools/git-alerts/common"
-	"github.com/boringtools/git-alerts/gh"
-	"github.com/boringtools/git-alerts/logger"
+	"github.com/boringtools/git-alerts/pkg/common"
+	"github.com/boringtools/git-alerts/pkg/github"
+	"github.com/boringtools/git-alerts/pkg/ui"
+	"github.com/boringtools/git-alerts/pkg/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -15,17 +14,10 @@ var scanCmd = &cobra.Command{
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
 
-		envs := map[string]string{
-			"org":     org,
-			"rfp":     report,
-			"command": cmd.Use,
-			"csv":     strconv.FormatBool(csv),
-		}
-
-		common.SetEnvs(envs)
-		gh.Connecter()
+		common.Command = cmd.Use
+		github.Connecter()
 
-		logger.LogP("Scan ended : ", common.GetTime())
+		ui.PrintSuccess("Scan Ended : %s", utils.GetCurrentTime())
 	},
 }