Skip to content

Commit

Permalink
Refactor test helper for creating flatten builder
Browse files Browse the repository at this point in the history 
Signed-off-by: Domenico Luciani <[email protected]>
  • Loading branch information
Domenico Luciani committed Sep 22, 2023
1 parent 3b98352 commit 208fc87
Showing 1 changed file with 90 additions and 76 deletions.
166 changes: 90 additions & 76 deletions acceptance/acceptance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2977,121 +2977,136 @@ func createFlattenBuilder(
lifecycle config.LifecycleAsset,
pack *invoke.PackInvoker,
) (string, error) {
t.Log("creating flatten builder...")
t.Helper()

packageImageName1 := createBuildpack("simple-layers-package-image-buildpack1")
packageImageName2 := createBuildpack("simple-layers-package-image-buildpack2")
packageImageName3 := createBuildpack("simple-layers-package-image-buildpack3")
packageImageName4 := createBuildpack("simple-layers-package-image-buildpack4")
t.Log("creating flatten builder...")

tmpRootDir, err := os.MkdirTemp("", "create-test-flatten-builder")
assert.Nil(err)
tmpRootDir := createTempRootDir(assert, "create-test-flatten-builder")
defer os.RemoveAll(tmpRootDir)

layers1Dir := createTempWorkingDirectory(filepath.Join(tmpRootDir, "simple-layers-1"), assert)
layers1PackageToml := createTempPackageTomlFile(layers1Dir, assert)
fillPackageToml(layers1PackageToml, pack, "simple-layers-flatten-buildpack1.tgz")

packageBuildpack1 := buildpacks.NewPackageImage(
packageBuildpack1 := createBuildpackLayer(
t,
assert,
tmpRootDir,
pack,
packageImageName1,
layers1PackageToml.Name(),
buildpacks.WithRequiredBuildpacks(
buildpacks.BpSimpleLayersFlatten1,
),
createBuildpack("simple-layers-package-image-buildpack1"),
"simple-layers-1",
"simple-layers-flatten-buildpack1.tgz",
buildpacks.BpSimpleLayersFlatten1,
)

layers2Dir := createTempWorkingDirectory(filepath.Join(tmpRootDir, "simple-layers-2"), assert)
layers2PackageToml := createTempPackageTomlFile(layers2Dir, assert)
fillPackageToml(layers2PackageToml, pack, "simple-layers-flatten-buildpack2.tgz")

packageBuildpack2 := buildpacks.NewPackageImage(
packageBuildpack2 := createBuildpackLayer(
t,
assert,
tmpRootDir,
pack,
packageImageName2,
layers2PackageToml.Name(),
buildpacks.WithRequiredBuildpacks(
buildpacks.BpSimpleLayersFlatten2,
),
createBuildpack("simple-layers-package-image-buildpack2"),
"simple-layers-2",
"simple-layers-flatten-buildpack2.tgz",
buildpacks.BpSimpleLayersFlatten2,
)

layers3Dir := createTempWorkingDirectory(filepath.Join(tmpRootDir, "simple-layers-3"), assert)
layers3PackageToml := createTempPackageTomlFile(layers3Dir, assert)
fillPackageToml(layers3PackageToml, pack, "simple-layers-flatten-buildpack3.tgz")

packageBuildpack3 := buildpacks.NewPackageImage(
packageBuildpack3 := createBuildpackLayer(
t,
assert,
tmpRootDir,
pack,
packageImageName3,
layers3PackageToml.Name(),
buildpacks.WithRequiredBuildpacks(
buildpacks.BpSimpleLayersFlatten3,
),
createBuildpack("simple-layers-package-image-buildpack3"),
"simple-layers-3",
"simple-layers-flatten-buildpack3.tgz",
buildpacks.BpSimpleLayersFlatten3,
)

layers4Dir := createTempWorkingDirectory(filepath.Join(tmpRootDir, "simple-layers-4"), assert)
layers4PackageToml := createTempPackageTomlFile(layers4Dir, assert)
fillPackageToml(layers4PackageToml, pack, "simple-layers-flatten-buildpack4.tgz")

packageBuildpack4 := buildpacks.NewPackageImage(
packageBuildpack4 := createBuildpackLayer(
t,
assert,
tmpRootDir,
pack,
packageImageName4,
layers4PackageToml.Name(),
buildpacks.WithRequiredBuildpacks(
buildpacks.BpSimpleLayersFlatten4,
),
createBuildpack("simple-layers-package-image-buildpack4"),
"simple-layers-4",
"simple-layers-flatten-buildpack4.tgz",
buildpacks.BpSimpleLayersFlatten4,
)

buildpackManager.PrepareBuildModules(tmpRootDir, packageBuildpack1, packageBuildpack2, packageBuildpack3, packageBuildpack4)

builderConfigFileName := createFlattenBuilderToml(t, assert, lifecycle, tmpRootDir, pack)

builderName := registryConfig.RepoName("test/flatten-builder-" + h.RandString(10))
output := pack.RunSuccessfully(
"builder", "create", builderName,
"-c", builderConfigFileName,
"--no-color",
"--flatten=simple-layers-package-image-buildpack1:simple-layers-flatten-version,simple-layers-package-image-buildpack2:simple-layers-flatten-version",
)

assert.Contains(output, fmt.Sprintf("Successfully created builder image '%s'", builderName))
assert.Succeeds(h.PushImage(dockerCli, builderName, registryConfig))

return builderName, nil
}

func createFlattenBuilderToml(
t *testing.T,
assert h.AssertionManager,
lifecycle config.LifecycleAsset,
tmpRootDir string,
pack *invoke.PackInvoker,
) string {
var templateMapping = make(map[string]interface{})
// ADD lifecycle
if lifecycle.HasLocation() {
lifecycleURI := lifecycle.EscapedPath()
t.Logf("adding lifecycle path '%s' to builder config", lifecycleURI)
t.Logf("adding lifecycle path '%s' to flatten builder config", lifecycleURI)
templateMapping["lifecycle_uri"] = lifecycleURI
} else {
lifecycleVersion := lifecycle.Version()
t.Logf("adding lifecycle version '%s' to builder config", lifecycleVersion)
t.Logf("adding lifecycle version '%s' to flatten builder config", lifecycleVersion)
templateMapping["lifecycle_version"] = lifecycleVersion
}

// RENDER builder.toml
builderConfigFile, err := os.CreateTemp(tmpRootDir, "builder_flatten.toml")
if err != nil {
return "", err
}
assert.Nil(err)

pack.FixtureManager().TemplateFixtureToFile("builder_flatten.toml", builderConfigFile, templateMapping)

err = builderConfigFile.Close()
if err != nil {
return "", err
}
assert.Nil(err)

// NAME BUILDER
bldr := registryConfig.RepoName("test/flatten-builder-" + h.RandString(10))
return builderConfigFile.Name()
}

// CREATE BUILDER
output := pack.RunSuccessfully(
"builder", "create", bldr,
"-c", builderConfigFile.Name(),
"--no-color",
"--flatten=simple-layers-package-image-buildpack1:simple-layers-flatten-version,simple-layers-package-image-buildpack2:simple-layers-flatten-version",
func createBuildpackLayer(
t *testing.T,
assert h.AssertionManager,
tmpRootDirPath string,
pack *invoke.PackInvoker,
packageImageName string,
tempWorkingDir string,
packageURI string,
archiveBuildModule buildpacks.TestBuildModule,
) buildpacks.PackageImage {
layerDir := createTempWorkingDirectory(filepath.Join(tmpRootDirPath, tempWorkingDir), assert)
layerPackageToml := createTempPackageTomlFile(layerDir, assert)
fillFlattenPackageToml(layerPackageToml, pack, packageURI)

return buildpacks.NewPackageImage(
t,
pack,
packageImageName,
layerPackageToml.Name(),
buildpacks.WithRequiredBuildpacks(
archiveBuildModule,
),
)
}

assert.Contains(output, fmt.Sprintf("Successfully created builder image '%s'", bldr))
assert.Succeeds(h.PushImage(dockerCli, bldr, registryConfig))

return bldr, nil
func createTempRootDir(assert h.AssertionManager, name string) string {
tmpRootDir, err := os.MkdirTemp("", name)
assert.Nil(err)
return tmpRootDir
}

func fillPackageToml(layers1PackageToml *os.File, pack *invoke.PackInvoker, uri string) {
func fillFlattenPackageToml(layersPackageToml *os.File, pack *invoke.PackInvoker, uri string) {
pack.FixtureManager().TemplateFixtureToFile(
"package-flatten.toml",
layers1PackageToml,
layersPackageToml,
map[string]interface{}{
"OS": imageManager.HostOS(),
"URI": uri,
Expand All @@ -3106,8 +3121,7 @@ func createTempPackageTomlFile(tmpDir string, assert h.AssertionManager) *os.Fil
}

func createBuildpack(name string) string {
packageImageName1 := registryConfig.RepoName(name + "-" + h.RandString(8))
return packageImageName1
return registryConfig.RepoName(name + "-" + h.RandString(8))
}

func createTempWorkingDirectory(name string, assert h.AssertionManager) string {
Expand Down

0 comments on commit 208fc87

Please sign in to comment.