Support stacks and targets in buildpacks.toml

Support targets in package.toml

Author: jericop

internal/buildpack_config.go

@@ -8,10 +8,12 @@ import (
 )
 
 type BuildpackConfig struct {
-	API       interface{}            `toml:"api"`
-	Buildpack interface{}            `toml:"buildpack"`
-	Metadata  interface{}            `toml:"metadata"`
-	Order     []BuildpackConfigOrder `toml:"order"`
+	API       interface{}             `toml:"api"`
+	Buildpack interface{}             `toml:"buildpack"`
+	Metadata  interface{}             `toml:"metadata"`
+	Order     []BuildpackConfigOrder  `toml:"order"`
+	Stacks    []BuildpackConfigStack  `toml:"stacks,omitempty"`
+	Targets   []BuildpackConfigTarget `toml:"targets,omitempty"`
 }
 
 type BuildpackConfigOrder struct {
@@ -24,6 +26,16 @@ type BuildpackConfigOrderGroup struct {
 	Optional bool   `toml:"optional,omitempty"`
 }
 
+type BuildpackConfigStack struct {
+	ID     string   `toml:"id"`
+	Mixins []string `toml:"mixins,omitempty"`
+}
+
+type BuildpackConfigTarget struct {
+	OS   string `toml:"os,omitempty"`
+	Arch string `toml:"arch,omitempty"`
+}
+
 func ParseBuildpackConfig(path string) (BuildpackConfig, error) {
 	file, err := os.Open(path)
 	if err != nil {

internal/buildpack_config_test.go

@@ -55,6 +55,17 @@ func testBuildpackConfig(t *testing.T, context spec.G, it spec.S) {
 						id = "some-repository/other-buildpack-id"
 						version = "0.1.0"
 						optional = true
+
+				[[stacks]]
+					id = "*"
+
+				[[targets]]
+					os = "linux"
+					arch = "amd64"
+
+				[[targets]]
+					os = "linux"
+					arch = "arm64"
 			`)
 			Expect(err).NotTo(HaveOccurred())
 
@@ -109,6 +120,21 @@ func testBuildpackConfig(t *testing.T, context spec.G, it spec.S) {
 						},
 					},
 				},
+				Stacks: []internal.BuildpackConfigStack{
+					{
+						ID: "*",
+					},
+				},
+				Targets: []internal.BuildpackConfigTarget{
+					{
+						OS:   "linux",
+						Arch: "amd64",
+					},
+					{
+						OS:   "linux",
+						Arch: "arm64",
+					},
+				},
 			}))
 		})
 

internal/package_config.go

@@ -12,12 +12,18 @@ import (
 type PackageConfig struct {
 	Buildpack    interface{}               `toml:"buildpack"`
 	Dependencies []PackageConfigDependency `toml:"dependencies"`
+	Targets      []PackageConfigTarget     `toml:"targets,omitempty"`
 }
 
 type PackageConfigDependency struct {
 	URI string `toml:"uri"`
 }
 
+type PackageConfigTarget struct {
+	OS   string `toml:"os,omitempty"`
+	Arch string `toml:"arch,omitempty"`
+}
+
 // Note: this is to support that buildpackages can refer to this field as `image` or `uri`.
 func (d *PackageConfigDependency) UnmarshalTOML(v interface{}) error {
 	if m, ok := v.(map[string]interface{}); ok {

internal/package_config_test.go

@@ -39,6 +39,14 @@ func testPackageConfig(t *testing.T, context spec.G, it spec.S) {
 
 				[[dependencies]]
 				uri = "urn:cnb:registry:some-registry/some-repository/final-buildpack-id@0.1.0"
+
+				[[targets]]
+					os = "linux"
+					arch = "amd64"
+
+				[[targets]]
+					os = "linux"
+					arch = "arm64"
 			`)
 			Expect(err).NotTo(HaveOccurred())
 
@@ -62,6 +70,10 @@ func testPackageConfig(t *testing.T, context spec.G, it spec.S) {
 					{URI: "some-registry/some-repository/other-buildpack-id:0.1.0"},
 					{URI: "urn:cnb:registry:some-registry/some-repository/final-buildpack-id@0.1.0"},
 				},
+				Targets: []internal.PackageConfigTarget{
+					{OS: "linux", Arch: "amd64"},
+					{OS: "linux", Arch: "arm64"},
+				},
 			}))
 		})