From 3367268ef9c7632bab0a1259dcd76b2d34bee58d Mon Sep 17 00:00:00 2001
From: Adrian Duong <adrian.duong@gmail.com>
Date: Sat, 17 Nov 2018 23:05:52 -0800
Subject: [PATCH 1/2] Test for fs_util.CopySymlink

---
 pkg/util/fs_util_test.go | 60 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/pkg/util/fs_util_test.go b/pkg/util/fs_util_test.go
index 968cacf99..00b480ece 100644
--- a/pkg/util/fs_util_test.go
+++ b/pkg/util/fs_util_test.go
@@ -535,3 +535,63 @@ func TestExtractFile(t *testing.T) {
 		})
 	}
 }
+
+func TestCopySymlink(t *testing.T) {
+	type tc struct {
+		name       string
+		linkTarget string
+		dest       string
+		beforeLink func(r string) error
+	}
+
+	tcs := []tc{{
+		name:       "absolute symlink",
+		linkTarget: "/abs/dest",
+	}, {
+		name:       "relative symlink",
+		linkTarget: "rel",
+	}, {
+		name:       "symlink copy overwrites existing file",
+		linkTarget: "/abs/dest",
+		dest:       "overwrite_me",
+		beforeLink: func(r string) error {
+			return ioutil.WriteFile(filepath.Join(r, "overwrite_me"), nil, 0644)
+		},
+	}}
+
+	for _, tc := range tcs {
+		t.Run(tc.name, func(t *testing.T) {
+			tc := tc
+			t.Parallel()
+			r, err := ioutil.TempDir("", "")
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer os.RemoveAll(r)
+
+			if tc.beforeLink != nil {
+				if err := tc.beforeLink(r); err != nil {
+					t.Fatal(err)
+				}
+			}
+			link := filepath.Join(r, "link")
+			dest := filepath.Join(r, "copy")
+			if tc.dest != "" {
+				dest = filepath.Join(r, tc.dest)
+			}
+			if err := os.Symlink(tc.linkTarget, link); err != nil {
+				t.Fatal(err)
+			}
+			if err := CopySymlink(link, dest); err != nil {
+				t.Fatal(err)
+			}
+			got, err := os.Readlink(dest)
+			if err != nil {
+				t.Fatalf("error reading link %s: %s", link, err)
+			}
+			if got != tc.linkTarget {
+				t.Errorf("link target does not match: %s != %s", got, tc.linkTarget)
+			}
+		})
+	}
+}

From f23cc32c42bb368cc02109b880ce72001122e8a6 Mon Sep 17 00:00:00 2001
From: Adrian Duong <adrian.duong@gmail.com>
Date: Sat, 17 Nov 2018 23:06:34 -0800
Subject: [PATCH 2/2] Overwrite existing dest when copying symlink and preserve
 link target

---
 pkg/util/fs_util.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go
index fd53ee7bf..6deff0680 100644
--- a/pkg/util/fs_util.go
+++ b/pkg/util/fs_util.go
@@ -501,8 +501,12 @@ func CopySymlink(src, dest string) error {
 	if err != nil {
 		return err
 	}
-	linkDst := filepath.Join(dest, link)
-	return os.Symlink(linkDst, dest)
+	if FilepathExists(dest) {
+		if err := os.RemoveAll(dest); err != nil {
+			return err
+		}
+	}
+	return os.Symlink(link, dest)
 }
 
 // CopyFile copies the file at src to dest