Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion util/update-manifest-releases/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func GetReleaseFromFile(buildDir, releaseName string) (Release, error) {
return Release{}, shaErr
}

newRelease.SHA1 = strings.TrimSpace(string(sha1))
newRelease.SHA1 = strings.TrimSpace("sha256:" + string(sha1))
newRelease.URL = strings.TrimSpace(string(url))
} else {
// Github release
Expand Down
6 changes: 3 additions & 3 deletions util/update-manifest-releases/common/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var _ = Describe("Common", func() {
Expect(err).NotTo(HaveOccurred())
Expect(release.Name).To(Equal("good-release"))
Expect(release.URL).To(Equal("https://download.com/release1"))
Expect(release.SHA1).To(Equal("XXXXXXXXXXXXXX"))
Expect(release.SHA1).To(Equal("sha256:XXXXXXXXXXXXXX"))
Expect(release.Version).To(Equal("1.1"))
})
})
Expand All @@ -42,10 +42,10 @@ var _ = Describe("Common", func() {

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

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

It("errors when url is missing", func() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package compiledreleasesops

import (
"crypto/sha1"
"crypto/sha256"
"errors"
"fmt"
"os"
Expand Down Expand Up @@ -103,7 +103,7 @@ func getCompiledReleaseForBuild(buildDir, releaseName string) (Release, error) {
return Release{}, err
}

release.SHA1, err = computeSha1Sum(releaseTarballPath)
release.SHA1, err = computeSha256Sum(releaseTarballPath)
if err != nil {
return Release{}, err
}
Expand All @@ -113,11 +113,11 @@ func getCompiledReleaseForBuild(buildDir, releaseName string) (Release, error) {
return release, nil
}

func computeSha1Sum(filepath string) (string, error) {
func computeSha256Sum(filepath string) (string, error) {
fileContents, err := os.ReadFile(filepath)
if err != nil {
return "", err
}

return fmt.Sprintf("%x", sha1.Sum(fileContents)), nil
return "sha256:" + fmt.Sprintf("%x", sha256.Sum256(fileContents)), nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ var _ = Describe("UpdateCompiledReleases", func() {
path: /releases/name=no-stemcell-section
value:
name: no-stemcell-section
sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:62c6bb48e76d31b2d6348ce5120bb99773bc1fc31724be710ffd1ca8aa836538
url: https://storage.googleapis.com/cf-deployment-compiled-releases/no-stemcell-section-0.0.0-cute-stemcell-0.0-20180808-195254-497840039.tgz
version: 0.0.1
`
desiredOpsFile := `- type: replace
path: /releases/name=no-stemcell-section
value:
name: no-stemcell-section
sha1: 02573f83a7f467e55a7bb49424e80f541288a041
sha1: sha256:280c8373b5cc2d96119e00f10e496b54e44e4e34fae2415718ac3b90558e26e5
stemcell:
os: awesome-stemcell
version: "1.0"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://download.com/missing-sha256-release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
release-sha1
release-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
release-sha1
release-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
release-sha1
release-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
release-sha1
release-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
release-sha1
release-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
original-release1-sha1
original-release1-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
updated-release2-sha1
updated-release2-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
original-release1-sha1
original-release1-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
original-release2-sha1
original-release2-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
original-release1-sha1
original-release1-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
original-release2-sha1
original-release2-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
updated-non-append-sha1
updated-non-append-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
original-release1-sha1
original-release1-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
updated-release2-sha1
updated-release2-sha256
6 changes: 3 additions & 3 deletions util/update-manifest-releases/fixtures/cf-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ releases:
- name: release1
url: original-release1-url
version: original-release1-version
sha1: original-release1-sha1
sha1: sha256:original-release1-sha256
- name: inert-release
url: original-inert-release-url
version: original-inert-release-version
sha1: original-inert-release-sha1
sha1: sha256:original-inert-release-sha256
- name: release2
url: original-release2-url
version: original-release2-version
sha1: original-release2-sha1
sha1: sha256:original-release2-sha256
stemcells:
- alias: default
os: ubuntu-trusty
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
original-release1-sha1
original-release1-sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
original-release2-sha1
original-release2-sha256
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
type: replace
value:
name: test
sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:280c8373b5cc2d96119e00f10e496b54e44e4e34fae2415718ac3b90558e26e5
stemcell:
os: cute-stemcell
version: "0.0"
Expand All @@ -13,7 +13,7 @@
type: replace
value:
name: test-agent
sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:bb7252db83b8037f44696af7bdb80a8c92e2f79e6ca1001222db7171b3c694e8
stemcell:
os: cute-stemcell
version: "0.0"
Expand All @@ -23,7 +23,7 @@
type: replace
value:
name: no-version
sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:085b6b4a335f5d6f54b55e831ff125c5b7f95ecb85c89e06a932dec56dc7d077
stemcell:
os: cute-stemcell
version: "0.0"
Expand All @@ -33,7 +33,7 @@
type: replace
value:
name: more-than-1
sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:a69d14ddcc53531e044e69c9c6db33a51500a5e3f851666ee3946d27cd5e3996
stemcell:
os: cute-stemcell
version: "0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
name: non-append
version: original-non-append-version
url: original-non-append-url
sha1: original-non-append-sha1
sha1: sha256:original-non-append-sha256
20 changes: 10 additions & 10 deletions util/update-manifest-releases/fixtures/original_ops_file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,39 +69,39 @@
name: release1
version: original-release1-version
url: original-release1-url
sha1: original-release1-sha1
sha1: sha256:original-release1-sha256

- type: replace
path: /releases/-
value:
name: release2
version: original-release2-version
url: original-release2-url
sha1: original-release2-sha1
sha1: sha256:original-release2-sha256

- type: replace
path: /releases/-
value:
name: missing-url
version: original-missing-url-version
url: original-missing-url-url
sha1: original-missing-url-sha1
sha1: sha256:original-missing-url-sha256

- type: replace
path: /releases/-
value:
name: missing-version
version: original-missing-version-version
url: original-missing-version-url
sha1: original-missing-version-sha1
sha1: sha256:original-missing-version-sha256

- type: replace
path: /releases/-
value:
name: missing-sha1
version: original-missing-sha1-version
url: original-missing-sha1-url
sha1: original-missing-sha1-sha1
name: missing-sha256
version: original-missing-sha256-version
url: original-missing-sha256-url
sha1: sha256:original-missing-sha256-sha256

- type: replace
path: /stemcells/-
Expand Down Expand Up @@ -141,5 +141,5 @@
- type: replace
path: /releases/-
value:
name: missing-url-and-sha1
version: original-missing-url-and-sha1-version
name: missing-url-and-sha256
version: original-missing-url-and-sha256-version
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
name: release1
version: original-release1-version
url: original-release1-url
sha1: original-release1-sha1
sha1: sha256:original-release1-sha256
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
type: replace
value:
name: test
sha1: 02573f83a7f467e55a7bb49424e80f541288a041
sha1: sha256:280c8373b5cc2d96119e00f10e496b54e44e4e34fae2415718ac3b90558e26e5
stemcell:
os: awesome-stemcell
version: "1.0"
Expand All @@ -13,7 +13,7 @@
type: replace
value:
name: test-agent
sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:bb7252db83b8037f44696af7bdb80a8c92e2f79e6ca1001222db7171b3c694e8
stemcell:
os: cute-stemcell
version: "0.0"
Expand All @@ -23,7 +23,7 @@
type: replace
value:
name: no-version
sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:085b6b4a335f5d6f54b55e831ff125c5b7f95ecb85c89e06a932dec56dc7d077
stemcell:
os: cute-stemcell
version: "0.0"
Expand All @@ -33,7 +33,7 @@
type: replace
value:
name: more-than-1
sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:a69d14ddcc53531e044e69c9c6db33a51500a5e3f851666ee3946d27cd5e3996
stemcell:
os: cute-stemcell
version: "0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: replace
value:
name: test
sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:280c8373b5cc2d96119e00f10e496b54e44e4e34fae2415718ac3b90558e26e5
stemcell:
os: cute-stemcell
version: "0.0"
Expand All @@ -12,7 +12,7 @@
type: replace
value:
name: test-agent
sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:bb7252db83b8037f44696af7bdb80a8c92e2f79e6ca1001222db7171b3c694e8
stemcell:
os: cute-stemcell
version: "0.0"
Expand All @@ -22,7 +22,7 @@
type: replace
value:
name: no-version
sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:085b6b4a335f5d6f54b55e831ff125c5b7f95ecb85c89e06a932dec56dc7d077
stemcell:
os: cute-stemcell
version: "0.0"
Expand All @@ -32,7 +32,7 @@
type: replace
value:
name: more-than-1
sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4
sha1: sha256:a69d14ddcc53531e044e69c9c6db33a51500a5e3f851666ee3946d27cd5e3996
stemcell:
os: cute-stemcell
version: "0.0"
Expand All @@ -42,7 +42,7 @@
type: replace
value:
name: extraneous
sha1: 02573f83a7f467e55a7bb49424e80f541288a041
sha1: sha256:280c8373b5cc2d96119e00f10e496b54e44e4e34fae2415718ac3b90558e26e5
stemcell:
os: awesome-stemcell
version: "1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
name: non-append
version: updated-non-append-version
url: updated-non-append-url
sha1: updated-non-append-sha1
sha1: sha256:updated-non-append-sha256
16 changes: 8 additions & 8 deletions util/update-manifest-releases/fixtures/updated_ops_file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,37 +68,37 @@
path: /releases/-
value:
name: release1
sha1: original-release1-sha1
sha1: sha256:original-release1-sha256
url: original-release1-url
version: original-release1-version
- type: replace
path: /releases/-
value:
name: release2
sha1: updated-release2-sha1
sha1: sha256:updated-release2-sha256
url: updated-release2-url
version: updated-release2-version
- type: replace
path: /releases/-
value:
name: missing-url
sha1: original-missing-url-sha1
sha1: sha256:original-missing-url-sha256
url: original-missing-url-url
version: original-missing-url-version
- type: replace
path: /releases/-
value:
name: missing-version
sha1: original-missing-version-sha1
sha1: sha256:original-missing-version-sha256
url: original-missing-version-url
version: original-missing-version-version
- type: replace
path: /releases/-
value:
name: missing-sha1
sha1: original-missing-sha1-sha1
url: original-missing-sha1-url
version: original-missing-sha1-version
name: missing-sha256
sha1: sha256:original-missing-sha256-sha256
url: original-missing-sha256-url
version: original-missing-sha256-version
- type: replace
path: /stemcells/-
value:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
name: release1
version: original-release1-version
url: original-release1-url
sha1: original-release1-sha1
sha1: sha256:original-release1-sha256
Loading
Loading