adds support for extensions in OCILayoutPackage

Signed-off-by: Darshan Kumar <[email protected]>
buildpacks · May 11, 2023 · 84142bf · 84142bf
1 parent 20d94a2
commit 84142bf
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/pkg/buildpack/downloader.go b/pkg/buildpack/downloader.go
@@ -96,7 +96,6 @@ func (c *buildpackDownloader) Download(ctx context.Context, moduleURI string, op
 			return nil, nil, err
 		}
 	}
-
 	var mainBP BuildModule
 	var depBPs []BuildModule
 	switch locatorType {
@@ -205,6 +204,5 @@ func extractPackaged(ctx context.Context, kind string, pkgImageRef string, fetch
 	if err != nil {
 		return nil, nil, errors.Wrapf(err, "extracting %ss from %s", kind, style.Symbol(pkgImageRef))
 	}
-
 	return mainModule, depModules, nil
 }
diff --git a/pkg/buildpack/locator_type.go b/pkg/buildpack/locator_type.go
@@ -92,7 +92,6 @@ func parseNakedLocator(locator, relativeBaseDir string, buildpacksFromBuilder []
 	//   2. Does it match a buildpack ID in the builder
 	//   3. Does it look like a Buildpack Registry ID
 	//   4. Does it look like a Docker ref
-
 	if isLocalFile(locator, relativeBaseDir) {
 		return URILocator
 	}

diff --git a/pkg/buildpack/oci_layout_package.go b/pkg/buildpack/oci_layout_package.go
@@ -4,6 +4,7 @@ import (
 	"archive/tar"
 	"compress/gzip"
 	"encoding/json"
+	"fmt"
 	"io"
 	"path"
 	"strings"
@@ -41,7 +42,7 @@ func IsOCILayoutBlob(blob blob2.Blob) (bool, error) {
 
 // BuildpacksFromOCILayoutBlob constructs buildpacks from a blob in OCI layout format.
 func BuildpacksFromOCILayoutBlob(blob Blob) (mainBP BuildModule, dependencies []BuildModule, err error) {
-	layoutPackage, err := newOCILayoutPackage(blob)
+	layoutPackage, err := newOCILayoutPackage(blob, KindBuildpack)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -51,11 +52,16 @@ func BuildpacksFromOCILayoutBlob(blob Blob) (mainBP BuildModule, dependencies []
 
 // ExtensionsFromOCILayoutBlob constructs extensions from a blob in OCI layout format.
 func ExtensionsFromOCILayoutBlob(blob Blob) (mainExt BuildModule, err error) {
-	return nil, nil // TODO: add extractExtensions when `pack extension package` is supported in https://github.com/buildpacks/pack/issues/1489
+	layoutPackage, err := newOCILayoutPackage(blob, KindExtension)
+	if err != nil {
+		return nil, err
+	}
+
+	return extractExtensions(layoutPackage)
 }
 
 func ConfigFromOCILayoutBlob(blob Blob) (config v1.ImageConfig, err error) {
-	layoutPackage, err := newOCILayoutPackage(blob)
+	layoutPackage, err := newOCILayoutPackage(blob, KindBuildpack)
 	if err != nil {
 		return v1.ImageConfig{}, err
 	}
@@ -68,7 +74,7 @@ type ociLayoutPackage struct {
 	blob      Blob
 }
 
-func newOCILayoutPackage(blob Blob) (*ociLayoutPackage, error) {
+func newOCILayoutPackage(blob Blob, kind string) (*ociLayoutPackage, error) {
 	index := &v1.Index{}
 
 	if err := unmarshalJSONFromBlob(blob, "/index.json", index); err != nil {
@@ -96,10 +102,20 @@ func newOCILayoutPackage(blob Blob) (*ociLayoutPackage, error) {
 	if err := unmarshalJSONFromBlob(blob, pathFromDescriptor(manifest.Config), imageInfo); err != nil {
 		return nil, err
 	}
-
-	layersLabel := imageInfo.Config.Labels[dist.BuildpackLayersLabel]
-	if layersLabel == "" {
-		return nil, errors.Errorf("label %s not found", style.Symbol(dist.BuildpackLayersLabel))
+	var layersLabel string
+	switch kind {
+	case KindBuildpack:
+		layersLabel = imageInfo.Config.Labels[dist.BuildpackLayersLabel]
+		if layersLabel == "" {
+			return nil, errors.Errorf("label %s not found", style.Symbol(dist.BuildpackLayersLabel))
+		}
+	case KindExtension:
+		layersLabel = imageInfo.Config.Labels[dist.ExtensionLayersLabel]
+		if layersLabel == "" {
+			return nil, errors.Errorf("label %s not found", style.Symbol(dist.ExtensionLayersLabel))
+		}
+	default:
+		return nil, fmt.Errorf("unknown module kind: %s", kind)
 	}
 
 	bpLayers := dist.ModuleLayers{}

diff --git a/pkg/buildpack/package.go b/pkg/buildpack/package.go
@@ -119,7 +119,7 @@ func extractExtensions(pkg Package) (mainExt BuildModule, err error) {
 	if !ok {
 		return nil, errors.Errorf(
 			"could not find label %s",
-			style.Symbol(dist.ExtensionLayersLabel),
+			style.Symbol(dist.ExtensionLayersLabel),	
 		)
 	}
 	for extID, v := range pkgLayers {

diff --git a/pkg/client/create_builder.go b/pkg/client/create_builder.go
@@ -259,7 +259,6 @@ func (c *Client) addConfig(ctx context.Context, kind string, config pubbldr.Modu
 	if err != nil {
 		return errors.Wrapf(err, "downloading %s", kind)
 	}
-
 	err = validateModule(kind, mainBP, config.URI, config.ID, config.Version)
 	if err != nil {
 		return errors.Wrapf(err, "invalid %s", kind)