From cb9775ca87cf3cc3ba37be467fa440ac95986c6f Mon Sep 17 00:00:00 2001
From: Dean Hunter <dean.hunter@coreview.com>
Date: Mon, 19 Feb 2024 17:42:41 +0100
Subject: [PATCH] Added directory creation if it does not exist.

---
 Client/io/io.go      | 60 +++++++++++++++++++++++++-------------------
 Client/kaniko/cmd.go |  2 +-
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/Client/io/io.go b/Client/io/io.go
index 54b93bd..0f42d0d 100644
--- a/Client/io/io.go
+++ b/Client/io/io.go
@@ -1,12 +1,11 @@
 package io
 
 import (
+	"io"
 	"os"
 	"path/filepath"
-	"io"
 )
 
-
 func CopyDir(src string, dest string) error {
 	// Get properties of source directory
 	srcInfo, err := os.Stat(src)
@@ -14,28 +13,30 @@ func CopyDir(src string, dest string) error {
 		return err
 	}
 
-	// Create the destination directory
+	// Create the destination directory with the same permissions as the source
 	err = os.MkdirAll(dest, srcInfo.Mode())
 	if err != nil {
 		return err
 	}
 
-	directory, _ := os.Open(src)
-	objects, err := directory.Readdir(-1)
+	entries, err := os.ReadDir(src)
+	if err != nil {
+		return err
+	}
 
-	for _, obj := range objects {
-		srcFilePointer := filepath.Join(src, obj.Name())
-		destFilePointer := filepath.Join(dest, obj.Name())
+	for _, entry := range entries {
+		srcPath := filepath.Join(src, entry.Name())
+		destPath := filepath.Join(dest, entry.Name())
 
-		if obj.IsDir() {
-			// Create sub-directories, recursively.
-			err = CopyDir(srcFilePointer, destFilePointer)
+		if entry.IsDir() {
+			// Recursively copy sub-directories
+			err = CopyDir(srcPath, destPath)
 			if err != nil {
 				return err
 			}
 		} else {
-			// Perform the file copy.
-			err = CopyFile(srcFilePointer, destFilePointer)
+			// Copy the file
+			err = CopyFile(srcPath, destPath)
 			if err != nil {
 				return err
 			}
@@ -45,27 +46,34 @@ func CopyDir(src string, dest string) error {
 	return nil
 }
 
-func CopyFile(src, dst string) error {
-	var err error
-	var srcfd *os.File
-	var dstfd *os.File
-	var srcinfo os.FileInfo
-
-	if srcfd, err = os.Open(src); err != nil {
+func CopyFile(src, dest string) error {
+	srcFile, err := os.Open(src)
+	if err != nil {
 		return err
 	}
-	defer srcfd.Close()
+	defer srcFile.Close()
 
-	if dstfd, err = os.Create(dst); err != nil {
+	// Get the file information
+	srcInfo, err := srcFile.Stat()
+	if err != nil {
 		return err
 	}
-	defer dstfd.Close()
 
-	if _, err = io.Copy(dstfd, srcfd); err != nil {
+	// Ensure the destination directory exists
+	destDir := filepath.Dir(dest)
+	err = os.MkdirAll(destDir, srcInfo.Mode().Perm())
+	if err != nil {
 		return err
 	}
-	if srcinfo, err = os.Stat(src); err != nil {
+
+	// Create the destination file
+	destFile, err := os.OpenFile(dest, os.O_RDWR|os.O_CREATE|os.O_TRUNC, srcInfo.Mode())
+	if err != nil {
 		return err
 	}
-	return os.Chmod(dst, srcinfo.Mode())
+	defer destFile.Close()
+
+	// Copy the file content
+	_, err = io.Copy(destFile, srcFile)
+	return err
 }
\ No newline at end of file
diff --git a/Client/kaniko/cmd.go b/Client/kaniko/cmd.go
index afdf320..5a5d2d5 100644
--- a/Client/kaniko/cmd.go
+++ b/Client/kaniko/cmd.go
@@ -60,7 +60,7 @@ func (kd *KanikoDocker) CopyContextAndDockerfile(contextPath string, dockerfileP
 
 		// Calculate the path that the Dockerfile will have inside the RootDir.
 		dockerfileInsideRootDir := filepath.Join(kanikoExecutor.RootDir, filepath.Base(dockerfilePath))
-
+		fmt.Println("Copying "+dockerfilePath+" to :"+dockerfileInsideRootDir)
 		// Copy the Dockerfile to the desired location inside RootDir.
 		err = io.CopyFile(dockerfilePath, dockerfileInsideRootDir)
 		if err != nil {