diff --git a/util/update-manifest-releases/common/common.go b/util/update-manifest-releases/common/common.go index 549532ff1..1dff69177 100644 --- a/util/update-manifest-releases/common/common.go +++ b/util/update-manifest-releases/common/common.go @@ -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 diff --git a/util/update-manifest-releases/common/common_test.go b/util/update-manifest-releases/common/common_test.go index a900a9db6..3b203f9ff 100644 --- a/util/update-manifest-releases/common/common_test.go +++ b/util/update-manifest-releases/common/common_test.go @@ -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")) }) }) @@ -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() { diff --git a/util/update-manifest-releases/compiledreleasesops/compiled_releases_opsfile.go b/util/update-manifest-releases/compiledreleasesops/compiled_releases_opsfile.go index 2b6305444..70e7a330a 100644 --- a/util/update-manifest-releases/compiledreleasesops/compiled_releases_opsfile.go +++ b/util/update-manifest-releases/compiledreleasesops/compiled_releases_opsfile.go @@ -1,7 +1,7 @@ package compiledreleasesops import ( - "crypto/sha1" + "crypto/sha256" "errors" "fmt" "os" @@ -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 } @@ -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 } diff --git a/util/update-manifest-releases/compiledreleasesops/compiled_releases_opsfile_test.go b/util/update-manifest-releases/compiledreleasesops/compiled_releases_opsfile_test.go index 461dd7b00..c933c0651 100644 --- a/util/update-manifest-releases/compiledreleasesops/compiled_releases_opsfile_test.go +++ b/util/update-manifest-releases/compiledreleasesops/compiled_releases_opsfile_test.go @@ -64,7 +64,7 @@ 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 ` @@ -72,7 +72,7 @@ var _ = Describe("UpdateCompiledReleases", func() { path: /releases/name=no-stemcell-section value: name: no-stemcell-section - sha1: 02573f83a7f467e55a7bb49424e80f541288a041 + sha1: sha256:280c8373b5cc2d96119e00f10e496b54e44e4e34fae2415718ac3b90558e26e5 stemcell: os: awesome-stemcell version: "1.0" diff --git a/util/update-manifest-releases/fixtures/broken-build/missing-sha1-release/url b/util/update-manifest-releases/fixtures/broken-build/missing-sha1-release/url deleted file mode 100644 index b3a91bf66..000000000 --- a/util/update-manifest-releases/fixtures/broken-build/missing-sha1-release/url +++ /dev/null @@ -1 +0,0 @@ -https://download.com/missing-sha1-release diff --git a/util/update-manifest-releases/fixtures/broken-build/missing-sha256-release/url b/util/update-manifest-releases/fixtures/broken-build/missing-sha256-release/url new file mode 100644 index 000000000..f5021b4f9 --- /dev/null +++ b/util/update-manifest-releases/fixtures/broken-build/missing-sha256-release/url @@ -0,0 +1 @@ +https://download.com/missing-sha256-release diff --git a/util/update-manifest-releases/fixtures/broken-build/missing-sha1-release/version b/util/update-manifest-releases/fixtures/broken-build/missing-sha256-release/version similarity index 100% rename from util/update-manifest-releases/fixtures/broken-build/missing-sha1-release/version rename to util/update-manifest-releases/fixtures/broken-build/missing-sha256-release/version diff --git a/util/update-manifest-releases/fixtures/build-with-compiled-release/extraneous-release/sha1 b/util/update-manifest-releases/fixtures/build-with-compiled-release/extraneous-release/sha1 index 8cfae6e6d..bf454d850 100644 --- a/util/update-manifest-releases/fixtures/build-with-compiled-release/extraneous-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-compiled-release/extraneous-release/sha1 @@ -1 +1 @@ -release-sha1 +release-sha256 diff --git a/util/update-manifest-releases/fixtures/build-with-compiled-release/more-than-1-release/sha1 b/util/update-manifest-releases/fixtures/build-with-compiled-release/more-than-1-release/sha1 index 8cfae6e6d..bf454d850 100644 --- a/util/update-manifest-releases/fixtures/build-with-compiled-release/more-than-1-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-compiled-release/more-than-1-release/sha1 @@ -1 +1 @@ -release-sha1 +release-sha256 diff --git a/util/update-manifest-releases/fixtures/build-with-compiled-release/no-stemcell-section-release/sha1 b/util/update-manifest-releases/fixtures/build-with-compiled-release/no-stemcell-section-release/sha1 index 8cfae6e6d..bf454d850 100644 --- a/util/update-manifest-releases/fixtures/build-with-compiled-release/no-stemcell-section-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-compiled-release/no-stemcell-section-release/sha1 @@ -1 +1 @@ -release-sha1 +release-sha256 diff --git a/util/update-manifest-releases/fixtures/build-with-compiled-release/no-version-release/sha1 b/util/update-manifest-releases/fixtures/build-with-compiled-release/no-version-release/sha1 index 8cfae6e6d..bf454d850 100644 --- a/util/update-manifest-releases/fixtures/build-with-compiled-release/no-version-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-compiled-release/no-version-release/sha1 @@ -1 +1 @@ -release-sha1 +release-sha256 diff --git a/util/update-manifest-releases/fixtures/build-with-compiled-release/test-release/sha1 b/util/update-manifest-releases/fixtures/build-with-compiled-release/test-release/sha1 index 8cfae6e6d..bf454d850 100644 --- a/util/update-manifest-releases/fixtures/build-with-compiled-release/test-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-compiled-release/test-release/sha1 @@ -1 +1 @@ -release-sha1 +release-sha256 diff --git a/util/update-manifest-releases/fixtures/build-with-updated-sha/release1-release/sha1 b/util/update-manifest-releases/fixtures/build-with-updated-sha/release1-release/sha1 index f2b326dc6..6c4a22b2d 100644 --- a/util/update-manifest-releases/fixtures/build-with-updated-sha/release1-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-updated-sha/release1-release/sha1 @@ -1 +1 @@ -original-release1-sha1 +original-release1-sha256 diff --git a/util/update-manifest-releases/fixtures/build-with-updated-sha/release2-release/sha1 b/util/update-manifest-releases/fixtures/build-with-updated-sha/release2-release/sha1 index 2b47faebc..cb5e61c44 100644 --- a/util/update-manifest-releases/fixtures/build-with-updated-sha/release2-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-updated-sha/release2-release/sha1 @@ -1 +1 @@ -updated-release2-sha1 +updated-release2-sha256 diff --git a/util/update-manifest-releases/fixtures/build-with-updated-url/release1-release/sha1 b/util/update-manifest-releases/fixtures/build-with-updated-url/release1-release/sha1 index f2b326dc6..6c4a22b2d 100644 --- a/util/update-manifest-releases/fixtures/build-with-updated-url/release1-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-updated-url/release1-release/sha1 @@ -1 +1 @@ -original-release1-sha1 +original-release1-sha256 diff --git a/util/update-manifest-releases/fixtures/build-with-updated-url/release2-release/sha1 b/util/update-manifest-releases/fixtures/build-with-updated-url/release2-release/sha1 index d74a97c42..2ecfa8cca 100644 --- a/util/update-manifest-releases/fixtures/build-with-updated-url/release2-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-updated-url/release2-release/sha1 @@ -1 +1 @@ -original-release2-sha1 +original-release2-sha256 diff --git a/util/update-manifest-releases/fixtures/build-with-updated-version/release1-release/sha1 b/util/update-manifest-releases/fixtures/build-with-updated-version/release1-release/sha1 index f2b326dc6..6c4a22b2d 100644 --- a/util/update-manifest-releases/fixtures/build-with-updated-version/release1-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-updated-version/release1-release/sha1 @@ -1 +1 @@ -original-release1-sha1 +original-release1-sha256 diff --git a/util/update-manifest-releases/fixtures/build-with-updated-version/release2-release/sha1 b/util/update-manifest-releases/fixtures/build-with-updated-version/release2-release/sha1 index d74a97c42..2ecfa8cca 100644 --- a/util/update-manifest-releases/fixtures/build-with-updated-version/release2-release/sha1 +++ b/util/update-manifest-releases/fixtures/build-with-updated-version/release2-release/sha1 @@ -1 +1 @@ -original-release2-sha1 +original-release2-sha256 diff --git a/util/update-manifest-releases/fixtures/build/non-append-release/sha1 b/util/update-manifest-releases/fixtures/build/non-append-release/sha1 index 44c90fd2d..91110e994 100644 --- a/util/update-manifest-releases/fixtures/build/non-append-release/sha1 +++ b/util/update-manifest-releases/fixtures/build/non-append-release/sha1 @@ -1 +1 @@ -updated-non-append-sha1 +updated-non-append-sha256 diff --git a/util/update-manifest-releases/fixtures/build/release1-release/sha1 b/util/update-manifest-releases/fixtures/build/release1-release/sha1 index f2b326dc6..6c4a22b2d 100644 --- a/util/update-manifest-releases/fixtures/build/release1-release/sha1 +++ b/util/update-manifest-releases/fixtures/build/release1-release/sha1 @@ -1 +1 @@ -original-release1-sha1 +original-release1-sha256 diff --git a/util/update-manifest-releases/fixtures/build/release2-release/sha1 b/util/update-manifest-releases/fixtures/build/release2-release/sha1 index 2b47faebc..cb5e61c44 100644 --- a/util/update-manifest-releases/fixtures/build/release2-release/sha1 +++ b/util/update-manifest-releases/fixtures/build/release2-release/sha1 @@ -1 +1 @@ -updated-release2-sha1 +updated-release2-sha256 diff --git a/util/update-manifest-releases/fixtures/cf-deployment.yml b/util/update-manifest-releases/fixtures/cf-deployment.yml index 666835193..eb52830f5 100644 --- a/util/update-manifest-releases/fixtures/cf-deployment.yml +++ b/util/update-manifest-releases/fixtures/cf-deployment.yml @@ -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 diff --git a/util/update-manifest-releases/fixtures/nochanges-build/release1-release/sha1 b/util/update-manifest-releases/fixtures/nochanges-build/release1-release/sha1 index f2b326dc6..6c4a22b2d 100644 --- a/util/update-manifest-releases/fixtures/nochanges-build/release1-release/sha1 +++ b/util/update-manifest-releases/fixtures/nochanges-build/release1-release/sha1 @@ -1 +1 @@ -original-release1-sha1 +original-release1-sha256 diff --git a/util/update-manifest-releases/fixtures/nochanges-build/release2-release/sha1 b/util/update-manifest-releases/fixtures/nochanges-build/release2-release/sha1 index d74a97c42..2ecfa8cca 100644 --- a/util/update-manifest-releases/fixtures/nochanges-build/release2-release/sha1 +++ b/util/update-manifest-releases/fixtures/nochanges-build/release2-release/sha1 @@ -1 +1 @@ -original-release2-sha1 +original-release2-sha256 diff --git a/util/update-manifest-releases/fixtures/original_compiled_releases_ops_file.yml b/util/update-manifest-releases/fixtures/original_compiled_releases_ops_file.yml index c1ec562f5..a25759634 100644 --- a/util/update-manifest-releases/fixtures/original_compiled_releases_ops_file.yml +++ b/util/update-manifest-releases/fixtures/original_compiled_releases_ops_file.yml @@ -3,7 +3,7 @@ type: replace value: name: test - sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:280c8373b5cc2d96119e00f10e496b54e44e4e34fae2415718ac3b90558e26e5 stemcell: os: cute-stemcell version: "0.0" @@ -13,7 +13,7 @@ type: replace value: name: test-agent - sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:bb7252db83b8037f44696af7bdb80a8c92e2f79e6ca1001222db7171b3c694e8 stemcell: os: cute-stemcell version: "0.0" @@ -23,7 +23,7 @@ type: replace value: name: no-version - sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:085b6b4a335f5d6f54b55e831ff125c5b7f95ecb85c89e06a932dec56dc7d077 stemcell: os: cute-stemcell version: "0.0" @@ -33,7 +33,7 @@ type: replace value: name: more-than-1 - sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:a69d14ddcc53531e044e69c9c6db33a51500a5e3f851666ee3946d27cd5e3996 stemcell: os: cute-stemcell version: "0.0" diff --git a/util/update-manifest-releases/fixtures/original_non_append_opsfile.yml b/util/update-manifest-releases/fixtures/original_non_append_opsfile.yml index 69595c304..c75168ac8 100644 --- a/util/update-manifest-releases/fixtures/original_non_append_opsfile.yml +++ b/util/update-manifest-releases/fixtures/original_non_append_opsfile.yml @@ -4,4 +4,4 @@ name: non-append version: original-non-append-version url: original-non-append-url - sha1: original-non-append-sha1 \ No newline at end of file + sha1: sha256:original-non-append-sha256 \ No newline at end of file diff --git a/util/update-manifest-releases/fixtures/original_ops_file.yml b/util/update-manifest-releases/fixtures/original_ops_file.yml index be6abe7f2..47b2adce6 100644 --- a/util/update-manifest-releases/fixtures/original_ops_file.yml +++ b/util/update-manifest-releases/fixtures/original_ops_file.yml @@ -69,7 +69,7 @@ name: release1 version: original-release1-version url: original-release1-url - sha1: original-release1-sha1 + sha1: sha256:original-release1-sha256 - type: replace path: /releases/- @@ -77,7 +77,7 @@ name: release2 version: original-release2-version url: original-release2-url - sha1: original-release2-sha1 + sha1: sha256:original-release2-sha256 - type: replace path: /releases/- @@ -85,7 +85,7 @@ 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/- @@ -93,15 +93,15 @@ 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/- @@ -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 diff --git a/util/update-manifest-releases/fixtures/original_release_removal_opsfile.yml b/util/update-manifest-releases/fixtures/original_release_removal_opsfile.yml index a97828550..06af28213 100644 --- a/util/update-manifest-releases/fixtures/original_release_removal_opsfile.yml +++ b/util/update-manifest-releases/fixtures/original_release_removal_opsfile.yml @@ -7,4 +7,4 @@ name: release1 version: original-release1-version url: original-release1-url - sha1: original-release1-sha1 + sha1: sha256:original-release1-sha256 diff --git a/util/update-manifest-releases/fixtures/updated_compiled_releases_ops_file.yml b/util/update-manifest-releases/fixtures/updated_compiled_releases_ops_file.yml index 53a5bdd7f..26a440474 100644 --- a/util/update-manifest-releases/fixtures/updated_compiled_releases_ops_file.yml +++ b/util/update-manifest-releases/fixtures/updated_compiled_releases_ops_file.yml @@ -3,7 +3,7 @@ type: replace value: name: test - sha1: 02573f83a7f467e55a7bb49424e80f541288a041 + sha1: sha256:280c8373b5cc2d96119e00f10e496b54e44e4e34fae2415718ac3b90558e26e5 stemcell: os: awesome-stemcell version: "1.0" @@ -13,7 +13,7 @@ type: replace value: name: test-agent - sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:bb7252db83b8037f44696af7bdb80a8c92e2f79e6ca1001222db7171b3c694e8 stemcell: os: cute-stemcell version: "0.0" @@ -23,7 +23,7 @@ type: replace value: name: no-version - sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:085b6b4a335f5d6f54b55e831ff125c5b7f95ecb85c89e06a932dec56dc7d077 stemcell: os: cute-stemcell version: "0.0" @@ -33,7 +33,7 @@ type: replace value: name: more-than-1 - sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:a69d14ddcc53531e044e69c9c6db33a51500a5e3f851666ee3946d27cd5e3996 stemcell: os: cute-stemcell version: "0.0" diff --git a/util/update-manifest-releases/fixtures/updated_compiled_releases_ops_file_with_new_release.yml b/util/update-manifest-releases/fixtures/updated_compiled_releases_ops_file_with_new_release.yml index 820a2be03..3bbd10d1b 100644 --- a/util/update-manifest-releases/fixtures/updated_compiled_releases_ops_file_with_new_release.yml +++ b/util/update-manifest-releases/fixtures/updated_compiled_releases_ops_file_with_new_release.yml @@ -2,7 +2,7 @@ type: replace value: name: test - sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:280c8373b5cc2d96119e00f10e496b54e44e4e34fae2415718ac3b90558e26e5 stemcell: os: cute-stemcell version: "0.0" @@ -12,7 +12,7 @@ type: replace value: name: test-agent - sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:bb7252db83b8037f44696af7bdb80a8c92e2f79e6ca1001222db7171b3c694e8 stemcell: os: cute-stemcell version: "0.0" @@ -22,7 +22,7 @@ type: replace value: name: no-version - sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:085b6b4a335f5d6f54b55e831ff125c5b7f95ecb85c89e06a932dec56dc7d077 stemcell: os: cute-stemcell version: "0.0" @@ -32,7 +32,7 @@ type: replace value: name: more-than-1 - sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:a69d14ddcc53531e044e69c9c6db33a51500a5e3f851666ee3946d27cd5e3996 stemcell: os: cute-stemcell version: "0.0" @@ -42,7 +42,7 @@ type: replace value: name: extraneous - sha1: 02573f83a7f467e55a7bb49424e80f541288a041 + sha1: sha256:280c8373b5cc2d96119e00f10e496b54e44e4e34fae2415718ac3b90558e26e5 stemcell: os: awesome-stemcell version: "1.0" diff --git a/util/update-manifest-releases/fixtures/updated_non_append_opsfile.yml b/util/update-manifest-releases/fixtures/updated_non_append_opsfile.yml index c7cdad585..37ead864f 100644 --- a/util/update-manifest-releases/fixtures/updated_non_append_opsfile.yml +++ b/util/update-manifest-releases/fixtures/updated_non_append_opsfile.yml @@ -4,4 +4,4 @@ name: non-append version: updated-non-append-version url: updated-non-append-url - sha1: updated-non-append-sha1 \ No newline at end of file + sha1: sha256:updated-non-append-sha256 \ No newline at end of file diff --git a/util/update-manifest-releases/fixtures/updated_ops_file.yml b/util/update-manifest-releases/fixtures/updated_ops_file.yml index 3987e3a1f..765353fd2 100644 --- a/util/update-manifest-releases/fixtures/updated_ops_file.yml +++ b/util/update-manifest-releases/fixtures/updated_ops_file.yml @@ -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: diff --git a/util/update-manifest-releases/fixtures/updated_release_removal_opsfile.yml b/util/update-manifest-releases/fixtures/updated_release_removal_opsfile.yml index a97828550..06af28213 100644 --- a/util/update-manifest-releases/fixtures/updated_release_removal_opsfile.yml +++ b/util/update-manifest-releases/fixtures/updated_release_removal_opsfile.yml @@ -7,4 +7,4 @@ name: release1 version: original-release1-version url: original-release1-url - sha1: original-release1-sha1 + sha1: sha256:original-release1-sha256 diff --git a/util/update-manifest-releases/fixtures/updated_releases_and_stemcells.yml b/util/update-manifest-releases/fixtures/updated_releases_and_stemcells.yml index 6ed4c0e65..3d100ac2f 100644 --- a/util/update-manifest-releases/fixtures/updated_releases_and_stemcells.yml +++ b/util/update-manifest-releases/fixtures/updated_releases_and_stemcells.yml @@ -2,15 +2,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: updated-release2-url version: updated-release2-version - sha1: updated-release2-sha1 + sha1: sha256:updated-release2-sha256 stemcells: - alias: default os: ubuntu-trusty diff --git a/util/update-manifest-releases/fixtures/updated_sha_ops_file.yml b/util/update-manifest-releases/fixtures/updated_sha_ops_file.yml index bc6d418e5..e281e13c7 100644 --- a/util/update-manifest-releases/fixtures/updated_sha_ops_file.yml +++ b/util/update-manifest-releases/fixtures/updated_sha_ops_file.yml @@ -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: original-release2-url version: original-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: @@ -132,5 +132,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 diff --git a/util/update-manifest-releases/fixtures/updated_sha_releases.yml b/util/update-manifest-releases/fixtures/updated_sha_releases.yml index 055bef968..3c5b5f4f4 100644 --- a/util/update-manifest-releases/fixtures/updated_sha_releases.yml +++ b/util/update-manifest-releases/fixtures/updated_sha_releases.yml @@ -2,15 +2,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: updated-release2-sha1 + sha1: sha256:updated-release2-sha256 stemcells: - alias: default os: ubuntu-trusty diff --git a/util/update-manifest-releases/fixtures/updated_stemcell_os_and_releases.yml b/util/update-manifest-releases/fixtures/updated_stemcell_os_and_releases.yml index eb3241cbc..776ca654b 100644 --- a/util/update-manifest-releases/fixtures/updated_stemcell_os_and_releases.yml +++ b/util/update-manifest-releases/fixtures/updated_stemcell_os_and_releases.yml @@ -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-foo diff --git a/util/update-manifest-releases/fixtures/updated_url_ops_file.yml b/util/update-manifest-releases/fixtures/updated_url_ops_file.yml index dbddc1b5e..182930f3a 100644 --- a/util/update-manifest-releases/fixtures/updated_url_ops_file.yml +++ b/util/update-manifest-releases/fixtures/updated_url_ops_file.yml @@ -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: original-release2-sha1 + sha1: sha256:original-release2-sha256 url: updated-release2-url version: original-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: @@ -132,5 +132,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 diff --git a/util/update-manifest-releases/fixtures/updated_url_releases.yml b/util/update-manifest-releases/fixtures/updated_url_releases.yml index 64059ad55..47e88c440 100644 --- a/util/update-manifest-releases/fixtures/updated_url_releases.yml +++ b/util/update-manifest-releases/fixtures/updated_url_releases.yml @@ -2,15 +2,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: updated-release2-url version: original-release2-version - sha1: original-release2-sha1 + sha1: sha256:original-release2-sha256 stemcells: - alias: default os: ubuntu-trusty diff --git a/util/update-manifest-releases/fixtures/updated_version_ops_file.yml b/util/update-manifest-releases/fixtures/updated_version_ops_file.yml index 0cf2672a6..85487fef7 100644 --- a/util/update-manifest-releases/fixtures/updated_version_ops_file.yml +++ b/util/update-manifest-releases/fixtures/updated_version_ops_file.yml @@ -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: original-release2-sha1 + sha1: sha256:original-release2-sha256 url: original-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: @@ -132,5 +132,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 diff --git a/util/update-manifest-releases/fixtures/updated_version_releases.yml b/util/update-manifest-releases/fixtures/updated_version_releases.yml index 85de9a0e4..067e862a9 100644 --- a/util/update-manifest-releases/fixtures/updated_version_releases.yml +++ b/util/update-manifest-releases/fixtures/updated_version_releases.yml @@ -2,15 +2,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: updated-release2-version - sha1: original-release2-sha1 + sha1: sha256:original-release2-sha256 stemcells: - alias: default os: ubuntu-trusty diff --git a/util/update-manifest-releases/main_test.go b/util/update-manifest-releases/main_test.go index 85204bd74..f863fa162 100644 --- a/util/update-manifest-releases/main_test.go +++ b/util/update-manifest-releases/main_test.go @@ -50,14 +50,14 @@ var _ = Describe("main", func() { name: release1 url: original-release1-url version: original-release1-version - sha1: original-release1-sha + sha1: sha256:original-release1-sha - type: replace path: /releases/- value: name: release4 url: original-release4-url version: original-release4-version - sha1: original-release4-sha + sha1: sha256:original-release4-sha ` expectedOpsFile = ` - type: replace @@ -66,14 +66,14 @@ var _ = Describe("main", func() { name: release1 url: original-release1-url version: original-release1-version - sha1: original-release1-sha + sha1: sha256:original-release1-sha - type: replace path: /releases/- value: name: release4 url: new-release4-url version: new-release4-version - sha1: new-release4-sha + sha1: sha256:new-release4-sha ` anotherOriginalOpsFileWithRelease4 = ` - type: replace @@ -82,14 +82,14 @@ var _ = Describe("main", func() { name: release2 url: original-release2-url version: original-release2-version - sha1: original-release2-sha + sha1: sha256:original-release2-sha - type: replace path: /releases/- value: name: release4 url: original-release4-url version: original-release4-version - sha1: original-release4-sha + sha1: sha256:original-release4-sha ` anotherExpectedOpsFileWithRelease4 = ` - type: replace @@ -98,14 +98,14 @@ var _ = Describe("main", func() { name: release2 url: original-release2-url version: original-release2-version - sha1: original-release2-sha + sha1: sha256:original-release2-sha - type: replace path: /releases/- value: name: release4 url: new-release4-url version: new-release4-version - sha1: new-release4-sha + sha1: sha256:new-release4-sha ` opsFileWithoutRelease4 = ` - type: replace @@ -114,14 +114,14 @@ var _ = Describe("main", func() { name: release2 url: original-release2-url version: original-release2-version - sha1: original-release2-sha + sha1: sha256:original-release2-sha - type: replace path: /releases/- value: name: release5 url: original-release5-url version: original-release5-version - sha1: original-release5-sha + sha1: sha256:original-release5-sha ` ) @@ -240,11 +240,11 @@ releases: - name: release1 url: original-release1-url version: original-release1-version - sha1: original-release1-sha + sha1: sha256:original-release1-sha - name: release2 url: original-release2-url version: original-release2-version - sha1: original-release2-sha + sha1: sha256:original-release2-sha stemcells: - alias: default os: ubuntu-trusty @@ -398,19 +398,19 @@ releases: - name: release1 url: original-release1-url version: original-release1-version - sha1: original-release1-sha + sha1: sha256:original-release1-sha - name: release2 url: original-release2-url version: original-release2-version - sha1: original-release2-sha + sha1: sha256:original-release2-sha - name: release3 url: new-release3-url version: new-release3-version - sha1: new-release3-sha + sha1: sha256:new-release3-sha - name: release4 url: new-release4-url version: new-release4-version - sha1: new-release4-sha + sha1: sha256:new-release4-sha stemcells: - alias: default os: ubuntu-trusty @@ -423,15 +423,15 @@ releases: - name: release1 url: original-release1-url version: original-release1-version - sha1: original-release1-sha + sha1: sha256:original-release1-sha - name: release2 url: original-release2-url version: original-release2-version - sha1: original-release2-sha + sha1: sha256:original-release2-sha - name: release3 url: new-release3-url version: new-release3-version - sha1: new-release3-sha + sha1: sha256:new-release3-sha stemcells: - alias: default os: ubuntu-trusty @@ -444,11 +444,11 @@ releases: - name: release1 url: original-release1-url version: original-release1-version - sha1: original-release1-sha + sha1: sha256:original-release1-sha - name: release2 url: original-release2-url version: original-release2-version - sha1: original-release2-sha + sha1: sha256:original-release2-sha stemcells: - alias: default os: ubuntu-trusty @@ -610,11 +610,11 @@ releases: - name: release1 url: original-release1-url version: original-release1-version - sha1: original-release1-sha + sha1: sha256:original-release1-sha - name: release2 url: original-release2-url version: original-release2-version - sha1: original-release2-sha + sha1: sha256:original-release2-sha stemcells: - alias: default os: ubuntu-trusty @@ -627,11 +627,11 @@ releases: - name: release1 url: original-release1-url version: original-release1-version - sha1: original-release1-sha + sha1: sha256:original-release1-sha - name: release2 url: original-release2-url version: original-release2-version - sha1: original-release2-sha + sha1: sha256:original-release2-sha stemcells: - alias: default os: ubuntu-trusty @@ -779,7 +779,7 @@ stemcells: name: release1 url: https://storage.googleapis.com/cf-deployment-compiled-releases/release1-0.0.0-stemcell1-0.0-20180808-202210-307673159.tgz version: 0.0.0 - sha1: 4ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:616699e1335fb334f4f2d7b96fdbb705c1f34e1d9196fe06e4f0cefd7c5993ef stemcell: os: stemcell1 version: "0.0" @@ -789,7 +789,7 @@ stemcells: name: release2 url: https://storage.googleapis.com/cf-deployment-compiled-releases/release2-0.0.1-stemcell1-0.0-20180808-202210-307673159.tgz version: 0.0.1 - sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:a12ed23fcb56206f4987adbfc0a1151eca8017c5304728e242718b4fb609084a stemcell: os: stemcell1 version: "0.0" @@ -802,7 +802,7 @@ stemcells: name: release1 url: https://storage.googleapis.com/cf-deployment-compiled-releases/release1-0.2.0-stemcell2-2.0-20180808-195254-497840039.tgz version: 0.2.0 - sha1: 8867c88b56e0bfb82cffaf15a66bc8d107d6754a + sha1: sha256:ee0874170b7f6f32b8c2ac9573c428d35b575270a66b757c2c0185d2bd09718d stemcell: os: stemcell2 version: "2.0" @@ -812,7 +812,7 @@ stemcells: name: release2 url: https://storage.googleapis.com/cf-deployment-compiled-releases/release2-0.0.1-stemcell1-0.0-20180808-202210-307673159.tgz version: 0.0.1 - sha1: 5ee0dfe1f1b9acd14c18863061268f4156c291a4 + sha1: sha256:a12ed23fcb56206f4987adbfc0a1151eca8017c5304728e242718b4fb609084a stemcell: os: stemcell1 version: "0.0" @@ -840,7 +840,7 @@ stemcells: Expect(err).NotTo(HaveOccurred()) for _, release := range []map[string]string{ - {"name": "release1", "version": "0.2.0", "url": "https://storage.googleapis.com/cf-deployment-compiled-releases/release1-0.0.0-stemcell1-0.0-20180808-202210-307673159.tgz", "sha1": "4ee0dfe1f1b9acd14c18863061268f4156c291a4"}, + {"name": "release1", "version": "0.2.0", "url": "https://storage.googleapis.com/cf-deployment-compiled-releases/release1-0.0.0-stemcell1-0.0-20180808-202210-307673159.tgz", "sha1": "sha256:4ee0dfe1f1b9acd14c18863061268f4156c291a4"}, } { releaseDir := filepath.Join(buildDir, fmt.Sprintf("%s-release", release["name"])) err = os.Mkdir(releaseDir, os.ModePerm) diff --git a/util/update-manifest-releases/manifest/manifest_test.go b/util/update-manifest-releases/manifest/manifest_test.go index 54c4ab883..ef59f8508 100644 --- a/util/update-manifest-releases/manifest/manifest_test.go +++ b/util/update-manifest-releases/manifest/manifest_test.go @@ -127,7 +127,7 @@ stemcells: Name: "release1", URL: "original-release1-url", Version: "original-release1-version", - SHA1: "original-release1-sha1", + SHA1: "sha256:original-release1-sha256", })) }) @@ -199,11 +199,11 @@ other_key: }) It("returns errors instead of panicking when sha1 is missing", func() { - releases := []string{"missing-sha1"} + releases := []string{"missing-sha256"} _, _, err := manifest.UpdateReleases(releases, brokenBuildDir, cfDeploymentManifest, yaml.Marshal, yaml.Unmarshal) - Expect(err).To(MatchError("open ../fixtures/broken-build/missing-sha1-release/sha1: no such file or directory")) + Expect(err).To(MatchError("open ../fixtures/broken-build/missing-sha256-release/sha1: no such file or directory")) }) It("returns an error when the manifest is not valid yaml", func() { diff --git a/util/update-manifest-releases/opsfile/opsfile_test.go b/util/update-manifest-releases/opsfile/opsfile_test.go index b5a0b1614..c17f2cfb0 100644 --- a/util/update-manifest-releases/opsfile/opsfile_test.go +++ b/util/update-manifest-releases/opsfile/opsfile_test.go @@ -129,11 +129,11 @@ var _ = Describe("UpdateReleases", func() { }) It("returns errors instead of panicking when sha1 is missing", func() { - releases := []string{"missing-sha1"} + releases := []string{"missing-sha256"} _, _, err := opsfile.UpdateReleases(releases, brokenBuildDir, originalOpsFile, yaml.Marshal, yaml.Unmarshal) - Expect(err).To(MatchError("open ../fixtures/broken-build/missing-sha1-release/sha1: no such file or directory")) + Expect(err).To(MatchError("open ../fixtures/broken-build/missing-sha256-release/sha1: no such file or directory")) }) It("returns an error when the manifest is not valid yaml", func() { @@ -219,7 +219,7 @@ releases: value: 0.0.0 - path: /releases/name=test/sha1 type: replace - value: 4ee0dfe1f1b9acd14c18863061268f4156c291a4 + value: sha256:616699e1335fb334f4f2d7b96fdbb705c1f34e1d9196fe06e4f0cefd7c5993ef `) _, _, err := opsfile.UpdateReleases(releases, goodBuildDir, originalOpsFile, yaml.Marshal, yaml.Unmarshal) Expect(err).To(MatchError(opsfile.BadReleaseOpsFormatErrorMessage))