Use relative paths for archives

cmd/state-svc/internal/hash/file_hasher.go

@@ -45,17 +45,14 @@ func (fh *FileHasher) HashFiles(wd string, globs []string) (_ string, _ []hashed
 			return "", nil, errs.Wrap(err, "Could not match glob: %s", glob)
 		}
 		sort.Strings(files) // ensure consistent ordering
-		for _, f := range files {
-			if !filepath.IsAbs(f) {
-				af, err := filepath.Abs(filepath.Join(wd, f))
-				if err != nil {
-					return "", nil, errs.Wrap(err, "Could not get absolute path for file: %s", f)
-				}
-				f = af
+		for _, relativePath := range files {
+			absolutePath, err := filepath.Abs(filepath.Join(wd, relativePath))
+			if err != nil {
+				return "", nil, errs.Wrap(err, "Could not get absolute path for file: %s", relativePath)
 			}
-			fileInfo, err := os.Stat(f)
+			fileInfo, err := os.Stat(absolutePath)
 			if err != nil {
-				return "", nil, errs.Wrap(err, "Could not stat file: %s", f)
+				return "", nil, errs.Wrap(err, "Could not stat file: %s", absolutePath)
 			}
 
 			if fileInfo.IsDir() {
@@ -72,10 +69,10 @@ func (fh *FileHasher) HashFiles(wd string, globs []string) (_ string, _ []hashed
 			} else {
 				fileHasher := xxhash.New()
 				// include filepath in hash, because moving files should affect the hash
-				fmt.Fprintf(fileHasher, "%016x", f)
-				file, err := os.Open(f)
+				fmt.Fprintf(fileHasher, "%016x", relativePath)
+				file, err := os.Open(absolutePath)
 				if err != nil {
-					return "", nil, errs.Wrap(err, "Could not open file: %s", f)
+					return "", nil, errs.Wrap(err, "Could not open file: %s", absolutePath)
 				}
 				defer file.Close()
 				if _, err := io.Copy(fileHasher, file); err != nil {
@@ -90,7 +87,7 @@ func (fh *FileHasher) HashFiles(wd string, globs []string) (_ string, _ []hashed
 			hashes = append(hashes, hash)
 			hashedFiles = append(hashedFiles, hashedFile{
 				Pattern: glob,
-				Path:    f,
+				Path:    relativePath,
 				Hash:    hash,
 			})
 		}

cmd/state-svc/internal/hash/file_hasher_test.go

@@ -1,9 +1,11 @@
 package hash
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"sort"
+	"strings"
 	"testing"
 	"time"
 
@@ -50,6 +52,10 @@ func TestFileHasher_HashFiles(t *testing.T) {
 	hash2, files2, err := hasher.HashFiles(dir, []string{"./**/*"})
 	require.NoError(t, err, errs.JoinMessage(err))
 
+	for _, f := range files1 {
+		assert.False(t, strings.HasPrefix(f.Path, dir), fmt.Sprintf("'%s' should not be prefixed with '%s'", f.Path, dir))
+	}
+
 	sort.Slice(files1, func(i, j int) bool { return files1[i].Path < files1[j].Path })
 	sort.Slice(files2, func(i, j int) bool { return files2[i].Path < files2[j].Path })
 	require.Len(t, files2, 3)

internal/archiver/archiver.go

@@ -15,8 +15,8 @@ type FileMap struct {
 	Target string
 }
 
-func CreateTgz(filepath string, fileMaps []FileMap) error {
-	f, err := os.OpenFile(filepath, os.O_CREATE|os.O_WRONLY, 0644)
+func CreateTgz(archivePath string, workDir string, fileMaps []FileMap) error {
+	f, err := os.OpenFile(archivePath, os.O_CREATE|os.O_WRONLY, 0644)
 	if err != nil {
 		return errs.Wrap(err, "Could not create temp file")
 	}
@@ -28,7 +28,11 @@ func CreateTgz(filepath string, fileMaps []FileMap) error {
 	defer tgz.Close()
 
 	for _, fileMap := range fileMaps {
-		file, err := os.Open(fileMap.Source)
+		source := fileMap.Source
+		if !filepath.IsAbs(source) {
+			source = filepath.Join(workDir, source)
+		}
+		file, err := os.Open(source)
 		if err != nil {
 			return errs.Wrap(err, "Could not open file")
 		}

internal/runners/commit/ingredientcall.go

@@ -107,7 +107,7 @@ func (i *IngredientCall) createIngredient(hash string, hashedFiles []*graph.Glob
 	}
 
 	tmpFile := fileutils.TempFilePath("", fmt.Sprintf("bs-hash-%s.tar.gz", hash))
-	if err := archiver.CreateTgz(tmpFile, archiver.FilesWithCommonParent(files...)); err != nil {
+	if err := archiver.CreateTgz(tmpFile, i.prime.Project().Dir(), archiver.FilesWithCommonParent(files...)); err != nil {
 		return nil, errs.Wrap(err, "Could not create tar.gz")
 	}
 	defer os.Remove(tmpFile)