Skip to content

fix for reading sha256 hash instead of sha1 from releases #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jochenehret merged 1 commit into from
Oct 1, 2025
Merged

fix for reading sha256 hash instead of sha1 from releases #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions util/update-manifest-releases/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ func GetReleaseFromFile(buildDir, releaseName string) (Release, error) {
if commitShaErr != nil {
// Bosh.io release
fmt.Println("Missing commit_sha file. Assuming bosh.io release...")
sha1, shaErr := os.ReadFile(filepath.Join(releasePath, "sha1"))
sha256, shaErr := os.ReadFile(filepath.Join(releasePath, "sha256"))

@jochenehret jochenehret Oct 1, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please adapt the unit test(s) in common_test.go accordingly?


if shaErr != nil {
return Release{}, shaErr
}

newRelease.SHA1 = strings.TrimSpace("sha256:" + string(sha1))
newRelease.SHA1 = strings.TrimSpace("sha256:" + string(sha256))
newRelease.URL = strings.TrimSpace(string(url))
} else {
// Github release
Expand Down
4 changes: 2 additions & 2 deletions util/update-manifest-releases/common/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ var _ = Describe("Common", func() {
})

Context("when release folder is missing files", func() {
It("errors when sha1 is missing", func() {
It("errors when sha256 is missing", func() {
_, err := common.GetReleaseFromFile(buildDir, "missing-sha256")

Expect(err).To(HaveOccurred())
Expect(err.Error()).To(Equal("open ../fixtures/broken-build/missing-sha256-release/sha1: no such file or directory"))
Expect(err.Error()).To(Equal("open ../fixtures/broken-build/missing-sha256-release/sha256: no such file or directory"))
})

It("errors when url is missing", func() {
Expand Down
0 ...es/broken-build/good-release-release/sha1 → .../broken-build/good-release-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...res/broken-build/missing-url-release/sha1 → ...s/broken-build/missing-url-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...broken-build/missing-version-release/sha1 → ...oken-build/missing-version-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...-compiled-release/extraneous-release/sha1 → ...ompiled-release/extraneous-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...compiled-release/more-than-1-release/sha1 → ...mpiled-release/more-than-1-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...-release/no-stemcell-section-release/sha1 → ...elease/no-stemcell-section-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...-compiled-release/no-version-release/sha1 → ...ompiled-release/no-version-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...d-with-compiled-release/test-release/sha1 → ...with-compiled-release/test-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...ld-with-updated-sha/release1-release/sha1 → ...-with-updated-sha/release1-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...ld-with-updated-sha/release2-release/sha1 → ...-with-updated-sha/release2-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...ld-with-updated-url/release1-release/sha1 → ...-with-updated-url/release1-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...ld-with-updated-url/release2-release/sha1 → ...-with-updated-url/release2-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...ith-updated-version/release1-release/sha1 → ...h-updated-version/release1-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...ith-updated-version/release2-release/sha1 → ...h-updated-version/release2-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...es/fixtures/build/non-append-release/sha1 → .../fixtures/build/non-append-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...ases/fixtures/build/release1-release/sha1 → ...es/fixtures/build/release1-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...ases/fixtures/build/release2-release/sha1 → ...es/fixtures/build/release2-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...res/nochanges-build/release1-release/sha1 → ...s/nochanges-build/release1-release/sha256
View file
Open in desktop
File renamed without changes.
0 ...res/nochanges-build/release2-release/sha1 → ...s/nochanges-build/release2-release/sha256
View file
Open in desktop
File renamed without changes.
24 changes: 12 additions & 12 deletions util/update-manifest-releases/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,14 @@ var _ = Describe("main", func() {
Expect(err).NotTo(HaveOccurred())

for _, release := range []map[string]string{
{"name": "release1", "version": "original-release1-version", "url": "original-release1-url", "sha1": "original-release1-sha"},
{"name": "release4", "version": "new-release4-version", "url": "new-release4-url", "sha1": "new-release4-sha"},
{"name": "release1", "version": "original-release1-version", "url": "original-release1-url", "sha256": "original-release1-sha"},
{"name": "release4", "version": "new-release4-version", "url": "new-release4-url", "sha256": "new-release4-sha"},
} {
releaseDir := filepath.Join(buildDir, fmt.Sprintf("%s-release", release["name"]))
err = os.Mkdir(releaseDir, os.ModePerm)
Expect(err).NotTo(HaveOccurred())

for _, value := range []string{"version", "url", "sha1"} {
for _, value := range []string{"version", "url", "sha256"} {
err = os.WriteFile(filepath.Join(releaseDir, value), []byte(release[value]), os.ModePerm)
Expect(err).NotTo(HaveOccurred())
}
Expand Down Expand Up @@ -186,14 +186,14 @@ var _ = Describe("main", func() {
Expect(err).NotTo(HaveOccurred())

for _, release := range []map[string]string{
{"name": "release2", "version": "original-release2-version", "url": "original-release2-url", "sha1": "original-release2-sha"},
{"name": "release5", "version": "original-release5-version", "url": "original-release5-url", "sha1": "original-release5-sha"},
{"name": "release2", "version": "original-release2-version", "url": "original-release2-url", "sha256": "original-release2-sha"},
{"name": "release5", "version": "original-release5-version", "url": "original-release5-url", "sha256": "original-release5-sha"},
} {
releaseDir := filepath.Join(buildDir, fmt.Sprintf("%s-release", release["name"]))
err = os.Mkdir(releaseDir, os.ModePerm)
Expect(err).NotTo(HaveOccurred())

for _, value := range []string{"version", "url", "sha1"} {
for _, value := range []string{"version", "url", "sha256"} {
err = os.WriteFile(filepath.Join(releaseDir, value), []byte(release[value]), os.ModePerm)
Expect(err).NotTo(HaveOccurred())
}
Expand Down Expand Up @@ -470,16 +470,16 @@ stemcells:
Expect(err).NotTo(HaveOccurred())

for _, release := range []map[string]string{
{"name": "release1", "version": "original-release1-version", "url": "original-release1-url", "sha1": "original-release1-sha"},
{"name": "release2", "version": "original-release2-version", "url": "original-release2-url", "sha1": "original-release2-sha"},
{"name": "release3", "version": "new-release3-version", "url": "new-release3-url", "sha1": "new-release3-sha"},
{"name": "release4", "version": "new-release4-version", "url": "new-release4-url", "sha1": "new-release4-sha"},
{"name": "release1", "version": "original-release1-version", "url": "original-release1-url", "sha256": "original-release1-sha"},
{"name": "release2", "version": "original-release2-version", "url": "original-release2-url", "sha256": "original-release2-sha"},
{"name": "release3", "version": "new-release3-version", "url": "new-release3-url", "sha256": "new-release3-sha"},
{"name": "release4", "version": "new-release4-version", "url": "new-release4-url", "sha256": "new-release4-sha"},
} {
releaseDir := filepath.Join(buildDir, fmt.Sprintf("%s-release", release["name"]))
err = os.Mkdir(releaseDir, os.ModePerm)
Expect(err).NotTo(HaveOccurred())

for _, value := range []string{"version", "url", "sha1"} {
for _, value := range []string{"version", "url", "sha256"} {
err = os.WriteFile(filepath.Join(releaseDir, value), []byte(release[value]), os.ModePerm)
Expect(err).NotTo(HaveOccurred())
}
Expand Down Expand Up @@ -846,7 +846,7 @@ stemcells:
err = os.Mkdir(releaseDir, os.ModePerm)
Expect(err).NotTo(HaveOccurred())

for _, value := range []string{"version", "url", "sha1"} {
for _, value := range []string{"version", "url", "sha256"} {
err = os.WriteFile(filepath.Join(releaseDir, value), []byte(release[value]), os.ModePerm)
Expect(err).NotTo(HaveOccurred())
}
Expand Down
4 changes: 2 additions & 2 deletions util/update-manifest-releases/manifest/manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,12 @@ other_key:
Expect(err).To(MatchError("open ../fixtures/broken-build/missing-version-release/version: no such file or directory"))
})

It("returns errors instead of panicking when sha1 is missing", func() {
It("returns errors instead of panicking when sha256 is missing", func() {
releases := []string{"missing-sha256"}

_, _, err := manifest.UpdateReleases(releases, brokenBuildDir, cfDeploymentManifest, yaml.Marshal, yaml.Unmarshal)

Expect(err).To(MatchError("open ../fixtures/broken-build/missing-sha256-release/sha1: no such file or directory"))
Expect(err).To(MatchError("open ../fixtures/broken-build/missing-sha256-release/sha256: no such file or directory"))
})

It("returns an error when the manifest is not valid yaml", func() {
Expand Down
4 changes: 2 additions & 2 deletions util/update-manifest-releases/opsfile/opsfile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ var _ = Describe("UpdateReleases", func() {
Expect(err).To(MatchError("open ../fixtures/broken-build/missing-version-release/version: no such file or directory"))
})

It("returns errors instead of panicking when sha1 is missing", func() {
It("returns errors instead of panicking when sha256 is missing", func() {
releases := []string{"missing-sha256"}

_, _, err := opsfile.UpdateReleases(releases, brokenBuildDir, originalOpsFile, yaml.Marshal, yaml.Unmarshal)

Expect(err).To(MatchError("open ../fixtures/broken-build/missing-sha256-release/sha1: no such file or directory"))
Expect(err).To(MatchError("open ../fixtures/broken-build/missing-sha256-release/sha256: no such file or directory"))
})

It("returns an error when the manifest is not valid yaml", func() {
Expand Down
Loading