Merge pull request buildpacks#498 from buildpacks/feature/453-expose-…

…create-package Expose `create-package`, rename to `package-buildpack`
mdelillo · Feb 18, 2020 · 0dc9571 · 0dc9571
2 parents a279bd1 + ba44a0a
commit 0dc9571
Show file tree

Hide file tree

Showing 20 changed files with 78 additions and 236 deletions.
diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
@@ -575,8 +575,8 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
 									lifecycleDescriptor,
 									"simple/package",
 									[]string{
-										"packaged-buildpack",
-										"packaged-child-buildpack",
+										"simple-layers-parent-buildpack",
+										"simple-layers-buildpack",
 									},
 								)
 							})
@@ -588,9 +588,9 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
 									"--buildpack", packageImageName,
 								))
 
-								h.AssertContains(t, output, "Adding buildpack 'packaged.buildpack.id' version 'packaged.buildpack.version' to builder")
-								h.AssertContains(t, output, "Adding buildpack 'packaged-child.buildpack.id' version 'packaged-child.buildpack.version' to builder")
-								h.AssertContains(t, output, "Build: Packaged Child Buildpack")
+								h.AssertContains(t, output, "Adding buildpack 'simple/layers/parent' version 'simple-layers-parent-version' to builder")
+								h.AssertContains(t, output, "Adding buildpack 'simple/layers' version 'simple-layers-version' to builder")
+								h.AssertContains(t, output, "Build: Simple Layers Buildpack")
 								h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
 							})
 						})
@@ -1033,21 +1033,21 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
 		})
 	})
 
