Don't package match when given a tarball

Package matching is great for itterating on a release, but when
a tarball is provided, the changes of amatch are slim to none.
Before this change, tarballs would be repackaged even if no matches
where found.

Author: rkoster

cmd/upload_release.go

@@ -90,18 +90,15 @@ func (c UploadReleaseCmd) uploadFile(opts UploadReleaseOpts) error {
 		return bosherr.Errorf("Cannot upload non-remote release")
 	}
 
-	releaseReader, releaseDir := c.releaseDirFactory(opts.Directory)
+	_, releaseDir := c.releaseDirFactory(opts.Directory)
 
 	var release boshrel.Release
 	var err error
 
 	path := opts.Args.URL.FilePath()
 
 	if len(path) > 0 {
-		release, err = releaseReader.Read(path)
-		if err != nil {
-			return err
-		}
+		return c.uploadReleaseFile(path, opts)
 	} else {
 		release, err = releaseDir.FindRelease(opts.Name, semver.Version(opts.Version))
 		if err != nil {
@@ -132,6 +129,10 @@ func (c UploadReleaseCmd) uploadRelease(release boshrel.Release, opts UploadRele
 
 	defer c.fs.RemoveAll(path) //nolint:errcheck
 
+	return c.uploadReleaseFile(path, opts)
+}
+
+func (c UploadReleaseCmd) uploadReleaseFile(path string, opts UploadReleaseOpts) error {
 	file, err := c.releaseArchiveFactory(path).File()
 	if err != nil {
 		return bosherr.WrapErrorf(err, "Opening release")

cmd/upload_release_test.go

@@ -253,26 +253,13 @@ var _ = Describe("UploadReleaseCmd", func() {
 					return release, nil
 				}
 
-				director.MatchPackagesStub = func(manifest interface{}, compiled bool) ([]string, error) {
-					Expect(manifest).To(Equal(boshman.Manifest{Name: "rel"}))
-					Expect(compiled).To(BeFalse())
-					return []string{"skip-pkg1-fp"}, nil
-				}
-
-				releaseWriter.WriteStub = func(rel boshrel.Release, pkgFpsToSkip []string) (string, error) {
-					Expect(rel).To(Equal(release))
-					Expect(pkgFpsToSkip).To(Equal([]string{"skip-pkg1-fp"}))
-					return "/archive-path", nil
-				}
-
 				err := act()
 				Expect(err).ToNot(HaveOccurred())
 
-				Expect(director.MatchPackagesCallCount()).To(Equal(1))
 				Expect(director.UploadReleaseFileCallCount()).To(Equal(1))
 
 				file, rebase, fix := director.UploadReleaseFileArgsForCall(0)
-				Expect(file.(*fakesys.FakeFile).Name()).To(Equal("/archive-path"))
+				Expect(file.(*fakesys.FakeFile).Name()).To(Equal("./some-file.tgz"))
 				Expect(rebase).To(BeFalse())
 				Expect(fix).To(BeFalse())
 			})
@@ -333,31 +320,6 @@ var _ = Describe("UploadReleaseCmd", func() {
 				Expect(director.UploadReleaseFileCallCount()).To(Equal(1))
 			})
 
-			It("clean up release", func() {
-				releaseReader.ReadStub = func(path string) (boshrel.Release, error) {
-					Expect(path).To(Equal("./some-file.tgz"))
-					return release, nil
-				}
-
-				releaseWriter.WriteStub = func(rel boshrel.Release, _ []string) (string, error) {
-					Expect(rel).To(Equal(release))
-					return "/archive-path", nil
-				}
-
-				removedFiles := []string{}
-
-				fs.RemoveAllStub = func(path string) error {
-					removedFiles = append(removedFiles, path)
-					return nil
-				}
-
-				err := act()
-				Expect(err).ToNot(HaveOccurred())
-
-				Expect(release.CleanUpCallCount()).To(Equal(1))
-				Expect(removedFiles).To(Equal([]string{"/archive-path"}))
-			})
-
 			It("uploads given release with a fix flag hence does not filter out any packages", func() {
 				uploadReleaseOpts.Fix = true
 
@@ -366,20 +328,14 @@ var _ = Describe("UploadReleaseCmd", func() {
 					return release, nil
 				}
 
-				releaseWriter.WriteStub = func(rel boshrel.Release, pkgFpsToSkip []string) (string, error) {
-					Expect(rel).To(Equal(release))
-					Expect(pkgFpsToSkip).To(BeEmpty())
-					return "/archive-path", nil
-				}
-
 				err := act()
 				Expect(err).ToNot(HaveOccurred())
 
 				Expect(director.MatchPackagesCallCount()).To(Equal(0))
 				Expect(director.UploadReleaseFileCallCount()).To(Equal(1))
 
 				file, rebase, fix := director.UploadReleaseFileArgsForCall(0)
-				Expect(file.(*fakesys.FakeFile).Name()).To(Equal("/archive-path"))
+				Expect(file.(*fakesys.FakeFile).Name()).To(Equal("./some-file.tgz"))
 				Expect(rebase).To(BeFalse())
 				Expect(fix).To(BeTrue())
 			})
@@ -465,9 +421,17 @@ var _ = Describe("UploadReleaseCmd", func() {
 					return "/archive-path", nil
 				}
 
+				removedFiles := []string{}
+
+				fs.RemoveAllStub = func(path string) error {
+					removedFiles = append(removedFiles, path)
+					return nil
+				}
+
 				err := act()
 				Expect(err).ToNot(HaveOccurred())
 
+				Expect(release.CleanUpCallCount()).To(Equal(1))
 				Expect(director.MatchPackagesCallCount()).To(Equal(1))
 				Expect(director.UploadReleaseFileCallCount()).To(Equal(1))