pack build support --extension

internal/commands/build.go

@@ -41,6 +41,7 @@ type BuildFlags struct {
 	Env                  []string
 	EnvFiles             []string
 	Buildpacks           []string
+	Extensions           []string
 	Volumes              []string
 	AdditionalTags       []string
 	Workspace            string
@@ -96,6 +97,7 @@ func Build(logger logging.Logger, cfg config.Config, packClient PackClient) *cob
 			}
 
 			buildpacks := flags.Buildpacks
+			extensions := flags.Extensions
 
 			env, err := parseEnv(flags.EnvFiles, flags.Env)
 			if err != nil {
@@ -159,6 +161,7 @@ func Build(logger logging.Logger, cfg config.Config, packClient PackClient) *cob
 					return trustBuilder
 				},
 				Buildpacks: buildpacks,
+				Extensions: extensions,
 				ContainerConfig: client.ContainerConfig{
 					Network: flags.Network,
 					Volumes: flags.Volumes,
@@ -210,6 +213,7 @@ func parseTime(providedTime string) (*time.Time, error) {
 func buildCommandFlags(cmd *cobra.Command, buildFlags *BuildFlags, cfg config.Config) {
 	cmd.Flags().StringVarP(&buildFlags.AppPath, "path", "p", "", "Path to app dir or zip-formatted file (defaults to current working directory)")
 	cmd.Flags().StringSliceVarP(&buildFlags.Buildpacks, "buildpack", "b", nil, "Buildpack to use. One of:\n  a buildpack by id and version in the form of '<buildpack>@<version>',\n  path to a buildpack directory (not supported on Windows),\n  path/URL to a buildpack .tar or .tgz file, or\n  a packaged buildpack image name in the form of '<hostname>/<repo>[:<tag>]'"+stringSliceHelp("buildpack"))
+	cmd.Flags().StringSliceVarP(&buildFlags.Extensions, "extension", "", nil, "Extension to use. One of:\n  a extension by id and version in the form of '<extension>@<version>',\n  path to a extension directory (not supported on Windows),\n  path/URL to a extension .tar or .tgz file, or\n  a packaged extension image name in the form of '<hostname>/<repo>[:<tag>]'"+stringSliceHelp("extension"))
 	cmd.Flags().StringVarP(&buildFlags.Builder, "builder", "B", cfg.DefaultBuilder, "Builder image")
 	cmd.Flags().Var(&buildFlags.Cache, "cache",
 		`Cache options used to define cache techniques for build process.

pkg/client/build.go

@@ -132,6 +132,11 @@ type BuildOptions struct {
 	// share both an ID and Version with a buildpack on the builder.
 	Buildpacks []string
 
+	// List of extension images or archives to add to a builder.
+	// These extensions may overwrite those on the builder if they
+	// share both an ID and Version with a extension on the builder.
+	Extensions []string
+
 	// Additional image tags to push to, each will contain contents identical to Image
 	AdditionalTags []string
 
@@ -278,6 +283,11 @@ func (c *Client) Build(ctx context.Context, opts BuildOptions) error {
 		return err
 	}
 
+	fetchedExs, orderExtensions, err := c.processExtensions(ctx, bldr.Image(), bldr.Extensions(), bldr.OrderExtensions(), bldr.StackID, opts)
+	if err != nil {
+		return err
+	}
+
 	if err := c.validateMixins(fetchedBPs, bldr, runImageName, runMixins); err != nil {
 		return errors.Wrap(err, "validating stack mixins")
 	}
@@ -291,7 +301,7 @@ func (c *Client) Build(ctx context.Context, opts BuildOptions) error {
 		buildEnvs[k] = v
 	}
 
-	ephemeralBuilder, err := c.createEphemeralBuilder(rawBuilderImage, buildEnvs, order, fetchedBPs)
+	ephemeralBuilder, err := c.createEphemeralBuilder(rawBuilderImage, buildEnvs, order, fetchedBPs, orderExtensions, fetchedExs)
 	if err != nil {
 		return err
 	}
@@ -791,7 +801,7 @@ func (c *Client) processBuildpacks(ctx context.Context, builderImage imgutil.Ima
 				order = newOrder
 			}
 		default:
-			newFetchedBPs, moduleInfo, err := c.fetchBuildpack(ctx, bp, relativeBaseDir, builderImage, builderBPs, opts)
+			newFetchedBPs, moduleInfo, err := c.fetchBuildpack(ctx, bp, relativeBaseDir, builderImage, builderBPs, opts, buildpack.KindBuildpack)
 			if err != nil {
 				return fetchedBPs, order, err
 			}
@@ -825,7 +835,7 @@ func (c *Client) processBuildpacks(ctx context.Context, builderImage imgutil.Ima
 		if len(preBuildpacks) > 0 || len(postBuildpacks) > 0 {
 			order = builderOrder
 			for _, bp := range preBuildpacks {
-				newFetchedBPs, moduleInfo, err := c.fetchBuildpack(ctx, bp, relativeBaseDir, builderImage, builderBPs, opts)
+				newFetchedBPs, moduleInfo, err := c.fetchBuildpack(ctx, bp, relativeBaseDir, builderImage, builderBPs, opts, buildpack.KindBuildpack)
 				if err != nil {
 					return fetchedBPs, order, err
 				}
@@ -834,7 +844,7 @@ func (c *Client) processBuildpacks(ctx context.Context, builderImage imgutil.Ima
 			}
 
 			for _, bp := range postBuildpacks {
-				newFetchedBPs, moduleInfo, err := c.fetchBuildpack(ctx, bp, relativeBaseDir, builderImage, builderBPs, opts)
+				newFetchedBPs, moduleInfo, err := c.fetchBuildpack(ctx, bp, relativeBaseDir, builderImage, builderBPs, opts, buildpack.KindBuildpack)
 				if err != nil {
 					return fetchedBPs, order, err
 				}
@@ -847,7 +857,7 @@ func (c *Client) processBuildpacks(ctx context.Context, builderImage imgutil.Ima
 	return fetchedBPs, order, nil
 }
 
-func (c *Client) fetchBuildpack(ctx context.Context, bp string, relativeBaseDir string, builderImage imgutil.Image, builderBPs []dist.ModuleInfo, opts BuildOptions) ([]buildpack.BuildModule, *dist.ModuleInfo, error) {
+func (c *Client) fetchBuildpack(ctx context.Context, bp string, relativeBaseDir string, builderImage imgutil.Image, builderBPs []dist.ModuleInfo, opts BuildOptions, kind string) ([]buildpack.BuildModule, *dist.ModuleInfo, error) {
 	pullPolicy := opts.PullPolicy
 	publish := opts.Publish
 	registry := opts.Registry
@@ -871,13 +881,17 @@ func (c *Client) fetchBuildpack(ctx context.Context, bp string, relativeBaseDir
 		if err != nil {
 			return nil, nil, errors.Wrapf(err, "getting OS from %s", style.Symbol(builderImage.Name()))
 		}
-		mainBP, depBPs, err := c.buildpackDownloader.Download(ctx, bp, buildpack.DownloadOptions{
+		downloadOptions := buildpack.DownloadOptions{
 			RegistryName:    registry,
 			ImageOS:         imageOS,
 			RelativeBaseDir: relativeBaseDir,
 			Daemon:          !publish,
 			PullPolicy:      pullPolicy,
-		})
+		}
+		if kind == buildpack.KindExtension {
+			downloadOptions.ModuleKind = kind
+		}
+		mainBP, depBPs, err := c.buildpackDownloader.Download(ctx, bp, downloadOptions)
 		if err != nil {
 			return nil, nil, errors.Wrap(err, "downloading buildpack")
 		}
@@ -939,7 +953,34 @@ func prependBuildpackToOrder(order dist.Order, bpInfo dist.ModuleInfo) (newOrder
 	return newOrder
 }
 
-func (c *Client) createEphemeralBuilder(rawBuilderImage imgutil.Image, env map[string]string, order dist.Order, buildpacks []buildpack.BuildModule) (*builder.Builder, error) {
+func (c *Client) processExtensions(ctx context.Context, builderImage imgutil.Image, builderExs []dist.ModuleInfo, builderOrder dist.Order, stackID string, opts BuildOptions) (fetchedExs []buildpack.BuildModule, orderExtensions dist.Order, err error) {
+	relativeBaseDir := opts.RelativeBaseDir
+	declaredExs := opts.Extensions
+
+	orderExtensions = dist.Order{{Group: []dist.ModuleRef{}}}
+	for _, ex := range declaredExs {
+		locatorType, err := buildpack.GetLocatorType(ex, relativeBaseDir, builderExs)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		switch locatorType {
+		case buildpack.RegistryLocator:
+			return nil, nil, errors.New("RegistryLocator type is not valid for extensions")
+		default:
+			newFetchedExs, moduleInfo, err := c.fetchBuildpack(ctx, ex, relativeBaseDir, builderImage, builderExs, opts, buildpack.KindExtension)
+			if err != nil {
+				return fetchedExs, orderExtensions, err
+			}
+			fetchedExs = append(fetchedExs, newFetchedExs...)
+			orderExtensions = prependBuildpackToOrder(orderExtensions, *moduleInfo)
+		}
+	}
+
+	return fetchedExs, orderExtensions, nil
+}
+
+func (c *Client) createEphemeralBuilder(rawBuilderImage imgutil.Image, env map[string]string, order dist.Order, buildpacks []buildpack.BuildModule, orderExtensions dist.Order, extensions []buildpack.BuildModule) (*builder.Builder, error) {
 	origBuilderName := rawBuilderImage.Name()
 	bldr, err := builder.New(rawBuilderImage, fmt.Sprintf("pack.local/builder/%x:latest", randString(10)))
 	if err != nil {
@@ -957,6 +998,16 @@ func (c *Client) createEphemeralBuilder(rawBuilderImage imgutil.Image, env map[s
 		bldr.SetOrder(order)
 	}
 
+	for _, ex := range extensions {
+		exInfo := ex.Descriptor().Info()
+		c.logger.Debugf("Adding extension %s version %s to builder", style.Symbol(exInfo.ID), style.Symbol(exInfo.Version))
+		bldr.AddExtension(ex)
+	}
+	if len(orderExtensions) > 0 && len(orderExtensions[0].Group) > 0 {
+		c.logger.Debug("Setting custom order")
+		bldr.SetOrderExtensions(orderExtensions)
+	}
+
 	if err := bldr.Save(c.logger, builder.CreatorMetadata{Version: c.version}); err != nil {
 		return nil, err
 	}