fix: symlink with empty mtime (#955)

* fix: symlink with empty mtime

* fix: not actually need this

* fix: mtime

* refactor: simplify

* test: lint

Author: caarlos0

files/files.go

@@ -146,6 +146,8 @@ func (c *Content) WithFileInfoDefaults(umask fs.FileMode, mtime time.Time) *Cont
 		info, err := os.Stat(cc.Source)
 		if err == nil {
 			if cc.FileInfo.MTime.IsZero() {
+				// if we can stat the file and mtime not set, use original
+				// file's mtime
 				cc.FileInfo.MTime = info.ModTime()
 			}
 			if cc.FileInfo.Mode == 0 {
@@ -155,8 +157,9 @@ func (c *Content) WithFileInfoDefaults(umask fs.FileMode, mtime time.Time) *Cont
 		}
 	}
 
+	// finally, if mtime is still 0, set time.Now()
 	if cc.FileInfo.MTime.IsZero() {
-		cc.FileInfo.MTime = mtime
+		cc.FileInfo.MTime = time.Now()
 	}
 	return cc
 }

files/files_test.go

@@ -1025,6 +1025,25 @@ func TestIssue954(t *testing.T) {
 	}, found)
 }
 
+func TestIssue952(t *testing.T) {
+	contents := files.Contents{
+		{
+			Source:      "/source",
+			Destination: "/dest",
+			Type:        files.TypeSymlink,
+		},
+	}
+
+	result, err := files.PrepareForPackager(contents, 0, "", false, mtime)
+	require.NoError(t, err)
+	require.Len(t, result, 1)
+
+	symlink := result[0]
+	require.Equal(t, files.TypeSymlink, symlink.Type)
+	require.Equal(t, "/dest", symlink.Destination)
+	require.Equal(t, mtime, symlink.FileInfo.MTime)
+}
+
 func TestIssue829(t *testing.T) {
 	var config testStruct
 	dec := yaml.NewDecoder(strings.NewReader(`---

rpm/rpm_test.go

@@ -153,6 +153,35 @@ func TestRPM(t *testing.T) {
 	require.Equal(t, "Foo does things", description)
 }
 
+func TestIssue952(t *testing.T) {
+	info := exampleInfo()
+	info.MTime = time.Time{}
+
+	info.Contents = files.Contents{
+		&files.Content{
+			Source:      "/file-that-does-not-exist",
+			Destination: "/etc/link",
+			Type:        files.TypeSymlink,
+		},
+	}
+
+	var buf bytes.Buffer
+	err := DefaultRPM.Package(info, &buf)
+	require.NoError(t, err)
+
+	rpm, err := rpmutils.ReadRpm(&buf)
+	require.NoError(t, err)
+
+	files, err := rpm.Header.GetFiles()
+	require.NoError(t, err)
+	require.Len(t, files, 1)
+	f := files[0]
+	require.Equal(t, cpio.S_ISLNK, f.Mode())
+	require.Equal(t, "/etc/link", f.Name())
+	require.Equal(t, "/file-that-does-not-exist", f.Linkname())
+	require.Positive(t, f.Mtime())
+}
+
 func TestSRPM(t *testing.T) {
 	f, err := os.CreateTemp(t.TempDir(), "test.rpm")
 	require.NoError(t, err)