Clear cache on startup, use tempDir for unpacking

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: oceanc80

catalogd/cmd/catalogd/main.go

@@ -257,6 +257,10 @@ func main() {
 		systemNamespace = podNamespace()
 	}
 
+	if err := clearCacheDir(cacheDir); err != nil {
+		setupLog.Error(err, "unable to clear cache directory")
+		os.Exit(1)
+	}
 	if err := os.MkdirAll(cacheDir, 0700); err != nil {
 		setupLog.Error(err, "unable to create cache directory")
 		os.Exit(1)
@@ -392,3 +396,16 @@ func podNamespace() string {
 	}
 	return string(namespace)
 }
+
+func clearCacheDir(cacheDirPath string) error {
+	entries, err := os.ReadDir(cacheDirPath)
+	if err != nil && !os.IsNotExist(err) {
+		return err
+	}
+	for _, entry := range entries {
+		if err := os.RemoveAll(filepath.Join(cacheDirPath, entry.Name())); err != nil {
+			return err
+		}
+	}
+	return nil
+}

catalogd/internal/source/containers_image.go

@@ -76,12 +76,9 @@ func (i *ContainersImageRegistry) Unpack(ctx context.Context, catalog *catalogdv
 	//
 	//////////////////////////////////////////////////////
 	unpackPath := i.unpackPath(catalog.Name, canonicalRef.Digest())
-	if unpackStat, err := os.Stat(unpackPath); err == nil {
-		if !unpackStat.IsDir() {
-			panic(fmt.Sprintf("unexpected file at unpack path %q: expected a directory", unpackPath))
-		}
+	if isUnpacked, unpackTime := isImageUnpacked(unpackPath); isUnpacked {
 		l.Info("image already unpacked", "ref", imgRef.String(), "digest", canonicalRef.Digest().String())
-		return successResult(unpackPath, canonicalRef, unpackStat.ModTime()), nil
+		return successResult(unpackPath, canonicalRef, unpackTime), nil
 	}
 
 	//////////////////////////////////////////////////////
@@ -296,6 +293,10 @@ func (i *ContainersImageRegistry) unpackImage(ctx context.Context, unpackPath st
 		return wrapTerminal(fmt.Errorf("catalog image is missing the required label %q", ConfigDirLabel), specIsCanonical)
 	}
 
+	// ensure unpack directory is empty
+	if err := os.RemoveAll(unpackPath); err != nil {
+		return fmt.Errorf("error removing unpacked path: %w", err)
+	}
 	if err := os.MkdirAll(unpackPath, 0700); err != nil {
 		return fmt.Errorf("error creating unpack directory: %w", err)
 	}
@@ -431,3 +432,13 @@ func wrapTerminal(err error, isTerminal bool) error {
 	}
 	return reconcile.TerminalError(err)
 }
+
+func isImageUnpacked(unpackPath string) (bool, time.Time) {
+	if unpackStat, err := os.Stat(unpackPath); err == nil {
+		if !unpackStat.IsDir() {
+			panic(fmt.Sprintf("unexpected file at unpack path %q: expected a directory", unpackPath))
+		}
+		return true, unpackStat.ModTime()
+	}
+	return false, time.Time{}
+}