Merge branch 'master' into cnb-bindings

scothis · May 6, 2020 · de67384 · de67384
2 parents b01248a + 019fd44
commit de67384
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 10 deletions.
diff --git a/docs/custombuilders.md b/docs/custombuilders.md
@@ -18,7 +18,7 @@ spec:
   sources:
   - image: gcr.io/cf-build-service-public/node-engine-buildpackage@sha256:95ff756f0ef0e026440a8523f4bab02fd8b45dc1a8a3a7ba063cefdba5cb9493
   - image: gcr.io/cf-build-service-public/npm-buildpackage@sha256:5058ceb9a562ec647ea5a41008b0d11e32a56e13e8c9ec20c4db63d220373e33
-  - image: gcr.io/paketo-buildpacks/build:base
+  - image: gcr.io/paketo-buildpacks/builder:base
 ```
 
 * `sources`:  List of builder images or buildpackage images to make available in the store. Each image is an object with the key image.   

diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -221,6 +221,6 @@ This tutorial will walk through creating a kpack [image](image.md) resource to b
     
 1. kpack rebuilds with buildpack updates
 
-    The next time the `gcr.io/paketo-buildpacks/build:base` is updated, kpack will detect if it contains buildpack updates to any of the buildpacks used by the tutorial image.
+    The next time the `gcr.io/paketo-buildpacks/builder:base` is updated, kpack will detect if it contains buildpack updates to any of the buildpacks used by the tutorial image.
     If there is a buildpack update, kpack will automatically create a new build to rebuild your image.    
 
diff --git a/pkg/apis/experimental/v1alpha1/buildpackage_types.go b/pkg/apis/experimental/v1alpha1/buildpackage_types.go
@@ -0,0 +1,7 @@
+package v1alpha1
+
+// +k8s:openapi-gen=true
+type BuildpackageInfo struct {
+	Id      string `json:"id,omitempty"`
+	Version string `json:"version,omitempty"`
+}
diff --git a/pkg/apis/experimental/v1alpha1/store_types.go b/pkg/apis/experimental/v1alpha1/store_types.go
@@ -44,10 +44,11 @@ type StoreStatus struct {
 // +k8s:openapi-gen=true
 type StoreBuildpack struct {
 	BuildpackInfo `json:",inline"`
-	StoreImage    StoreImage `json:"storeImage,omitempty"`
-	DiffId        string     `json:"diffId,omitempty"`
-	Digest        string     `json:"digest,omitempty"`
-	Size          int64      `json:"size,omitempty"`
+	Buildpackage  BuildpackageInfo `json:"buildpackage,omitempty"`
+	StoreImage    StoreImage       `json:"storeImage,omitempty"`
+	DiffId        string           `json:"diffId,omitempty"`
+	Digest        string           `json:"digest,omitempty"`
+	Size          int64            `json:"size,omitempty"`
 
 	API      string `json:"api,omitempty"`
 	Homepage string `json:"homepage,omitempty"`

diff --git a/pkg/cnb/buildpackage_metadata.go b/pkg/cnb/buildpackage_metadata.go
@@ -0,0 +1,10 @@
+package cnb
+
+const (
+	buildpackageMetadataLabel = "io.buildpacks.buildpackage.metadata"
+)
+
+type BuildpackageMetadata struct {
+	Id      string `json:"id"`
+	Version string `json:"version"`
+}
diff --git a/pkg/cnb/remote_store_reader.go b/pkg/cnb/remote_store_reader.go
@@ -22,13 +22,23 @@ func (r *RemoteStoreReader) Read(storeImages []v1alpha1.StoreImage) ([]v1alpha1.
 
 	c := make(chan v1alpha1.StoreBuildpack)
 	for _, storeImage := range storeImages {
-		storeImage := storeImage
+		storeImageCopy := storeImage
 		g.Go(func() error {
-			image, _, err := r.RegistryClient.Fetch(r.Keychain, storeImage.Image)
+			image, _, err := r.RegistryClient.Fetch(r.Keychain, storeImageCopy.Image)
 			if err != nil {
 				return err
 			}
 
+			bpMetadata := BuildpackageMetadata{}
+			if ok, err := imagehelpers.HasLabel(image, buildpackageMetadataLabel); err != nil {
+				return err
+			} else if ok {
+				err := imagehelpers.GetLabel(image, buildpackageMetadataLabel, &bpMetadata)
+				if err != nil {
+					return err
+				}
+			}
+
 			layerMetadata := BuildpackLayerMetadata{}
 			err = imagehelpers.GetLabel(image, buildpackLayersLabel, &layerMetadata)
 			if err != nil {
@@ -37,6 +47,11 @@ func (r *RemoteStoreReader) Read(storeImages []v1alpha1.StoreImage) ([]v1alpha1.
 
 			for id := range layerMetadata {
 				for version, metadata := range layerMetadata[id] {
+					packageInfo := v1alpha1.BuildpackageInfo{
+						Id:      bpMetadata.Id,
+						Version: bpMetadata.Version,
+					}
+
 					info := v1alpha1.BuildpackInfo{
 						Id:      id,
 						Version: version,
@@ -46,6 +61,7 @@ func (r *RemoteStoreReader) Read(storeImages []v1alpha1.StoreImage) ([]v1alpha1.
 					if err != nil {
 						return errors.Wrapf(err, "unable to parse layer diffId for %s", info)
 					}
+
 					layer, err := image.LayerByDiffID(diffId)
 					if err != nil {
 						return errors.Wrapf(err, "unable to get layer %s", info)
@@ -63,7 +79,8 @@ func (r *RemoteStoreReader) Read(storeImages []v1alpha1.StoreImage) ([]v1alpha1.
 
 					c <- v1alpha1.StoreBuildpack{
 						BuildpackInfo: info,
-						StoreImage:    storeImage,
+						Buildpackage:  packageInfo,
+						StoreImage:    storeImageCopy,
 						Digest:        digest.String(),
 						DiffId:        metadata.LayerDiffID,
 						Size:          size,

diff --git a/pkg/cnb/remote_store_reader_test.go b/pkg/cnb/remote_store_reader_test.go
@@ -132,6 +132,19 @@ func testRemoteStoreReader(t *testing.T, when spec.G, it spec.S) {
   }
 }
 `,
