Merge pull request #586 from cloudfoundry/fix/176750617-wip-upload-re…

…lease

Unify upload release handling to always check if skippable

cmd/upload_release.go

@@ -49,13 +49,13 @@ func NewUploadReleaseCmd(
 func (c UploadReleaseCmd) Run(opts UploadReleaseOpts) error {
 	switch {
 	case opts.Release != nil:
-		return c.uploadRelease(opts.Release, opts)
+		return c.uploadIfNecessary(opts, c.uploadFile)
 	case opts.Args.URL.IsRemote():
 		return c.uploadIfNecessary(opts, c.uploadRemote)
 	case opts.Args.URL.IsGit():
 		return c.uploadIfNecessary(opts, c.uploadGit)
 	default:
-		return c.uploadFile(opts)
+		return c.uploadIfNecessary(opts, c.uploadFile)
 	}
 }
 

cmd/upload_release_test.go

@@ -276,6 +276,25 @@ var _ = Describe("UploadReleaseCmd", func() {
 				Expect(rebase).To(BeFalse())
 				Expect(fix).To(BeFalse())
 			})
+			It("does not upload release if name and version match existing release", func() {
+				releaseReader.ReadStub = func(path string) (boshrel.Release, error) {
+					Expect(path).To(Equal("./some-file.tgz"))
+					return release, nil
+				}
+				opts.Name = "existing-name"
+				opts.Version = VersionArg(semver.MustNewVersionFromString("existing-ver"))
+				director.HasReleaseReturns(true, nil)
+				err := act()
+				Expect(err).ToNot(HaveOccurred())
+
+				name, version, stemcell := director.HasReleaseArgsForCall(0)
+				Expect(name).To(Equal("existing-name"))
+				Expect(version).To(Equal("existing-ver"))
+				Expect(stemcell).To(Equal(boshdir.OSVersionSlug{}))
+				Expect(director.UploadReleaseFileCallCount()).To(Equal(0))
+				Expect(ui.Said).To(Equal(
+					[]string{"Release 'existing-name/existing-ver' already exists."}))
+			})
 
 			It("clean up release", func() {
 				releaseReader.ReadStub = func(path string) (boshrel.Release, error) {

integration/upload_release_test.go

@@ -240,6 +240,10 @@ blobstore:
 					ghttp.VerifyRequest("GET", "/info"),
 					ghttp.RespondWith(http.StatusOK, `{"user_authentication":{"type":"basic","options":{}}}`),
 				),
+				ghttp.CombineHandlers(
+					ghttp.VerifyRequest("GET", "/releases"),
+					ghttp.RespondWith(http.StatusOK, "[]"),
+				),
 				ghttp.CombineHandlers(
 					ghttp.VerifyRequest("POST", "/packages/matches"),
 					ghttp.RespondWith(http.StatusOK, "[]"),