fix: switched to meshkit logger and other fixes

Signed-off-by: SHIGRAF SALIK <[email protected]>

Author: ShigrafS

utils/cue.go

@@ -111,7 +111,7 @@ func Lookup(rootVal cue.Value, path string) (cue.Value, error) {
 		return res, ErrCueLookup(res.Err())
 	}
 	if !res.Exists() {
-		return res, ErrCueLookup(fmt.Errorf("Could not find the value at the path: %s", path))
+		return res, ErrCueLookup(fmt.Errorf("could not find the value at the path: %s", path))
 	}
 
 	return res.Value(), nil

utils/utils.go

@@ -136,23 +136,33 @@ func GetHome() string {
 	return usr.HomeDir
 }
 
-// CreateFile creates a file with the given content on the given location with
-// the given filename
+// CreateFile creates a file with the given content at the specified location.
 func CreateFile(contents []byte, filename string, location string) error {
-	// Create file in -rw-r--r-- mode
-	fd, err := os.OpenFile(filepath.Join(location, filename), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	log, err := logger.New("utils", logger.Options{})
 	if err != nil {
+		// Cannot create logger, return the underlying error.
 		return err
 	}
 
+	filePath := filepath.Join(location, filename)
+	fd, err := os.Create(filePath)
+	if err != nil {
+		return err // Or a meshkit-style error wrapper
+	}
+
 	if _, err = fd.Write(contents); err != nil {
-		fd.Close() // Close the file before returning the error
+		// Attempt to close the file descriptor, but prioritize the original write error.
+		// Log the closing error if it occurs, so the information is not lost.
+		if closeErr := fd.Close(); closeErr != nil {
+			log.Warn(fmt.Errorf("failed to close file descriptor for %s after a write error: %w", filename, closeErr))
+		}
 		return err
 	}
 
-	// Check error while closing the file
+	// Check for an error while closing the file.
 	if err := fd.Close(); err != nil {
-		return fmt.Errorf("failed to close file descriptor: %w", err)
+		// Return a standardized meshkit-style error.
+		return ErrFileClose(err, filename)
 	}
 
 	return nil
@@ -890,8 +900,8 @@ func TruncateErrorMessage(err error, wordLimit int) error {
 	words := strings.Fields(err.Error())
 	if len(words) > wordLimit {
 		words = words[:wordLimit]
-		return fmt.Errorf("%s...", strings.Join(words, " "))
+		return fmt.Errorf("%s", strings.Join(words, " "))
 	}
 
 	return err
-}
+}

utils/walker/git.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/meshery/meshkit/logger"
 )
 
 // Git represents the Git Walker
@@ -136,6 +137,11 @@ func (g *Git) RegisterDirInterceptor(i DirInterceptor) *Git {
 	return g
 }
 func clonewalk(g *Git) error {
+	log, err := logger.New("walker-git", logger.Options{})
+	if err != nil {
+		return err
+	}
+
 	if g.maxFileSizeInBytes == 0 {
 		return ErrInvalidSizeFile(errors.New("max file size passed as 0. Will not read any file"))
 	}
@@ -145,10 +151,9 @@ func clonewalk(g *Git) error {
 	defer func() {
 		wg.Wait()
 		if err := os.RemoveAll(path); err != nil {
-			fmt.Println(fmt.Errorf("failed to remove path %s: %w", path, err))
+			log.Error(fmt.Errorf("failed to remove path %s: %w", path, err))
 		}
 	}()
-	var err error
 	cloneOptions := &git.CloneOptions{
 		URL:          fmt.Sprintf("%s/%s/%s", g.baseURL, g.owner, g.repo),
 		SingleBranch: true,
@@ -177,7 +182,7 @@ func clonewalk(g *Git) error {
 	}
 
 	if !info.IsDir() {
-		err = g.readFile(info, rootPath)
+		err = g.readFile(info, rootPath, log)
 		if err != nil {
 			return ErrCloningRepo(err)
 		}
@@ -199,7 +204,7 @@ func clonewalk(g *Git) error {
 			if err != nil {
 				return errInfo
 			}
-			return g.readFile(f, path)
+			return g.readFile(f, path, log)
 		})
 		if err != nil {
 			return ErrCloningRepo(err)
@@ -233,31 +238,32 @@ func clonewalk(g *Git) error {
 					Path: fPath,
 				})
 				if err != nil {
-					fmt.Println(err.Error())
+					log.Error(err)
 				}
 			}(name, fPath, f.Name())
 			continue
 		}
 		if f.IsDir() {
 			continue
 		}
-		err := g.readFile(f, fPath)
+		err := g.readFile(f, fPath, log)
 		if err != nil {
-			fmt.Println(err.Error())
+			log.Error(err)
 		}
 	}
 
 	return nil
 }
 
-func (g *Git) readFile(f fs.FileInfo, path string) error {
+func (g *Git) readFile(f fs.FileInfo, path string, log logger.Handler) error {
 	if f.Size() > g.maxFileSizeInBytes {
 		return ErrInvalidSizeFile(errors.New("File exceeding size limit"))
 	}
 	filename, err := os.Open(path)
 	if err != nil {
 		return err
 	}
+	defer filename.Close()
 	content, err := io.ReadAll(filename)
 	if err != nil {
 		return err
@@ -268,7 +274,7 @@ func (g *Git) readFile(f fs.FileInfo, path string) error {
 		Content: string(content),
 	})
 	if err != nil {
-		fmt.Println("Could not intercept the file ", f.Name())
+		log.Warnf("Could not intercept the file %s: %v", f.Name(), err)
 	}
 	return err
 }