updates

Signed-off-by: ashpect <[email protected]>

pkg/imgpkg/cmd/copy_repo_src.go

@@ -5,6 +5,7 @@ package cmd
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 
 	regname "github.com/google/go-containerregistry/pkg/name"
@@ -76,7 +77,11 @@ func (c CopyRepoSrc) CopyToRepo(repo string) (*ctlimgset.ProcessedImages, error)
 		}
 
 		if c.OciFlags.IsOci() {
-			tempDir, err = image.ExtractOciTarGz(c.OciFlags.OcitoReg)
+			tempDir, err := ioutil.TempDir("", "imgpkg-oci-extract-")
+			if err != nil {
+				return nil, err
+			}
+			err = image.ExtractOciTarGz(c.OciFlags.OcitoReg, tempDir)
 			if err != nil {
 				return nil, err
 			}

pkg/imgpkg/image/tar_image.go

@@ -8,7 +8,6 @@ import (
 	"compress/gzip"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -243,69 +242,56 @@ func CreateOciTarFileAndDeleteFolder(source, target string) error {
 	return nil
 }
 
-func ExtractOciTarGz(tarGzFilePath string) (string, error) {
-	// Create a temporary directory
-	tempDir, err := ioutil.TempDir("", "imgpkg-oci-extract-")
-	if err != nil {
-		return "", err
+func ExtractOciTarGz(inputDir, extractDir string) error {
+
+	if !strings.HasSuffix(inputDir, ".tar.gz") {
+		return fmt.Errorf("inputDir '%s' is not a tar.gz file", inputDir)
 	}
-	//defer os.RemoveAll(tempDir) // Clean up the temporary directory when done
 
-	// Open the tar.gz file
-	tarGzFile, err := os.Open(tarGzFilePath)
+	tarGzFile, err := os.Open(inputDir)
 	if err != nil {
-		return "", err
+		return err
 	}
 	defer tarGzFile.Close()
 
-	// Create a gzip reader
 	gzipReader, err := gzip.NewReader(tarGzFile)
 	if err != nil {
-		return "", err
+		return err
 	}
 	defer gzipReader.Close()
 
 	// Create a tar reader
 	tarReader := tar.NewReader(gzipReader)
-
-	// Extract files to the temporary directory
 	for {
 		header, err := tarReader.Next()
 
 		if err == io.EOF {
 			break // End of archive
 		}
-
 		if err != nil {
-			return "", err
+			return err
 		}
+		targetPath := filepath.Join(extractDir, header.Name)
 
-		// Construct the full path to the file in the temporary directory
-		targetPath := filepath.Join(tempDir, header.Name)
-
-		// Check if the file is a directory
 		if header.FileInfo().IsDir() {
-			// Create the directory
 			err := os.MkdirAll(targetPath, os.ModePerm)
 			if err != nil {
-				return "", err
+				return err
 			}
 			continue
 		}
 
-		// Create the file
 		file, err := os.Create(targetPath)
 		if err != nil {
-			return "", err
+			return err
 		}
 		defer file.Close()
 
-		// Copy the file contents
 		_, err = io.Copy(file, tarReader)
 		if err != nil {
-			return "", err
+			return err
 		}
 	}
 
-	return tempDir, nil
+	return nil
 }

pkg/imgpkg/imagetar/tar_reader.go

@@ -160,8 +160,7 @@ func (r TarReader) ReadOci(reponame string) ([]imagedesc.ImageOrIndex, error) {
 	}
 
 	if !stat.IsDir() {
-		//give error "not a directory"
-		return nil, err
+		return nil, fmt.Errorf("path %s is not a directory", r.path)
 	}
 
 	//TODO : FromPath checks for index.json but does not check for oci-layout, so add a check for oci-layout here.