Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow packages in pack build #495

Merged
merged 6 commits into from
Feb 12, 2020
Merged

Allow packages in pack build #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55a5121
Add `GetLocatorType()` and tests
ameyer-pivotal Feb 5, 2020
62f9bb6
Remove code for '@latest' syntax
ameyer-pivotal Feb 6, 2020
c5992cd
Replace 'BuildpackMetadata' with 'BuildpackInfo'
Feb 6, 2020
9f95f66
Added package support to build
ameyer-pivotal Feb 10, 2020
2343ad4
Add acceptance test for build with package
ameyer-pivotal Feb 11, 2020
41d5889
Fix windows test failures
ameyer-pivotal Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
238 changes: 138 additions & 100 deletions acceptance/acceptance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,7 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP

it("supports building app from a zip file", func() {
appPath := filepath.Join("testdata", "mock_app.zip")
cmd := subjectPack("build", repoName, "-p", appPath)
output := h.Run(t, cmd)
output := h.Run(t, subjectPack("build", repoName, "-p", appPath))
h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))

imgId, err := imgIDForRepoName(repoName)
Expand All @@ -455,41 +454,34 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP

when("the network mode is not provided", func() {
it("reports that build and detect are online", func() {
cmd := subjectPack(
"build",
repoName,
"-p",
filepath.Join("testdata", "mock_app"),
"--buildpack",
buildpackTgz,
)
output := h.Run(t, cmd)
output := h.Run(t, subjectPack(
"build", repoName,
"-p", filepath.Join("testdata", "mock_app"),
"--buildpack", buildpackTgz,
))

h.AssertContains(t, output, "[detector] RESULT: Connected to the internet")
h.AssertContains(t, output, "[builder] RESULT: Connected to the internet")
})
})

when("the network mode is set to default", func() {
it("reports that build and detect are online", func() {
cmd := subjectPack(
"build",
repoName,
"-p",
filepath.Join("testdata", "mock_app"),
"--buildpack",
buildpackTgz,
"--network",
"default",
)
output := h.Run(t, cmd)
output := h.Run(t, subjectPack(
"build", repoName,
"-p", filepath.Join("testdata", "mock_app"),
"--buildpack", buildpackTgz,
"--network", "default",
))

h.AssertContains(t, output, "[detector] RESULT: Connected to the internet")
h.AssertContains(t, output, "[builder] RESULT: Connected to the internet")
})
})

when("the network mode is set to none", func() {
it("reports that build and detect are offline", func() {
cmd := subjectPack(
output := h.Run(t, subjectPack(
"build",
repoName,
"-p",
Expand All @@ -498,58 +490,64 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
buildpackTgz,
"--network",
"none",
)
output := h.Run(t, cmd)
))

h.AssertContains(t, output, "[detector] RESULT: Disconnected from the internet")
h.AssertContains(t, output, "[builder] RESULT: Disconnected from the internet")
})
})
})

