Expose symlink options to llb package

Signed-off-by: Peter Engelbert <[email protected]>

client/llb/fileop.go

@@ -84,8 +84,8 @@ func (fa *FileAction) Mkfile(p string, m os.FileMode, dt []byte, opt ...MkfileOp
 	return a
 }
 
-func (fa *FileAction) Symlink(target, src string) *FileAction {
-	a := Symlink(target, src)
+func (fa *FileAction) Symlink(target, src string, opt ...SymlinkOption) *FileAction {
+	a := Symlink(target, src, opt...)
 	a.prev = fa
 	return a
 }
@@ -198,6 +198,7 @@ type ChownOption interface {
 	MkdirOption
 	MkfileOption
 	CopyOption
+	SymlinkOption
 }
 
 type mkdirOptionFunc func(*MkdirInfo)
@@ -295,6 +296,10 @@ func (co ChownOpt) SetCopyOption(mi *CopyInfo) {
 	mi.ChownOpt = &co
 }
 
+func (co ChownOpt) SetSymlinkOption(si *SymlinkInfo) {
+	si.ChownOpt = &co
+}
+
 func (co *ChownOpt) marshal(base pb.InputIndex) *pb.ChownOpt {
 	if co == nil {
 		return nil
@@ -342,31 +347,47 @@ func Mkfile(p string, m os.FileMode, dt []byte, opts ...MkfileOption) *FileActio
 	}
 }
 
-type SymlinkInfo struct{}
+type SymlinkInfo struct {
+	ChownOpt    *ChownOpt
+	CreatedTime *time.Time
+}
+
+func (si *SymlinkInfo) SetSymlinkOption(si2 *SymlinkInfo) {
+	*si2 = *si
+}
 
 type SymlinkOption interface {
 	SetSymlinkOption(*SymlinkInfo)
 }
 
-func Symlink(target, src string) *FileAction {
+func Symlink(target, src string, opts ...SymlinkOption) *FileAction {
+	var si SymlinkInfo
+	for _, o := range opts {
+		o.SetSymlinkOption(&si)
+	}
+
 	return &FileAction{
 		action: &fileActionSymlink{
-			target:   target,
-			src: src,
+			target: target,
+			src:    src,
+			info:   si,
 		},
 	}
 }
 
 type fileActionSymlink struct {
-	target   string
-	src string
+	target string
+	src    string
+	info   SymlinkInfo
 }
 
-func (f *fileActionSymlink) toProtoAction(_ context.Context, _ string, _ pb.InputIndex) (pb.IsFileAction, error) {
+func (f *fileActionSymlink) toProtoAction(_ context.Context, _ string, base pb.InputIndex) (pb.IsFileAction, error) {
 	return &pb.FileAction_Symlink{
 		Symlink: &pb.FileActionSymlink{
-			Target:   f.target,
-			Src: f.src,
+			Target:    f.target,
+			Src:       f.src,
+			Owner:     f.info.ChownOpt.marshal(base),
+			Timestamp: marshalTime(f.info.CreatedTime),
 		},
 	}, nil
 }
@@ -640,6 +661,10 @@ func (c CreatedTime) SetMkfileOption(mi *MkfileInfo) {
 	mi.CreatedTime = (*time.Time)(&c)
 }
 
+func (c CreatedTime) SetSymlinkOption(si *SymlinkInfo) {
+	si.CreatedTime = (*time.Time)(&c)
+}
+
 func (c CreatedTime) SetCopyOption(mi *CopyInfo) {
 	mi.CreatedTime = (*time.Time)(&c)
 }

solver/llbsolver/ops/file_test.go

@@ -644,7 +644,7 @@ func (b *testFileBackend) Mkfile(_ context.Context, m, user, group fileoptypes.M
 	return nil
 }
 
-func (b *testFileBackend) Symlink(_ context.Context, m fileoptypes.Mount, a *pb.FileActionSymlink) error {
+func (b *testFileBackend) Symlink(_ context.Context, m, user, group fileoptypes.Mount, a *pb.FileActionSymlink) error {
 	mm := m.(*testMount)
 	mm.id += "-mkfile"
 	mm.chain = append(mm.chain, mod{symlink: a})