feedback updates

pkg/combustion/combustion.go

@@ -62,7 +62,6 @@ type Combustion struct {
 	RPMResolver                  rpmResolver
 	RPMRepoCreator               rpmRepoCreator
 	Registry                     embeddedRegistry
-	CacheDir                     string
 }
 
 // Configure iterates over all separate Combustion components and configures them independently.

pkg/combustion/registry.go

@@ -2,7 +2,6 @@ package combustion
 
 import (
 	_ "embed"
-	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -239,12 +238,7 @@ func populateRegistry(ctx *image.Context, images []string) error {
 		imageCacheLocation := filepath.Join(imageCacheDir, convertedImageName)
 		imageTarDest := filepath.Join(registryArtefactsPath(ctx), convertedImageName)
 
-		exists, err := imageExists(imageCacheLocation)
-		if err != nil {
-			return fmt.Errorf("checking if image already cached: %w", err)
-		}
-
-		if exists {
+		if fileio.FileExists(imageCacheLocation) {
 			if err = fileio.CopyFile(imageCacheLocation, imageTarDest, fileio.ExecutablePerms); err != nil {
 				return fmt.Errorf("copying cached container image: %w", err)
 			}
@@ -257,7 +251,7 @@ func populateRegistry(ctx *image.Context, images []string) error {
 				return fmt.Errorf("generating registry store tarball: %w", err)
 			}
 
-			if err = fileio.CopyFile(imageTarDest, imageCacheLocation, fileio.ExecutablePerms); err != nil {
+			if err = fileio.CopyFile(imageTarDest, imageCacheLocation, fileio.NonExecutablePerms); err != nil {
 				return fmt.Errorf("copying container image to cache: %w", err)
 			}
 		}
@@ -268,15 +262,3 @@ func populateRegistry(ctx *image.Context, images []string) error {
 
 	return nil
 }
-
-func imageExists(imagePath string) (bool, error) {
-	if _, err := os.Stat(imagePath); err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			return false, nil
-		}
-
-		return false, fmt.Errorf("looking for cached image: %w", err)
-	}
-
-	return true, nil
-}

pkg/fileio/file_io.go

@@ -130,3 +130,16 @@ func createFileWithPerms(dest string, perms os.FileMode) (*os.File, error) {
 
 	return file, nil
 }
+
+func FileExists(filePath string) bool {
+	if _, err := os.Stat(filePath); err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			return false
+		}
+
+		zap.S().Warnf("Searching for file at (%s) failed: %s", filePath, err)
+		return false
+	}
+
+	return true
+}