-	when("create-package", func() {
+	when("package-buildpack", func() {
 		var tmpDir string
 
 		it.Before(func() {
-			h.SkipIf(t, !packSupports(packPath, "create-package"), "pack does not support 'create-package'")
+			h.SkipIf(t, !packSupports(packPath, "package-buildpack"), "pack does not support 'package-buildpack'")
 
 			var err error
-			tmpDir, err = ioutil.TempDir("", "create-package-tests")
+			tmpDir, err = ioutil.TempDir("", "package-buildpack-tests")
 			h.AssertNil(t, err)
 
 			h.CopyFile(t, filepath.Join(packFixturesDir, "package.toml"), filepath.Join(tmpDir, "package.toml"))
 
 			err = os.Rename(
-				h.CreateTGZ(t, filepath.Join(bpDir, "noop-buildpack"), "./", 0755),
-				filepath.Join(tmpDir, "noop-buildpack.tgz"),
+				h.CreateTGZ(t, filepath.Join(bpDir, "simple-layers-parent-buildpack"), "./", 0755),
+				filepath.Join(tmpDir, "simple-layers-parent-buildpack.tgz"),
 			)
 			h.AssertNil(t, err)
 
@@ -1066,7 +1066,7 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
 		createPackageLocally := func(absConfigPath string) string {
 			t.Helper()
 			packageName := "test/package-" + h.RandString(10)
-			output, err := h.RunE(subjectPack("create-package", packageName, "-p", absConfigPath))
+			output, err := h.RunE(subjectPack("package-buildpack", packageName, "-p", absConfigPath))
 			h.AssertNil(t, err)
 			h.AssertContains(t, output, fmt.Sprintf("Successfully created package '%s'", packageName))
 			return packageName
@@ -1075,7 +1075,7 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
 		createPackageRemotely := func(absConfigPath string) string {
 			t.Helper()
 			packageName := registryConfig.RepoName("test/package-" + h.RandString(10))
-			output, err := h.RunE(subjectPack("create-package", packageName, "-p", absConfigPath, "--publish"))
+			output, err := h.RunE(subjectPack("package-buildpack", packageName, "-p", absConfigPath, "--publish"))
 			h.AssertNil(t, err)
 			h.AssertContains(t, output, fmt.Sprintf("Successfully published package '%s'", packageName))
 			return packageName
@@ -1088,11 +1088,14 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
 
 		}
 
-		generateAggregatePackageToml := func(nestedPackageName string) string {
+		generateAggregatePackageToml := func(buildpackURI, nestedPackageName string) string {
 			t.Helper()
 			packageTomlData := fillTemplate(t,
 				filepath.Join(packFixturesDir, "package_aggregate.toml"),
-				map[string]interface{}{"PackageName": nestedPackageName},
+				map[string]interface{}{
+					"BuildpackURI": buildpackURI,
+					"PackageName":  nestedPackageName,
+				},
 			)
 			packageTomlFile, err := ioutil.TempFile(tmpDir, "package_aggregate-*.toml")
 			h.AssertNil(t, err)
@@ -1107,10 +1110,10 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
 			t.Log("package w/ only buildpacks")
 			nestedPackageName := createPackageLocally(filepath.Join(tmpDir, "package.toml"))
 			defer h.DockerRmi(dockerCli, nestedPackageName)
-			t.Log("package w/ buildpacks and packages")
 			assertImageExistsLocally(nestedPackageName)
 
-			aggregatePackageToml := generateAggregatePackageToml(nestedPackageName)
+			t.Log("package w/ buildpacks and packages")
+			aggregatePackageToml := generateAggregatePackageToml("simple-layers-parent-buildpack.tgz", nestedPackageName)
 			packageName := createPackageLocally(aggregatePackageToml)
 			defer h.DockerRmi(dockerCli, packageName)
 			assertImageExistsLocally(packageName)
@@ -1120,11 +1123,11 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
 			it("publishes image to registry", func() {
 				nestedPackageName := createPackageRemotely(filepath.Join(tmpDir, "package.toml"))
 				defer h.DockerRmi(dockerCli, nestedPackageName)
-				aggregatePackageToml := generateAggregatePackageToml(nestedPackageName)
+				aggregatePackageToml := generateAggregatePackageToml("simple-layers-parent-buildpack.tgz", nestedPackageName)
 
 				packageName := registryConfig.RepoName("test/package-" + h.RandString(10))
 				defer h.DockerRmi(dockerCli, packageName)
-				output := h.Run(t, subjectPack("create-package", packageName, "-p", aggregatePackageToml, "--publish"))
+				output := h.Run(t, subjectPack("package-buildpack", packageName, "-p", aggregatePackageToml, "--publish"))
 				h.AssertContains(t, output, fmt.Sprintf("Successfully published package '%s'", packageName))
 
 				_, _, err := dockerCli.ImageInspectWithRaw(context.Background(), packageName)
@@ -1141,11 +1144,11 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
 			it("should use local image", func() {
 				nestedPackage := createPackageLocally(filepath.Join(tmpDir, "package.toml"))
 				defer h.DockerRmi(dockerCli, nestedPackage)
-				aggregatePackageToml := generateAggregatePackageToml(nestedPackage)
+				aggregatePackageToml := generateAggregatePackageToml("simple-layers-parent-buildpack.tgz", nestedPackage)
 
 				packageName := registryConfig.RepoName("test/package-" + h.RandString(10))
 				defer h.DockerRmi(dockerCli, packageName)
-				h.Run(t, subjectPack("create-package", packageName, "-p", aggregatePackageToml, "--no-pull"))
+				h.Run(t, subjectPack("package-buildpack", packageName, "-p", aggregatePackageToml, "--no-pull"))
 
 				_, _, err := dockerCli.ImageInspectWithRaw(context.Background(), packageName)
 				h.AssertNil(t, err)
@@ -1155,11 +1158,11 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
 			it("should not pull image from registry", func() {
 				nestedPackage := createPackageRemotely(filepath.Join(tmpDir, "package.toml"))
 				defer h.DockerRmi(dockerCli, nestedPackage)
-				aggregatePackageToml := generateAggregatePackageToml(nestedPackage)
+				aggregatePackageToml := generateAggregatePackageToml("simple-layers-parent-buildpack.tgz", nestedPackage)
 
 				packageName := registryConfig.RepoName("test/package-" + h.RandString(10))
 				defer h.DockerRmi(dockerCli, packageName)
-				_, err := h.RunE(subjectPack("create-package", packageName, "-p", aggregatePackageToml, "--no-pull"))
+				_, err := h.RunE(subjectPack("package-buildpack", packageName, "-p", aggregatePackageToml, "--no-pull"))
 				h.AssertError(t, err, fmt.Sprintf("image '%s' does not exist on the daemon", nestedPackage))
 			})
 		})
@@ -1506,13 +1509,13 @@ func createPackage(t *testing.T, configPath, packPath string, lifecycleDescripto
 	packageImageName := registryConfig.RepoName(repoName + "-" + h.RandString(10))
 
 	// CREATE PACKAGE
-	cmd := exec.Command(packPath, "create-package", "--no-color", packageImageName, "-p", filepath.Join(tmpDir, "package.toml"))
+	cmd := exec.Command(packPath, "package-buildpack", "--no-color", packageImageName, "-p", filepath.Join(tmpDir, "package.toml"))
 	output := h.Run(t, cmd)
 	h.AssertContains(t, output, fmt.Sprintf("Successfully created package '%s'", packageImageName))
 	h.AssertNil(t, h.PushImage(dockerCli, packageImageName, registryConfig))
 
 	// REGISTER CLEANUP
-	key := taskKey("create-package", packageImageName)
+	key := taskKey("package-buildpack", packageImageName)
 	suiteManager.RegisterCleanUp("clean-"+key, func() error {
 		return h.DockerRmi(dockerCli, packageImageName)
 	})

diff --git a/acceptance/testdata/mock_buildpacks/0.2/packaged-buildpack/buildpack.toml b/acceptance/testdata/mock_buildpacks/0.2/packaged-buildpack/buildpack.toml
diff --git a/acceptance/testdata/mock_buildpacks/0.2/packaged-child-buildpack/bin/build b/acceptance/testdata/mock_buildpacks/0.2/packaged-child-buildpack/bin/build
diff --git a/acceptance/testdata/mock_buildpacks/0.2/packaged-child-buildpack/bin/detect b/acceptance/testdata/mock_buildpacks/0.2/packaged-child-buildpack/bin/detect
diff --git a/acceptance/testdata/mock_buildpacks/0.2/packaged-child-buildpack/buildpack.toml b/acceptance/testdata/mock_buildpacks/0.2/packaged-child-buildpack/buildpack.toml
diff --git a/acceptance/testdata/mock_buildpacks/0.2/simple-layers-parent-buildpack/buildpack.toml b/acceptance/testdata/mock_buildpacks/0.2/simple-layers-parent-buildpack/buildpack.toml
@@ -0,0 +1,11 @@
+api = "0.2"
+
+[buildpack]
+  id = "simple/layers/parent"
+  version = "simple-layers-parent-version"
+  name = "Simple Layers Parent Buildpack"
+
+[[order]]
+[[order.group]]
+  id = "simple/layers"
+  version = "simple-layers-version"
diff --git a/acceptance/testdata/pack_fixtures/inspect_0.6.0_builder_output.txt b/acceptance/testdata/pack_fixtures/inspect_0.6.0_builder_output.txt
diff --git a/acceptance/testdata/pack_fixtures/package_aggregate.toml b/acceptance/testdata/pack_fixtures/package_aggregate.toml
@@ -1,5 +1,5 @@
 [buildpack]
-uri = "noop-buildpack.tgz"
+uri = "{{ .BuildpackURI }}"
 
 [[dependencies]]
 image = "{{ .PackageName }}"
diff --git a/acceptance/testdata/pack_fixtures/package_for_build_cmd.toml b/acceptance/testdata/pack_fixtures/package_for_build_cmd.toml
@@ -1,5 +1,5 @@
 [buildpack]
-uri = "packaged-buildpack"
+uri = "simple-layers-parent-buildpack"
 
 [[dependencies]]
-uri = "packaged-child-buildpack"
+uri = "simple-layers-buildpack"
diff --git a/acceptance/testdata/pack_previous_fixtures_overrides/.gitkeep b/acceptance/testdata/pack_previous_fixtures_overrides/.gitkeep
diff --git a/acceptance/testdata/pack_previous_fixtures_overrides/inspect_0.7.0_builder_output.txt b/acceptance/testdata/pack_previous_fixtures_overrides/inspect_0.7.0_builder_output.txt
diff --git a/cmd/pack/main.go b/cmd/pack/main.go
@@ -63,7 +63,7 @@ func main() {
 	rootCmd.AddCommand(commands.InspectImage(logger, &cfg, &packClient))
 
 	rootCmd.AddCommand(commands.CreateBuilder(logger, &packClient))
-	rootCmd.AddCommand(commands.CreatePackage(logger, &packClient))
+	rootCmd.AddCommand(commands.PackageBuildpack(logger, &packClient))
 	rootCmd.AddCommand(commands.SetRunImagesMirrors(logger, cfg))
 	rootCmd.AddCommand(commands.InspectBuilder(logger, cfg, &packClient))
 	rootCmd.AddCommand(commands.SetDefaultBuilder(logger, cfg, &packClient))

diff --git a/create_builder_test.go b/create_builder_test.go
@@ -500,7 +500,7 @@ func testCreateBuilder(t *testing.T, when spec.G, it spec.S) {
 						Stacks: []dist.Stack{{ID: "some.stack.id"}},
 					}
 
-					h.AssertNil(t, subject.CreatePackage(context.TODO(), pack.CreatePackageOptions{
+					h.AssertNil(t, subject.PackageBuildpack(context.TODO(), pack.PackageBuildpackOptions{
 						Name: packageImage.Name(),
 						Config: buildpackage.Config{
 							Buildpack: dist.BuildpackURI{URI: createBuildpack(bpd)},

diff --git a/internal/buildpackage/builder.go b/internal/buildpackage/builder.go
@@ -72,7 +72,7 @@ func (p *PackageBuilder) Save(repoName string, publish bool) (imgutil.Image, err
 		return nil, err
 	}
 
-	tmpDir, err := ioutil.TempDir("", "create-package")
+	tmpDir, err := ioutil.TempDir("", "package-buildpack")
 	if err != nil {
 		return nil, err
 	}