From dc3a3bb287c00eb07513831a37e1c1ca51d1f186 Mon Sep 17 00:00:00 2001
From: Liberatys <nick.flueckiger@renuo.ch>
Date: Tue, 12 Apr 2022 13:08:54 +0200
Subject: [PATCH] feat: Convert home relative paths in cache entries

Signed-off-by: Liberatys <nick.flueckiger@renuo.ch>
---
 cmd/dagger/cmd/common/common.go | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/cmd/dagger/cmd/common/common.go b/cmd/dagger/cmd/common/common.go
index 0139d286..b7155b5c 100644
--- a/cmd/dagger/cmd/common/common.go
+++ b/cmd/dagger/cmd/common/common.go
@@ -8,6 +8,8 @@ import (
 	"cuelang.org/go/cue"
 	"github.com/containerd/containerd/platforms"
 	"github.com/docker/buildx/util/buildflags"
+	"github.com/mitchellh/go-homedir"
+	buildkit "github.com/moby/buildkit/client"
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
@@ -84,6 +86,24 @@ func ValueDocOneLine(val *compiler.Value) string {
 	return strings.Join(docs, " ")
 }
 
+func convertRelativePaths(cacheOptionEntries []buildkit.CacheOptionsEntry) []buildkit.CacheOptionsEntry {
+	pathableAttributes := []string{"src", "dest"}
+
+	for _, option := range cacheOptionEntries {
+		for _, key := range pathableAttributes {
+			if _, ok := option.Attrs[key]; ok {
+				path, err := homedir.Expand(option.Attrs[key])
+				if err != nil {
+					panic(err)
+				}
+				option.Attrs[key] = path
+			}
+		}
+	}
+
+	return cacheOptionEntries
+}
+
 // NewClient creates a new client
 func NewClient(ctx context.Context) *client.Client {
 	lg := log.Ctx(ctx)
@@ -108,8 +128,8 @@ func NewClient(ctx context.Context) *client.Client {
 	}
 
 	cl, err := client.New(ctx, "", client.Config{
-		CacheExports:   cacheExports,
-		CacheImports:   cacheImports,
+		CacheExports:   convertRelativePaths(cacheExports),
+		CacheImports:   convertRelativePaths(cacheImports),
 		NoCache:        viper.GetBool("no-cache"),
 		TargetPlatform: p,
 	})