Merge pull request #156 from clobrano/fix-deprecations/0

Fix some deprecations
medik8s · Oct 28, 2023 · 6786790 · 6786790
2 parents 2b6fae3 + 6b9769b
commit 6786790
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/pkg/certificates/storage.go b/pkg/certificates/storage.go
@@ -96,7 +96,7 @@ func (s *SecretCertStorage) StoreCerts(caPem, certPem, keyPem *bytes.Buffer) err
 			Namespace: s.namespace,
 			Name:      secretName,
 		},
-		Immutable: pointer.BoolPtr(true),
+		Immutable: pointer.Bool(true),
 		Data:      nil,
 		StringData: map[string]string{
 			caPemKey:   caPem.String(),

diff --git a/pkg/watchdog/linux.go b/pkg/watchdog/linux.go
@@ -2,7 +2,6 @@ package watchdog
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -79,7 +78,7 @@ func NewLinux(log logr.Logger) (Watchdog, error) {
 			return nil, err
 		}
 
-		newWatchdogDevice, err := getLastModifiedWatchdog()
+		newWatchdogDevice, err := getLastModifiedWatchdog(log)
 
 		if err != nil {
 			log.Error(err, "failed to find softdog path")
@@ -105,26 +104,32 @@ func NewLinux(log logr.Logger) (Watchdog, error) {
 
 // this func returns watchdog path with the latest modification time assuming that
 // after softdog enablement
-func getLastModifiedWatchdog() (string, error) {
-	files, err := ioutil.ReadDir(watchdogsFolder)
+func getLastModifiedWatchdog(log logr.Logger) (string, error) {
+	entries, err := os.ReadDir(watchdogsFolder)
 	if err != nil {
 		return "", errors.Wrap(err, "failed to list watchdogs folder: "+watchdogsFolder)
 	}
 
 	maxModTime := time.Time{}
 	latestWatchdog := ""
-	for _, file := range files {
-		if file.IsDir() {
+	for _, entry := range entries {
+		if entry.IsDir() {
 			continue
 		}
 
-		if !strings.HasPrefix(file.Name(), watchdogPrefix) {
+		if !strings.HasPrefix(entry.Name(), watchdogPrefix) {
 			continue
 		}
 
-		if file.ModTime().After(maxModTime) || file.ModTime().Equal(maxModTime) {
-			maxModTime = file.ModTime()
-			latestWatchdog = filepath.Join(watchdogsFolder, file.Name())
+		fileInfo, err := entry.Info()
+		if err != nil {
+			log.Error(err, "failed to get info for file in watchdogs folder", "file", entry.Name(), "watchdog folder", watchdogsFolder)
+			continue
+		}
+
+		if fileInfo.ModTime().After(maxModTime) || fileInfo.ModTime().Equal(maxModTime) {
+			maxModTime = fileInfo.ModTime()
+			latestWatchdog = filepath.Join(watchdogsFolder, entry.Name())
 		}
 	}