Minor refactor

Revise CLI scanning (fix #32)
Provide advise for SPF soft fails (fix #30)

Author: wolveix

.golangci.yml

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 	"strings"
 
@@ -9,73 +10,84 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-func init() {
-	cmd.AddCommand(cmdConfig)
-	cmdConfig.AddCommand(cmdConfigGet)
-	cmdConfig.AddCommand(cmdConfigSet)
-	cmdConfig.AddCommand(cmdConfigShow)
-}
-
-var (
-	cmdConfig = &cobra.Command{
+func newConfigCMD() *cobra.Command {
+	cmd := &cobra.Command{
 		Use:   "config",
 		Short: "Configure your DSS instance",
 	}
 
-	cmdConfigGet = &cobra.Command{
+	cmd.AddCommand(newConfigGetCMD())
+	cmd.AddCommand(newConfigSetCMD())
+	cmd.AddCommand(newConfigShowCMD())
+
+	return cmd
+}
+
+func newConfigGetCMD() *cobra.Command {
+	cmd := &cobra.Command{
 		Use:     "get",
 		Short:   "Get a config value",
 		Example: "  dss config get nameservers",
 		Args:    cobra.ExactArgs(1),
-		Run: func(command *cobra.Command, args []string) {
+		Run: func(_ *cobra.Command, args []string) {
 			switch args[0] {
 			case "nameservers":
 				printToConsole("nameservers: " + cast.ToString(cfg.Nameservers))
 			default:
-				log.Fatal().Msg("unknown config key")
+				log.Fatal().Msg("Unknown config key")
 			}
 		},
 	}
 
-	cmdConfigSet = &cobra.Command{
+	return cmd
+}
+
+func newConfigSetCMD() *cobra.Command {
+	cmd := &cobra.Command{
 		Use:     "set",
 		Short:   "Set a config value",
 		Example: "  dss config set nameservers 8.8.8.8,9.9.9.9",
 		Args:    cobra.ExactArgs(2),
-		Run: func(command *cobra.Command, args []string) {
+		Run: func(_ *cobra.Command, args []string) {
 			switch args[0] {
 			case "nameservers":
 				cfg.Nameservers = strings.Split(args[1], ",")
 			default:
-				log.Fatal().Msg("unknown config key")
+				log.Fatal().Msg("Unknown config key")
 			}
 
 			if err := cfg.Save(); err != nil {
-				log.Fatal().Err(err).Msg("unable to save config")
+				log.Fatal().Err(err).Msg("Unable to save config")
 			}
 
 			log.Info().Msg("Config updated")
 		},
 	}
 
-	cmdConfigShow = &cobra.Command{
+	return cmd
+}
+
+func newConfigShowCMD() *cobra.Command {
+	cmd := &cobra.Command{
 		Use:     "show",
 		Short:   "Print full config",
 		Example: "  dss config show",
 		Args:    cobra.ExactArgs(0),
-		Run: func(command *cobra.Command, args []string) {
+		Run: func(_ *cobra.Command, _ []string) {
 			printToConsole(cfg)
 		},
 	}
-)
+
+	return cmd
+}
 
 type Config struct {
 	dir         string
 	path        string
 	Nameservers []string `json:"nameservers" yaml:"nameservers"`
 }
 
-func NewConfig(directory string) (*Config, error) {
+func newConfig(directory string) (*Config, error) {
 	config := Config{
 		dir:         directory,
 		path:        directory + slash + "config.yml",
@@ -90,25 +102,25 @@ func NewConfig(directory string) (*Config, error) {
 }
 
 func (c *Config) Load() error {
-	// create config if it doesn't exist
+	// Create config if it doesn't exist.
 	if _, err := os.Stat(c.path); os.IsNotExist(err) {
-		if err = os.MkdirAll(c.dir, os.ModePerm); err != nil {
-			log.Fatal().Err(err).Msg("failed to create config directory")
+		if err = os.MkdirAll(c.dir, 0o750); err != nil {
+			log.Fatal().Err(err).Msg("Failed to create config directory")
 		}
 
 		if err = c.Save(); err != nil {
 			return err
 		}
 	}
 
-	// read config
+	// Read config.
 	configData, err := os.ReadFile(c.path)
 	if err != nil {
-		log.Fatal().Err(err).Msg("unable to read config file")
+		log.Fatal().Err(err).Msg("Unable to read config file")
 	}
 
 	if err = yaml.Unmarshal(configData, &c); err != nil {
-		log.Fatal().Err(err).Msg("unable to unmarshal config values")
+		log.Fatal().Err(err).Msg("Unable to unmarshal config values")
 	}
 
 	return nil
@@ -117,8 +129,12 @@ func (c *Config) Load() error {
 func (c *Config) Save() error {
 	configData, err := yaml.Marshal(c)
 	if err != nil {
-		log.Fatal().Err(err).Msg("unable to marshal default config")
+		log.Fatal().Err(err).Msg("Unable to marshal default config")
 	}
 
-	return os.WriteFile(c.path, configData, os.ModePerm)
+	if err = os.WriteFile(c.path, configData, os.ModePerm); err != nil {
+		return fmt.Errorf("write file: %w", err)
+	}
+
+	return nil
 }