+				"io.buildpacks.buildpackage.metadata": //language=json
+				`{
+  "id": "org.buildpack.meta",
+  "version": "0.0.2",
+  "stacks": [
+    {
+      "id": "org.some.stack"
+    },
+    {
+      "id": "org.multi.only.stack"
+    }
+  ]
+}`,
 			})
 			require.NoError(t, err)
 
@@ -171,6 +184,19 @@ func testRemoteStoreReader(t *testing.T, when spec.G, it spec.S) {
   }
 }
 `,
+				"io.buildpacks.buildpackage.metadata": //language=json
+				`{
+  "id": "org.buildpack.simple",
+  "version": "0.0.1",
+  "stacks": [
+    {
+      "id": "org.some.stack"
+    },
+    {
+      "id": "org.simple.only.stack"
+    }
+  ]
+}`,
 			})
 			require.NoError(t, err)
 
@@ -194,6 +220,10 @@ func testRemoteStoreReader(t *testing.T, when spec.G, it spec.S) {
 					Id:      "org.buildpack.multi",
 					Version: "0.0.1",
 				},
+				Buildpackage: v1alpha1.BuildpackageInfo{
+					Id:      "org.buildpack.meta",
+					Version: "0.0.2",
+				},
 				StoreImage: v1alpha1.StoreImage{
 					Image: buildpackageA,
 				},
@@ -217,6 +247,10 @@ func testRemoteStoreReader(t *testing.T, when spec.G, it spec.S) {
 					Id:      "org.buildpack.multi",
 					Version: "0.0.2",
 				},
+				Buildpackage: v1alpha1.BuildpackageInfo{
+					Id:      "org.buildpack.meta",
+					Version: "0.0.2",
+				},
 				StoreImage: v1alpha1.StoreImage{
 					Image: buildpackageA,
 				},
@@ -242,6 +276,10 @@ func testRemoteStoreReader(t *testing.T, when spec.G, it spec.S) {
 						Id:      "org.buildpack.meta",
 						Version: "0.0.2",
 					},
+					Buildpackage: v1alpha1.BuildpackageInfo{
+						Id:      "org.buildpack.meta",
+						Version: "0.0.2",
+					},
 					StoreImage: v1alpha1.StoreImage{
 						Image: buildpackageA,
 					},
@@ -288,6 +326,10 @@ func testRemoteStoreReader(t *testing.T, when spec.G, it spec.S) {
 					Id:      "org.buildpack.simple",
 					Version: "0.0.1",
 				},
+				Buildpackage: v1alpha1.BuildpackageInfo{
+					Id:      "org.buildpack.simple",
+					Version: "0.0.1",
+				},
 				DiffId:   "sha256:1fe2cf74b742ec16c76b9e996c247c78aa41905fe86b744db998094b4bcaf38a",
 				Digest:   "sha256:6aa3691a73805f608e5fce69fb6bc89aec8362f58a6b4be2682515e9cfa3cc1a",
 				Size:     40,
@@ -353,7 +395,7 @@ func testRemoteStoreReader(t *testing.T, when spec.G, it spec.S) {
    "0.0.1": {
      "layerDiffID": "sha256:1fe2cf74b742ec16c76b9e996c247c78aa41905fe86b744db998094b4bcaf38a",
      "api": "0.2",
-	 "homepage": "builpack.simple.com",
+	 "homepage": "buildpack.simple.com",
      "stacks": [
        {
          "id": "org.some.stack",
@@ -369,6 +411,19 @@ func testRemoteStoreReader(t *testing.T, when spec.G, it spec.S) {
  }
 }
 `,
+				"io.buildpacks.buildpackage.metadata": //language=json
+				`{
+  "id": "org.buildpack.simple",
+  "version": "0.0.1",
+  "stacks": [
+    {
+      "id": "org.some.stack"
+    },
+    {
+      "id": "org.simple.only.stack"
+    }
+  ]
+}`,
 			})
 			require.NoError(t, err)