include root dir in final zip

Author: ybirader

archiver.go

@@ -127,10 +127,6 @@ func (a *Archiver) walkDir() error {
 			return err
 		}
 
-		if path == a.chroot {
-			return nil
-		}
-
 		relativeToRoot, err := filepath.Rel(a.chroot, path)
 		if err != nil {
 			return errors.Errorf("ERROR: could not determine relative path of %s", path)
@@ -220,6 +216,7 @@ func (a *Archiver) createHeader(file *pool.File) error {
 	}
 
 	if file.Info.IsDir() {
+		header.Name += "/"
 		header.Method = zip.Store
 		header.Flags &^= 0x8 // won't write data descriptor (crc32, comp, uncomp)
 		header.UncompressedSize64 = 0

archiver_test.go

@@ -96,7 +96,7 @@ func TestArchive(t *testing.T) {
 		archiveReader := testutils.GetArchiveReader(t, archive.Name())
 		defer archiveReader.Close()
 
-		assert.Equal(t, 3, len(archiveReader.File))
+		assert.Equal(t, 4, len(archiveReader.File))
 	})
 
 	t.Run("can archive files separately", func(t *testing.T) {
@@ -214,7 +214,7 @@ func TestFileWriter(t *testing.T) {
 			assertExtendedTimestamp(t, file.Header)
 		})
 
-		t.Run("with no data descriptor directories", func(t *testing.T) {
+		t.Run("for directories", func(t *testing.T) {
 			archive, cleanup := testutils.CreateTempArchive(t, archivePath)
 			defer cleanup()
 
@@ -226,6 +226,7 @@ func TestFileWriter(t *testing.T) {
 
 			archiver.createHeader(&file)
 
+			assert.Equal(t, "nested/", file.Header.Name)
 			assert.Equal(t, zip.Store, file.Header.Method)
 			assert.Zero(t, file.Header.CRC32)
 			assert.Equal(t, 0, file.Header.CompressedSize64)

cli_test.go

@@ -21,6 +21,6 @@ func TestCLI(t *testing.T) {
 		archiveReader := testutils.GetArchiveReader(t, archivePath)
 		defer archiveReader.Close()
 
-		assert.Equal(t, 3, len(archiveReader.File))
+		assert.Equal(t, 4, len(archiveReader.File))
 	})
 }