small improvements

Author: gi8lino

cmd/print.go

@@ -19,9 +19,9 @@ import (
 	"certalert/internal/certificates"
 	"certalert/internal/config"
 	"certalert/internal/print"
-	"certalert/internal/utils"
 	"fmt"
 	"os"
+	"slices"
 	"strings"
 
 	"github.com/rs/zerolog/log"
@@ -55,7 +55,7 @@ Examples:
 	certalert print my-cert --output yaml
 	`,
 	Run: func(cmd *cobra.Command, args []string) {
-		if !utils.IsInList(outputFormat, supportedOutputFormats) {
+		if !slices.Contains(supportedOutputFormats, outputFormat) {
 			fmt.Printf("Unsupported output format: %s. Supported formats are: %s\n", outputFormat, strings.Join(supportedOutputFormats, ", "))
 			cmd.Help()
 			os.Exit(1)

go.mod

@@ -1,6 +1,6 @@
 module certalert
 
-go 1.21.0
+go 1.24
 
 toolchain go1.24.1
 

internal/certificates/utils.go

@@ -1,6 +1,7 @@
 package certificates
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/rs/zerolog/log"
@@ -80,7 +81,7 @@ func certExistsInSlice(cert CertificateInfo, slice []CertificateInfo) bool {
 //     If failOnError is true, returns an error with the provided error message (errMsg); otherwise, returns nil.
 func handleFailOnError(certInfoList *[]CertificateInfo, certName, certType, errMsg string, failOnError bool) error {
 	if failOnError {
-		return fmt.Errorf(errMsg)
+		return errors.New(errMsg)
 	}
 	log.Warn().Msgf("Failed to extract certificate information: %v", errMsg)
 	*certInfoList = append(*certInfoList, CertificateInfo{

internal/config/parse.go

@@ -4,8 +4,10 @@ import (
 	"certalert/internal/certificates"
 	"certalert/internal/resolve"
 	"certalert/internal/utils"
+	"errors"
 	"fmt"
 	"path/filepath"
+	"slices"
 	"strings"
 
 	"github.com/rs/zerolog/log"
@@ -46,7 +48,7 @@ func (c *Config) parseCertificatesConfig() (err error) {
 	handleFailOnError := func(cert certificates.Certificate, idx int, errMsg string) error {
 		if c.FailOnError {
 			c.Certs[idx] = cert
-			return fmt.Errorf(errMsg)
+			return errors.New(errMsg)
 		}
 		log.Warn().Msg(errMsg)
 		return nil
@@ -97,7 +99,7 @@ func (c *Config) parseCertificatesConfig() (err error) {
 		}
 
 		// The Type can be specified in the config file, but it must be one of the supported types
-		if !utils.IsInList(cert.Type, certificates.FileExtensionsTypesSorted) {
+		if !slices.Contains(certificates.FileExtensionsTypesSorted, cert.Type) {
 			if err := handleFailOnError(cert, idx, fmt.Sprintf("Certificate '%s' has an invalid type '%s'. Must be one of %s.", cert.Name, cert.Type, certificates.FileExtensionsTypesSorted)); err != nil {
 				return err
 			}
@@ -127,7 +129,7 @@ func (c *Config) parsePushgatewayConfig() (err error) {
 	// handleFailOnError is a helper function to handle errors during pushgateway validation
 	handleFailOnError := func(errMsg string) error {
 		if c.FailOnError {
-			return fmt.Errorf(errMsg)
+			return errors.New(errMsg)
 		}
 		log.Warn().Msg(errMsg)
 		return nil

internal/config/read.go

@@ -3,7 +3,6 @@ package config
 import (
 	"fmt"
 
-	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/viper"
 )
 
@@ -27,7 +26,7 @@ func (c *Config) Read(configPath string) error {
 		return fmt.Errorf("Failed to read config file: %v", err)
 	}
 
-	if err := viper.Unmarshal(c, func(d *mapstructure.DecoderConfig) { d.ZeroFields = true }); err != nil {
+	if err := viper.Unmarshal(c); err != nil {
 		return fmt.Errorf("Failed to unmarshal config file: %v", err)
 	}
 

internal/config/read_test.go

@@ -59,6 +59,6 @@ func TestReadConfig(t *testing.T) {
 		cfg := &Config{}
 		err = cfg.Read(filePath.Name())
 		assert.Error(t, err) // We expect an error because the file has incorrect content
-		assert.Contains(t, err.Error(), "Failed to unmarshal config file: 1 error(s) decoding:\n\n* cannot parse 'failOnError' as bool: strconv.ParseBool: parsing \"not_an_integer\": invalid syntax")
+		assert.Contains(t, err.Error(), "Failed to unmarshal config file: decoding failed due to the following error(s):\n\ncannot parse 'failOnError' as bool: strconv.ParseBool: parsing \"not_an_integer\": invalid syntax")
 	})
 }

internal/test_helpers/test_helpers_test.go

@@ -1,7 +1,6 @@
 package test_helpers
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 )
@@ -29,7 +28,7 @@ func TestCreateTempFile(t *testing.T) {
 func TestReadFile(t *testing.T) {
 	t.Run("successful file read", func(t *testing.T) {
 		content := "hello, world"
-		tmpfile, err := ioutil.TempFile("", "example.*.txt")
+		tmpfile, err := os.CreateTemp("", "example.*.txt")
 		if err != nil {
 			t.Fatalf("Failed to create temp file: %v", err)
 		}

internal/utils/utils.go

@@ -69,39 +69,19 @@ func BoolPtr(b bool) *bool {
 	return &b
 }
 
-// IsInList checks if a given value is present in a list of strings.
-//
-// Parameters:
-//   - value: string
-//     The value to check for in the list.
-//   - list: []string
-//     The list of strings to search for the specified value.
-//
-// Returns:
-//   - bool
-//     True if the value is found in the list, false otherwise.
-func IsInList(value string, list []string) bool {
-	for _, v := range list {
-		if value == v {
-			return true
-		}
-	}
-	return false
-}
-
-// ExtractMapKeys is a utility function that takes an interface{} argument,
+// ExtractMapKeys is a utility function that takes an any argument,
 // checks if it's a map, and then returns the keys of that map as a slice of strings.
 // If the argument is not a map or the map's keys are not strings, it returns nil.
 //
 // Parameters:
-//   - m: interface{}
+//   - m: any
 //     The input value, which is expected to be a map.
 //
 // Returns:
 //   - []string
 //     A slice of strings representing the keys of the map. If the input is not a map
 //     or if the map's keys are not strings, it returns nil.
-func ExtractMapKeys(m interface{}) []string {
+func ExtractMapKeys(m any) []string {
 	v := reflect.ValueOf(m) // Get the value of m
 
 	// Check if the value is of type 'Map'
@@ -194,15 +174,15 @@ func IsValidURL(str string) bool {
 // DeepCopy creates a deep copy of the source object and assigns it to the destination.
 //
 // Parameters:
-//   - src: interface{}
+//   - src: any
 //     The source object to be copied.
-//   - dest: interface{}
+//   - dest: any
 //     The destination object to which the copied value is assigned.
 //
 // Returns:
 //   - error
 //     An error if there was an issue during the copying process.
-func DeepCopy(src, dest interface{}) error {
+func DeepCopy(src, dest any) error {
 	copied, err := copystructure.Copy(src)
 	if err != nil {
 		return err
@@ -215,16 +195,16 @@ func DeepCopy(src, dest interface{}) error {
 // HasStructField checks if a struct has a field with the specified key.
 //
 // Parameters:
-//   - s: interface{}
+//   - s: any
 //     The struct object to be checked for the presence of the field.
 //   - key: string
 //     The key representing the field, which may include nested fields separated by dots.
 //
 // Returns:
 //   - bool
 //     True if the field with the given key exists, false otherwise.
-func HasStructField(s interface{}, key string) bool {
-	v := reflect.ValueOf(s) // Obtain the Value of the passed interface{}
+func HasStructField(s any, key string) bool {
+	v := reflect.ValueOf(s) // Obtain the Value of the passed any
 
 	keys := strings.Split(key, ".") // Split the key string by dots to handle nested keys
 

internal/utils/utils_test.go

@@ -35,26 +35,6 @@ func TestBoolPtr(t *testing.T) {
 	})
 }
 
-func TestIsInList(t *testing.T) {
-	t.Run("element exists in the list", func(t *testing.T) {
-		list := []string{"one", "two", "three"}
-		element := "one"
-
-		if !IsInList(element, list) {
-			t.Fatalf("'%s' should be in the list", element)
-		}
-	})
-
-	t.Run("element does not exist in the list", func(t *testing.T) {
-		list := []string{"one", "two", "three"}
-		element := "four"
-
-		if IsInList(element, list) {
-			t.Fatalf("'%s' should not be in the list", element)
-		}
-	})
-}
-
 func TestExtractMapKeys(t *testing.T) {
 	t.Run("Valid map with string keys", func(t *testing.T) {
 		input := map[string]int{
@@ -83,7 +63,7 @@ func TestExtractMapKeys(t *testing.T) {
 		}
 	})
 	t.Run("Valid map with mixed keys", func(t *testing.T) {
-		input := map[interface{}]string{
+		input := map[any]string{
 			1: "one",
 			2: "two",
 			3: "three",
@@ -123,7 +103,8 @@ func TestCheckFileAccessibility(t *testing.T) {
 		defer tmpFile.Close()
 		defer os.Remove(tmpFile.Name())
 
-		os.Chmod(tmpFile.Name(), 0222) // Write-only permissions
+		// Write-only permissions
+		os.Chmod(tmpFile.Name(), 0222) // nolint: errcheck
 		err = CheckFileAccessibility(tmpFile.Name())
 		if err == nil {
 			t.Errorf("Expected a 'failed to open file' error, got nil")
@@ -138,7 +119,8 @@ func TestCheckFileAccessibility(t *testing.T) {
 		defer tmpFile.Close()
 		defer os.Remove(tmpFile.Name())
 
-		os.Chmod(tmpFile.Name(), 0444) // Read-only permissions
+		// Read-only permissions
+		os.Chmod(tmpFile.Name(), 0444) // nolint: errcheck
 		err = CheckFileAccessibility(tmpFile.Name())
 		if err != nil {
 			t.Errorf("Expected no error for readable file, got %v", err)
@@ -356,7 +338,7 @@ func TestHasStructField(t *testing.T) {
 	})
 
 	t.Run("field in interface", func(t *testing.T) {
-		s := interface{}(&MyStruct{})
+		s := any(&MyStruct{})
 		key := "Name"
 		expect := true
 
@@ -368,7 +350,7 @@ func TestHasStructField(t *testing.T) {
 	})
 
 	t.Run("field nested in interface", func(t *testing.T) {
-		s := interface{}(&MyStruct{})
+		s := any(&MyStruct{})
 		key := "Inner.InnerField"
 		expect := true