Fix a bug where compiled releases were uploaded but source was not up…

…loaded. Signed-off-by: Joseph Palermo <[email protected]> Signed-off-by: Konstantin Kiess <[email protected]>
cloudfoundry · Feb 9, 2022 · d3004f2 · d3004f2
1 parent 6d5e8a5
commit d3004f2
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 4 deletions.
diff --git a/director/releases.go b/director/releases.go
@@ -188,9 +188,14 @@ func (d DirectorImpl) HasRelease(name, version string, stemcell OSVersionSlug) (
 	if err != nil {
 		return false, err
 	}
-	if stemcell.IsProvided() && found {
-		found, err := d.ReleaseHasCompiledPackage(NewReleaseSlug(name, version), stemcell)
-		return found, err
+	if found {
+		if stemcell.IsProvided() {
+			found, err := d.ReleaseHasCompiledPackage(NewReleaseSlug(name, version), stemcell)
+			return found, err
+		} else {
+			found, err := d.ReleaseHasSource(NewReleaseSlug(name, version))
+			return found, err
+		}
 	}
 	return found, err
 }
@@ -219,6 +224,25 @@ func (d DirectorImpl) ReleaseHasCompiledPackage(releaseSlug ReleaseSlug, osVersi
 	return false, nil
 }
 
+func (d DirectorImpl) ReleaseHasSource(releaseSlug ReleaseSlug) (bool, error) {
+	release, err := d.FindRelease(releaseSlug)
+	if err != nil {
+		return false, err
+	}
+
+	pkgs, err := release.Packages()
+	if err != nil {
+		return false, err
+	}
+
+	for _, pkg := range pkgs {
+		if pkg.BlobstoreID != "" {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+
 func (d DirectorImpl) UploadReleaseURL(url, sha1 string, rebase, fix bool) error {
 	return d.client.UploadReleaseURL(url, sha1, rebase, fix)
 }

diff --git a/director/releases_test.go b/director/releases_test.go
@@ -149,20 +149,52 @@ var _ = Describe("Director", func() {
 			stemcell = OSVersionSlug{}
 		})
 
-		It("returns true if name and version matches", func() {
+		It("returns true if name and version matches and it has source", func() {
 			server.AppendHandlers(
 				ghttp.CombineHandlers(
 					ghttp.VerifyRequest("GET", "/releases"),
 					ghttp.VerifyBasicAuth("username", "password"),
 					ghttp.RespondWith(http.StatusOK, `[{"name":"name","release_versions":[{"version":"ver"}]}]`),
 				),
+				ghttp.CombineHandlers(
+					ghttp.VerifyRequest("GET", "/releases/name", "version=ver"),
+					ghttp.VerifyBasicAuth("username", "password"),
+					ghttp.RespondWith(http.StatusOK, `{
+					  "packages": [{
+						"blobstore_id": "123"
+					  }]
+					}`),
+				),
 			)
 
 			found, err := act()
 			Expect(err).ToNot(HaveOccurred())
 			Expect(found).To(BeTrue())
 		})
 
+		It("returns false if name and version matches but no source", func() {
+			server.AppendHandlers(
+				ghttp.CombineHandlers(
+					ghttp.VerifyRequest("GET", "/releases"),
+					ghttp.VerifyBasicAuth("username", "password"),
+					ghttp.RespondWith(http.StatusOK, `[{"name":"name","release_versions":[{"version":"ver"}]}]`),
+				),
+				ghttp.CombineHandlers(
+					ghttp.VerifyRequest("GET", "/releases/name", "version=ver"),
+					ghttp.VerifyBasicAuth("username", "password"),
+					ghttp.RespondWith(http.StatusOK, `{
+					  "packages": [{
+						"blobstore_id": ""
+					  }]
+					}`),
+				),
+			)
+
+			found, err := act()
+			Expect(err).ToNot(HaveOccurred())
+			Expect(found).To(BeFalse())
+		})
+
 		It("returns false if name and version does not match", func() {
 			server.AppendHandlers(
 				ghttp.CombineHandlers(