vacation: untangle compression and tar handling

Support use case where the archive is a gzipped executable.
Signed-off-by: Mikey Boldt <mboldt@vmware.com>

postal/service_test.go

@@ -598,29 +598,6 @@ version = "this is super not semver"
 				})
 			})
 
-			context("when the file contents are malformed", func() {
-				it.Before(func() {
-					buffer := bytes.NewBuffer(nil)
-					gzipWriter := gzip.NewWriter(buffer)
-
-					_, err := gzipWriter.Write([]byte("something"))
-					Expect(err).NotTo(HaveOccurred())
-
-					Expect(gzipWriter.Close()).To(Succeed())
-
-					transport.DropCall.Returns.ReadCloser = io.NopCloser(buffer)
-
-					sum := sha256.Sum256(buffer.Bytes())
-					dependencySHA = hex.EncodeToString(sum[:])
-				})
-
-				it("fails to create a tar reader", func() {
-					err := deliver()
-
-					Expect(err).To(MatchError(ContainSubstring("failed to read tar response")))
-				})
-			})
-
 			context("when the file checksum does not match", func() {
 				it("fails to create a tar reader", func() {
 					err := service.Deliver(
@@ -865,29 +842,6 @@ version = "this is super not semver"
 				})
 			})
 
-			context("when the file contents are malformed", func() {
-				it.Before(func() {
-					buffer := bytes.NewBuffer(nil)
-					gzipWriter := gzip.NewWriter(buffer)
-
-					_, err := gzipWriter.Write([]byte("something"))
-					Expect(err).NotTo(HaveOccurred())
-
-					Expect(gzipWriter.Close()).To(Succeed())
-
-					transport.DropCall.Returns.ReadCloser = io.NopCloser(buffer)
-
-					sum := sha256.Sum256(buffer.Bytes())
-					dependencySHA = hex.EncodeToString(sum[:])
-				})
-
-				it("fails to create a tar reader", func() {
-					err := install()
-
-					Expect(err).To(MatchError(ContainSubstring("failed to read tar response")))
-				})
-			})
-
 			context("when the file checksum does not match", func() {
 				it("fails to create a tar reader", func() {
 					err := service.Install(postal.Dependency{

vacation/tar_bzip2_archive.go → vacation/bzip2_archive.go

@@ -19,7 +19,7 @@ func NewTarBzip2Archive(inputReader io.Reader) TarBzip2Archive {
 // Decompress reads from TarBzip2Archive and writes files into the destination
 // specified.
 func (tbz TarBzip2Archive) Decompress(destination string) error {
-	return NewTarArchive(bzip2.NewReader(tbz.reader)).StripComponents(tbz.components).Decompress(destination)
+	return NewArchive(bzip2.NewReader(tbz.reader)).StripComponents(tbz.components).Decompress(destination)
 }
 
 // StripComponents behaves like the --strip-components flag on tar command

vacation/tar_gzip_archive.go → vacation/gzip_archive.go

@@ -25,7 +25,7 @@ func (gz TarGzipArchive) Decompress(destination string) error {
 		return fmt.Errorf("failed to create gzip reader: %w", err)
 	}
 
-	return NewTarArchive(gzr).StripComponents(gz.components).Decompress(destination)
+	return NewArchive(gzr).StripComponents(gz.components).Decompress(destination)
 }
 
 // StripComponents behaves like the --strip-components flag on tar command

vacation/tar_xz_archive.go → vacation/xz_archive.go

@@ -26,7 +26,7 @@ func (txz TarXZArchive) Decompress(destination string) error {
 		return fmt.Errorf("failed to create xz reader: %w", err)
 	}
 
-	return NewTarArchive(xzr).StripComponents(txz.components).Decompress(destination)
+	return NewArchive(xzr).StripComponents(txz.components).Decompress(destination)
 }
 
 // StripComponents behaves like the --strip-components flag on tar command