fixed remote code (#407)

cmd/hauler/cli/store/add.go

@@ -10,10 +10,10 @@ import (
 	"hauler.dev/go/hauler/internal/flags"
 	v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1"
 	"hauler.dev/go/hauler/pkg/artifacts/file"
-	"hauler.dev/go/hauler/pkg/artifacts/file/getter"
 	"hauler.dev/go/hauler/pkg/consts"
 	"hauler.dev/go/hauler/pkg/content/chart"
 	"hauler.dev/go/hauler/pkg/cosign"
+	"hauler.dev/go/hauler/pkg/getter"
 	"hauler.dev/go/hauler/pkg/log"
 	"hauler.dev/go/hauler/pkg/reference"
 	"hauler.dev/go/hauler/pkg/store"

cmd/hauler/cli/store/load.go

@@ -10,9 +10,9 @@ import (
 
 	"hauler.dev/go/hauler/internal/flags"
 	"hauler.dev/go/hauler/pkg/archives"
-	"hauler.dev/go/hauler/pkg/artifacts/file/getter"
 	"hauler.dev/go/hauler/pkg/consts"
 	"hauler.dev/go/hauler/pkg/content"
+	"hauler.dev/go/hauler/pkg/getter"
 	"hauler.dev/go/hauler/pkg/log"
 	"hauler.dev/go/hauler/pkg/store"
 )
@@ -50,14 +50,35 @@ func LoadCmd(ctx context.Context, o *flags.LoadOpts, rso *flags.StoreRootOpts, r
 func unarchiveLayoutTo(ctx context.Context, haulPath string, dest string, tempDir string) error {
 	l := log.FromContext(ctx)
 
-	// if archivePath detects a remote URL... download it
 	if strings.HasPrefix(haulPath, "http://") || strings.HasPrefix(haulPath, "https://") {
 		l.Debugf("detected remote archive... starting download... [%s]", haulPath)
-		var err error
-		haulPath, err = downloadRemote(ctx, haulPath, tempDir)
+
+		h := getter.NewHttp()
+		parsedURL, err := url.Parse(haulPath)
 		if err != nil {
 			return err
 		}
+		rc, err := h.Open(ctx, parsedURL)
+		if err != nil {
+			return err
+		}
+		defer rc.Close()
+
+		fileName := h.Name(parsedURL)
+		if fileName == "" {
+			fileName = filepath.Base(parsedURL.Path)
+		}
+		haulPath = filepath.Join(tempDir, fileName)
+
+		out, err := os.Create(haulPath)
+		if err != nil {
+			return err
+		}
+		defer out.Close()
+
+		if _, err = io.Copy(out, rc); err != nil {
+			return err
+		}
 	}
 
 	if err := archives.Unarchive(ctx, haulPath, tempDir); err != nil {
@@ -77,35 +98,3 @@ func unarchiveLayoutTo(ctx context.Context, haulPath string, dest string, tempDi
 	_, err = s.CopyAll(ctx, ts, nil)
 	return err
 }
-
-// downloadRemote downloads the remote file using the existing getter
-func downloadRemote(ctx context.Context, remoteURL, tempDirDest string) (string, error) {
-	parsedURL, err := url.Parse(remoteURL)
-	if err != nil {
-		return "", err
-	}
-	h := getter.NewHttp()
-	rc, err := h.Open(ctx, parsedURL)
-	if err != nil {
-		return "", err
-	}
-	defer rc.Close()
-
-	fileName := h.Name(parsedURL)
-	if fileName == "" {
-		fileName = filepath.Base(parsedURL.Path)
-	}
-
-	localPath := filepath.Join(tempDirDest, fileName)
-	out, err := os.Create(localPath)
-	if err != nil {
-		return "", err
-	}
-	defer out.Close()
-
-	if _, err = io.Copy(out, rc); err != nil {
-		return "", err
-	}
-
-	return localPath, nil
-}

cmd/hauler/cli/store/sync.go

@@ -18,12 +18,12 @@ import (
 	convert "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/convert"
 	v1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1"
 	v1alpha1 "hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1alpha1"
-	"hauler.dev/go/hauler/pkg/artifacts/file/getter"
 	tchart "hauler.dev/go/hauler/pkg/collection/chart"
 	"hauler.dev/go/hauler/pkg/collection/imagetxt"
 	"hauler.dev/go/hauler/pkg/consts"
 	"hauler.dev/go/hauler/pkg/content"
 	"hauler.dev/go/hauler/pkg/cosign"
+	"hauler.dev/go/hauler/pkg/getter"
 	"hauler.dev/go/hauler/pkg/log"
 	"hauler.dev/go/hauler/pkg/reference"
 	"hauler.dev/go/hauler/pkg/store"
@@ -84,29 +84,53 @@ func SyncCmd(ctx context.Context, o *flags.SyncOpts, s *store.Layout, rso *flags
 		l.Infof("processing completed successfully")
 	}
 
-	// if passed a local manifest, process it
+	// If passed a local manifest, process it
 	for _, fileName := range o.FileName {
 		l.Infof("processing manifest [%s] to store [%s]", fileName, o.StoreDir)
-		var localFileName string
 
-		if strings.HasPrefix(fileName, "http://") || strings.HasPrefix(fileName, "https://") {
-			l.Debugf("detected remote manifest... starting download... [%s]", fileName)
-			var err error
-			localFileName, err = downloadRemote(ctx, fileName, tempDir)
+		haulPath := fileName
+		if strings.HasPrefix(haulPath, "http://") || strings.HasPrefix(haulPath, "https://") {
+			l.Debugf("detected remote manifest... starting download... [%s]", haulPath)
+
+			h := getter.NewHttp()
+			parsedURL, err := url.Parse(haulPath)
 			if err != nil {
 				return err
 			}
-		} else {
-			localFileName = fileName
+			rc, err := h.Open(ctx, parsedURL)
+			if err != nil {
+				return err
+			}
+			defer rc.Close()
+
+			fileName := h.Name(parsedURL)
+			if fileName == "" {
+				fileName = filepath.Base(parsedURL.Path)
+			}
+			haulPath = filepath.Join(tempDir, fileName)
+
+			out, err := os.Create(haulPath)
+			if err != nil {
+				return err
+			}
+			defer out.Close()
+
+			if _, err = io.Copy(out, rc); err != nil {
+				return err
+			}
 		}
-		fi, err := os.Open(localFileName)
+
+		fi, err := os.Open(haulPath)
 		if err != nil {
 			return err
 		}
+		defer fi.Close()
+
 		err = processContent(ctx, fi, o, s, rso, ro)
 		if err != nil {
 			return err
 		}
+
 		l.Infof("processing completed successfully")
 	}
 
@@ -446,35 +470,3 @@ func processContent(ctx context.Context, fi *os.File, o *flags.SyncOpts, s *stor
 	}
 	return nil
 }
-
-// downloadRemote downloads the remote file using the existing getter
-func downloadRemote(ctx context.Context, remoteURL, tempDirDest string) (string, error) {
-	parsedURL, err := url.Parse(remoteURL)
-	if err != nil {
-		return "", err
-	}
-	h := getter.NewHttp()
-	rc, err := h.Open(ctx, parsedURL)
-	if err != nil {
-		return "", err
-	}
-	defer rc.Close()
-
-	fileName := h.Name(parsedURL)
-	if fileName == "" {
-		fileName = filepath.Base(parsedURL.Path)
-	}
-
-	localPath := filepath.Join(tempDirDest, fileName)
-	out, err := os.Create(localPath)
-	if err != nil {
-		return "", err
-	}
-	defer out.Close()
-
-	if _, err = io.Copy(out, rc); err != nil {
-		return "", err
-	}
-
-	return localPath, nil
-}

pkg/artifacts/file/file.go

@@ -8,8 +8,8 @@ import (
 	gtypes "github.com/google/go-containerregistry/pkg/v1/types"
 
 	"hauler.dev/go/hauler/pkg/artifacts"
-	"hauler.dev/go/hauler/pkg/artifacts/file/getter"
 	"hauler.dev/go/hauler/pkg/consts"
+	"hauler.dev/go/hauler/pkg/getter"
 )
 
 // interface guard

pkg/artifacts/file/file_test.go

@@ -14,8 +14,8 @@ import (
 	"github.com/spf13/afero"
 
 	"hauler.dev/go/hauler/pkg/artifacts/file"
-	"hauler.dev/go/hauler/pkg/artifacts/file/getter"
 	"hauler.dev/go/hauler/pkg/consts"
+	"hauler.dev/go/hauler/pkg/getter"
 )
 
 var (

pkg/artifacts/file/options.go

@@ -2,7 +2,7 @@ package file
 
 import (
 	"hauler.dev/go/hauler/pkg/artifacts"
-	"hauler.dev/go/hauler/pkg/artifacts/file/getter"
+	"hauler.dev/go/hauler/pkg/getter"
 )
 
 type Option func(*File)

pkg/collection/imagetxt/imagetxt.go

@@ -12,8 +12,8 @@ import (
 	"github.com/google/go-containerregistry/pkg/name"
 
 	artifact "hauler.dev/go/hauler/pkg/artifacts"
-	"hauler.dev/go/hauler/pkg/artifacts/file/getter"
 	"hauler.dev/go/hauler/pkg/artifacts/image"
+	"hauler.dev/go/hauler/pkg/getter"
 	"hauler.dev/go/hauler/pkg/log"
 )
 

pkg/getter/getter_test.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"hauler.dev/go/hauler/pkg/artifacts/file/getter"
+	"hauler.dev/go/hauler/pkg/getter"
 )
 
 func TestClient_Detect(t *testing.T) {