Merge pull request #256 from buildpacks/fix/locallayout

Fix locallayout package, make it suitable to replace the local package

cnb_image.go

@@ -17,7 +17,7 @@ import (
 // Specific implementations may choose to override certain methods, and will need to supply the methods that are omitted,
 // such as Identifier() and Found().
 // The working image could be any v1.Image,
-// but in practice will start off as a pointer to a locallayout.v1ImageFacade (or similar).
+// but in practice will start off as a pointer to a local.v1ImageFacade (or similar).
 type CNBImageCore struct {
 	// required
 	v1.Image // the working image
@@ -305,17 +305,22 @@ func (i *CNBImageCore) AddLayerWithDiffID(path, _ string) error {
 }
 
 func (i *CNBImageCore) AddLayerWithDiffIDAndHistory(path, _ string, history v1.History) error {
+	layer, err := tarball.LayerFromFile(path)
+	if err != nil {
+		return err
+	}
+	return i.AddLayerWithHistory(layer, history)
+}
+
+func (i *CNBImageCore) AddLayerWithHistory(layer v1.Layer, history v1.History) error {
+	var err error
 	// ensure existing history
-	if err := i.MutateConfigFile(func(c *v1.ConfigFile) {
+	if err = i.MutateConfigFile(func(c *v1.ConfigFile) {
 		c.History = NormalizedHistory(c.History, len(c.RootFS.DiffIDs))
 	}); err != nil {
 		return err
 	}
 
-	layer, err := tarball.LayerFromFile(path)
-	if err != nil {
-		return err
-	}
 	if !i.preserveHistory {
 		history = emptyHistory
 	}

image.go

@@ -25,7 +25,7 @@ type Image interface {
 	History() ([]v1.History, error)
 	Identifier() (Identifier, error)
 	// Kind exposes the type of image that backs the imgutil.Image implementation.
-	// It could be `local`, `locallayout`, `remote`, or `layout`.
+	// It could be `local`, `remote`, or `layout`.
 	Kind() string
 	Label(string) (string, error)
 	Labels() (map[string]string, error)

layout/new.go

@@ -14,7 +14,7 @@ func NewImage(path string, ops ...ImageOption) (*Image, error) {
 		op(options)
 	}
 
-	options.Platform = processDefaultPlatformOption(options.Platform)
+	options.Platform = processPlatformOption(options.Platform)
 
 	var err error
 
@@ -58,7 +58,7 @@ func NewImage(path string, ops ...ImageOption) (*Image, error) {
 	}, nil
 }
 
-func processDefaultPlatformOption(requestedPlatform imgutil.Platform) imgutil.Platform {
+func processPlatformOption(requestedPlatform imgutil.Platform) imgutil.Platform {
 	var emptyPlatform imgutil.Platform
 	if requestedPlatform != emptyPlatform {
 		return requestedPlatform

layout/options.go

@@ -26,18 +26,18 @@ func FromBaseImagePath(name string) func(*imgutil.ImageOptions) {
 	}
 }
 
-// WithCreatedAt lets a caller set the "created at" timestamp for the working image when saved.
-// If not provided, the default is imgutil.NormalizedDateTime.
-func WithCreatedAt(t time.Time) func(*imgutil.ImageOptions) {
+// WithConfig lets a caller provided a `config` object for the working image.
+func WithConfig(c *v1.Config) func(*imgutil.ImageOptions) {
 	return func(o *imgutil.ImageOptions) {
-		o.CreatedAt = t
+		o.Config = c
 	}
 }
 
-// WithConfig lets a caller provided a `config` object for the working image.
-func WithConfig(c *v1.Config) func(*imgutil.ImageOptions) {
+// WithCreatedAt lets a caller set the "created at" timestamp for the working image when saved.
+// If not provided, the default is imgutil.NormalizedDateTime.
+func WithCreatedAt(t time.Time) func(*imgutil.ImageOptions) {
 	return func(o *imgutil.ImageOptions) {
-		o.Config = c
+		o.CreatedAt = t
 	}
 }