Try to fix restorer acceptance

Signed-off-by: Natalie Arellano <narellano@vmware.com>
buildpacks · Oct 23, 2024 · d0ccbee · d0ccbee
1 parent 7b4b458
commit d0ccbee
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 11 deletions.
diff --git a/acceptance/restorer_test.go b/acceptance/restorer_test.go
@@ -131,14 +131,15 @@ func testRestorerFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 		when("using cache-dir", func() {
 			when("there is cache present from a previous build", func() {
 				it("restores cached layer data", func() {
-					h.DockerRunAndCopy(t,
+					output := h.DockerRunAndCopy(t,
 						containerName,
 						copyDir,
 						"/layers",
 						restoreImage,
 						h.WithFlags("--env", "CNB_PLATFORM_API="+platformAPI),
 						h.WithArgs("-cache-dir", "/cache"),
 					)
+					t.Log("XXX", output)
 
 					// check restored cache file is present
 					cachedFile := filepath.Join(copyDir, "layers", "cacher_buildpack", "cached-layer", "data")

diff --git a/acceptance/testdata/restorer/Dockerfile b/acceptance/testdata/restorer/Dockerfile
@@ -8,13 +8,6 @@ ENV CNB_GROUP_ID=${cnb_gid}
 
 COPY ./container/ /
 
-# turn /to_cache/<buildpack> directories into cache tarballs
-# these are referenced by sha in /cache/committed/io.buildpacks.lifecycle.cache.metadata
-RUN tar cvf /cache/committed/sha256:2d9c9c638d5c4f0df067eeae7b9c99ad05776a89d19ab863c28850a91e5f2944.tar -C /to_cache/cacher_buildpack layers
-RUN tar cvf /cache/committed/sha256:58bafa1e79c8e44151141c95086beb37ca85b69578fc890bce33bb4c6c8e851f.tar -C /to_cache/unused_buildpack layers
-# this layer has sha not matching the actual contents
-RUN tar cvf /cache/committed/sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c.tar -C /to_cache/corrupted_buildpack layers
-
 ENTRYPOINT ["/cnb/lifecycle/restorer"]
 
 RUN groupadd cnb --gid ${cnb_gid} && \

diff --git a/...ptance/testdata/restorer/container/cache/committed/io.buildpacks.lifecycle.cache.metadata b/...ptance/testdata/restorer/container/cache/committed/io.buildpacks.lifecycle.cache.metadata
@@ -31,7 +31,7 @@
       "version": "v1",
       "layers": {
         "cached-layer": {
-          "sha": "sha256:58bafa1e79c8e44151141c95086beb37ca85b69578fc890bce33bb4c6c8e851f",
+          "sha": "sha256:430338f576c11e5236669f9c843599d96afe28784cffcb2d46ddb07beb00df78",
           "data": null,
           "build": false,
           "launch": false,

diff --git a/...che/committed/sha256:2d9c9c638d5c4f0df067eeae7b9c99ad05776a89d19ab863c28850a91e5f2944.tar b/...che/committed/sha256:2d9c9c638d5c4f0df067eeae7b9c99ad05776a89d19ab863c28850a91e5f2944.tar
diff --git a/...che/committed/sha256:430338f576c11e5236669f9c843599d96afe28784cffcb2d46ddb07beb00df78.tar b/...che/committed/sha256:430338f576c11e5236669f9c843599d96afe28784cffcb2d46ddb07beb00df78.tar
diff --git a/cache/volume_cache.go b/cache/volume_cache.go
@@ -2,7 +2,6 @@ package cache
 
 import (
 	"crypto/sha256"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -241,7 +240,7 @@ func (c *VolumeCache) VerifyLayer(diffID string) error {
 	if _, err := io.Copy(hasher, layerRC); err != nil {
 		return errors.Wrap(err, "hashing layer")
 	}
-	foundDiffID := "sha256:" + hex.EncodeToString(hasher.Sum(make([]byte, 0, hasher.Size())))
+	foundDiffID := fmt.Sprintf("sha256:%x", hasher.Sum(nil))
 	if diffID != foundDiffID {
 		return NewReadErr(fmt.Sprintf("expected layer contents to have SHA '%s'; found '%s'", diffID, foundDiffID))
 	}