when("--buildpack", func() {
when("the argument is a tgz or id", func() {
var notBuilderTgz string
when("the argument is an ID", func() {
it("adds the buildpacks to the builder if necessary and runs them", func() {
output := h.Run(t, subjectPack(
"build", repoName,
"-p", filepath.Join("testdata", "mock_app"),
"--buildpack", "simple/layers", // Can omit version if only one
"--buildpack", "noop.buildpack@noop.buildpack.version",
))

h.AssertContains(t, output, "Build: Simple Layers Buildpack")
h.AssertContains(t, output, "Build: NOOP Buildpack")
h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))

t.Log("app is runnable")
assertMockAppRunsWithOutput(t, repoName,
"Launch Dep Contents",
"Cached Dep Contents",
)
})
})

when("the argument is an archive", func() {
var localBuildpackTgz string

it.Before(func() {
notBuilderTgz = h.CreateTGZ(t, filepath.Join(bpDir, "not-in-builder-buildpack"), "./", 0755)
localBuildpackTgz = h.CreateTGZ(t, filepath.Join(bpDir, "not-in-builder-buildpack"), "./", 0755)
})

it.After(func() {
h.AssertNil(t, os.Remove(notBuilderTgz))
h.AssertNil(t, os.Remove(localBuildpackTgz))
})

it("adds the buildpacks to the builder if necessary and runs them", func() {
it("adds the buildpack to the builder and runs it", func() {
output := h.Run(t, subjectPack(
"build",
repoName,
"-p",
filepath.Join("testdata", "mock_app"),
"--buildpack",
notBuilderTgz,
"--buildpack",
"simple/layers@simple-layers-version",
"--buildpack",
"noop.buildpack@noop.buildpack.version",
"--buildpack",
"read/env@latest",
"--env",
"DETECT_ENV_BUILDPACK=true",
"--buildpack", localBuildpackTgz,
))
h.AssertContains(t, output, "NOOP Buildpack")
h.AssertContains(t, output, "Read Env Buildpack")
h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))

t.Log("app is runnable")
assertMockAppRunsWithOutput(t, repoName,
"Local Buildpack Dep Contents",
"Launch Dep Contents",
"Cached Dep Contents",
)
h.AssertContains(t, output, "Adding buildpack 'local/bp' version 'local-bp-version' to builder")
h.AssertContains(t, output, "Build: Local Buildpack")
h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
})
})

when("the argument is directory", func() {
it("adds the buildpacks to the builder if necessary and runs them", func() {
it("adds the buildpacks to the builder and runs it", func() {
h.SkipIf(t, runtime.GOOS == "windows", "buildpack directories not supported on windows")

output := h.Run(t, subjectPack(
Expand All @@ -560,9 +558,40 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
"--buildpack",
filepath.Join(bpDir, "not-in-builder-buildpack"),
))

h.AssertContains(t, output, "Adding buildpack 'local/bp' version 'local-bp-version' to builder")
h.AssertContains(t, output, "Build: Local Buildpack")
h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
})
})

when("the argument is a buildpackage", func() {
var packageImageName string

it.Before(func() {
packageImageName = createPackage(t,
filepath.Join(configDir, "package_for_build_cmd.toml"),
packPath,
lifecycleDescriptor,
"simple/package",
[]string{
"packaged-buildpack",
"packaged-child-buildpack",
},
)
})

it("adds the buildpacks to the builder and runs them", func() {
output := h.Run(t, subjectPack(
"build", repoName,
"-p", filepath.Join("testdata", "mock_app"),
"--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, fmt.Sprintf("Successfully built image '%s'", repoName))
t.Log("app is runnable")
assertMockAppRunsWithOutput(t, repoName, "Local Buildpack Dep Contents")
})
})

Expand All @@ -579,13 +608,11 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP

it("errors", func() {
txt, err := h.RunE(subjectPack(
"build",
repoName,
"-p",
filepath.Join("testdata", "mock_app"),
"--buildpack",
otherStackBuilderTgz,
"build", repoName,
"-p", filepath.Join("testdata", "mock_app"),
"--buildpack", otherStackBuilderTgz,
))

h.AssertNotNil(t, err)
h.AssertContains(t, txt, "other/stack/bp")
h.AssertContains(t, txt, "other-stack-version")
Expand Down Expand Up @@ -619,13 +646,11 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP

it("provides the env vars to the build and detect steps", func() {
output := h.Run(t, subjectPack(
"build",
repoName,
"-p",
filepath.Join("testdata", "mock_app"),
"--env-file",
envPath,
"build", repoName,
"-p", filepath.Join("testdata", "mock_app"),
"--env-file", envPath,
))

h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
assertMockAppRunsWithOutput(t,
repoName,
Expand All @@ -648,17 +673,13 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP

it("provides the env vars to the build and detect steps", func() {
output := h.Run(t, subjectPack(
"build",
repoName,
"-p",
filepath.Join("testdata", "mock_app"),
"--env",
"DETECT_ENV_BUILDPACK=true",
"--env",
`ENV1_CONTENTS="Env1 Layer Contents From Command Line"`,
"--env",
"ENV2_CONTENTS",
"build", repoName,
"-p", filepath.Join("testdata", "mock_app"),
"--env", "DETECT_ENV_BUILDPACK=true",
"--env", `ENV1_CONTENTS="Env1 Layer Contents From Command Line"`,
"--env", "ENV2_CONTENTS",
))

h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
assertMockAppRunsWithOutput(t, repoName, "Env2 Layer Contents From Environment", "Env1 Layer Contents From Command Line")
})
Expand All @@ -683,12 +704,9 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP

it("uses the run image as the base image", func() {
output := h.Run(t, subjectPack(
"build",
repoName,
"-p",
filepath.Join("testdata", "mock_app"),
"--run-image",
runImageName,
"build", repoName,
"-p", filepath.Join("testdata", "mock_app"),
"--run-image", runImageName,
))
h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))

Expand Down Expand Up @@ -719,12 +737,9 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP

it("fails with a message", func() {
txt, err := h.RunE(subjectPack(
"build",
repoName,
"-p",
filepath.Join("testdata", "mock_app"),
"--run-image",
runImageName,
"build", repoName,
"-p", filepath.Join("testdata", "mock_app"),
"--run-image", runImageName,
))
h.AssertNotNil(t, err)
h.AssertContains(t, txt, "run-image stack id 'other.stack.id' does not match builder stack 'pack.test.stack'")
Expand All @@ -735,10 +750,8 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S, packFixturesDir, packP
when("--publish", func() {
it("creates image on the registry", func() {
output := h.Run(t, subjectPack(
"build",
repoName,
"-p",
filepath.Join("testdata", "mock_app"),
"build", repoName,
"-p", filepath.Join("testdata", "mock_app"),
"--publish",
))
h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
Expand Down Expand Up @@ -1406,7 +1419,6 @@ func createBuilder(t *testing.T, runImageMirror, configDir, packPath, lifecycleP
"noop-buildpack-2",
"other-stack-buildpack",
"read-env-buildpack",
"simple-layers-buildpack", // from package
}

for _, v := range buildpacks {
Expand All @@ -1416,11 +1428,13 @@ func createBuilder(t *testing.T, runImageMirror, configDir, packPath, lifecycleP
}

// CREATE PACKAGE
packageImageName := createPackage(t, configDir, tmpDir, packPath)
key := taskKey("create-package", runImageMirror, configDir, packPath, lifecyclePath)
suiteManager.RegisterCleanUp("clean-"+key, func() error {
return h.DockerRmi(dockerCli, packageImageName)
})
packageImageName := createPackage(t,
filepath.Join(configDir, "package.toml"),
packPath,
lifecycleDescriptor,
"test/package",
[]string{"simple-layers-buildpack"},
)

// RENDER builder.toml
cfgData := fillTemplate(t, filepath.Join(configDir, "builder.toml"), map[string]interface{}{
Expand Down Expand Up @@ -1464,20 +1478,44 @@ func createBuilder(t *testing.T, runImageMirror, configDir, packPath, lifecycleP
return bldr
}

func createPackage(t *testing.T, configDir, tmpDir, packPath string) string {
func createPackage(t *testing.T, configPath, packPath string, lifecycleDescriptor builder.LifecycleDescriptor, repoName string, buildpacks []string) string {
t.Helper()
t.Log("creating package image...")
// COPY package.toml
h.CopyFile(t, filepath.Join(configDir, "package.toml"), filepath.Join(tmpDir, "package.toml"))

// CREATE TEMP WORKING DIR
tmpDir, err := ioutil.TempDir("", "create-test-builder")
h.AssertNil(t, err)
defer os.RemoveAll(tmpDir)

// DETERMINE TEST DATA
buildpacksDir := buildpacksDir(*lifecycleDescriptor.API.BuildpackVersion)
t.Log("using buildpacks from: ", buildpacksDir)
h.RecursiveCopy(t, buildpacksDir, tmpDir)

// ARCHIVE BUILDPACKS
for _, v := range buildpacks {
tgz := h.CreateTGZ(t, filepath.Join(buildpacksDir, v), "./", 0755)
err := os.Rename(tgz, filepath.Join(tmpDir, v+".tgz"))
h.AssertNil(t, err)
}

// COPY config to temp package.toml
h.CopyFile(t, configPath, filepath.Join(tmpDir, "package.toml"))

// NAME PACKAGE
packageImageName := registryConfig.RepoName("test/package-" + h.RandString(10))
packageImageName := registryConfig.RepoName(repoName + "-" + h.RandString(10))

// CREATE PACKAGE
cmd := exec.Command(packPath, "create-package", "--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)
suiteManager.RegisterCleanUp("clean-"+key, func() error {
return h.DockerRmi(dockerCli, packageImageName)
})
return packageImageName
}

Expand Down
3 changes: 0 additions & 3 deletions acceptance/testdata/mock_buildpacks/0.1/noop-buildpack/bin/build
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions acceptance/testdata/mock_buildpacks/0.1/noop-buildpack/buildpack.toml
View file
Open in desktop

This file was deleted.

Loading