Revert "remove lifecycle symlink test, update formatting"

This reverts commit 5b67313. Signed-off-by: Javier Romero <rjavier@vmware.com> Revert "failing on 'should add lifecycle symlink' assertion" This reverts commit bd59022. Signed-off-by: Javier Romero <rjavier@vmware.com>
keshavdalmia10 · Aug 19, 2020 · 523c509 · 523c509
1 parent ecf5e71
commit 523c509
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/internal/builder/builder.go b/internal/builder/builder.go
@@ -32,12 +32,13 @@ const (
 
 	cnbDir = "/cnb"
 
-	orderPath    = "/cnb/order.toml"
-	stackPath    = "/cnb/stack.toml"
-	platformDir  = "/platform"
-	lifecycleDir = "/cnb/lifecycle"
-	workspaceDir = "/workspace"
-	layersDir    = "/layers"
+	orderPath          = "/cnb/order.toml"
+	stackPath          = "/cnb/stack.toml"
+	platformDir        = "/platform"
+	lifecycleDir       = "/cnb/lifecycle"
+	compatLifecycleDir = "/lifecycle"
+	workspaceDir       = "/workspace"
+	layersDir          = "/layers"
 
 	metadataLabel = "io.buildpacks.builder.metadata"
 	stackLabel    = "io.buildpacks.stack.id"
@@ -581,6 +582,16 @@ func (b *Builder) lifecycleLayer(dest string) (string, error) {
 		return "", errors.Wrap(err, "embedding lifecycle tar")
 	}
 
+	if err := lw.WriteHeader(&tar.Header{
+		Name:     compatLifecycleDir,
+		Linkname: lifecycleDir,
+		Typeflag: tar.TypeSymlink,
+		Mode:     0644,
+		ModTime:  archive.NormalizedDateTime,
+	}); err != nil {
+		return "", errors.Wrapf(err, "creating %s symlink", style.Symbol(compatLifecycleDir))
+	}
+
 	return fh.Name(), nil
 }
 

diff --git a/internal/builder/builder_test.go b/internal/builder/builder_test.go
@@ -657,6 +657,14 @@ func testBuilder(t *testing.T, when spec.G, it spec.S) {
 					h.HasFileMode(0755),
 					h.HasModTime(archive.NormalizedDateTime),
 				)
+
+				it("should add lifecycle symlink", func() {
+					h.AssertOnTarEntry(t, layerTar, "/lifecycle",
+						h.SymlinksTo("/cnb/lifecycle"),
+						h.HasFileMode(0644),
+						h.HasModTime(archive.NormalizedDateTime),
+					)
+				})
 			})
 
 			it("sets the lifecycle version on the metadata", func() {