Adjust acceptance tests to new package restructure

Signed-off-by: Javier Romero <[email protected]>
buildpacks · Nov 1, 2021 · 533c4e1 · 533c4e1
1 parent bec10bb
commit 533c4e1
Show file tree

Hide file tree

Showing 23 changed files with 85 additions and 71 deletions.
diff --git a/acceptance/config/github_asset_fetcher.go b/acceptance/config/github_asset_fetcher.go
@@ -26,8 +26,8 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 
-	"github.com/buildpacks/pack/logging"
 	"github.com/buildpacks/pack/pkg/blob"
+	"github.com/buildpacks/pack/pkg/logging"
 )
 
 const (
@@ -376,7 +376,7 @@ func (f *GithubAssetFetcher) writeCacheManifest(owner, repo string, op func(cach
 func (f *GithubAssetFetcher) downloadAndSave(assetURI, destPath string) error {
 	f.testObject.Helper()
 
-	downloader := blob.NewDownloader(logging.New(&testWriter{t: f.testObject}), f.cacheDir)
+	downloader := blob.NewDownloader(logging.NewSimpleLogger(&testWriter{t: f.testObject}), f.cacheDir)
 
 	assetBlob, err := downloader.Download(f.ctx, assetURI)
 	if err != nil {
@@ -405,7 +405,7 @@ func (f *GithubAssetFetcher) downloadAndSave(assetURI, destPath string) error {
 func (f *GithubAssetFetcher) downloadAndExtractTgz(assetURI, destDir string) error {
 	f.testObject.Helper()
 
-	downloader := blob.NewDownloader(logging.New(&testWriter{t: f.testObject}), f.cacheDir)
+	downloader := blob.NewDownloader(logging.NewSimpleLogger(&testWriter{t: f.testObject}), f.cacheDir)
 
 	assetBlob, err := downloader.Download(f.ctx, assetURI)
 	if err != nil {

diff --git a/internal/builder/builder.go b/internal/builder/builder.go
@@ -392,7 +392,7 @@ func addBuildpacks(logger logging.Logger, tmpDir string, image imgutil.Image, ad
 		}
 
 		// create tar file
-		bpLayerTar, err := buildpack.BuildpackToLayerTar(bpTmpDir, bp)
+		bpLayerTar, err := buildpack.ToLayerTar(bpTmpDir, bp)
 		if err != nil {
 			return err
 		}

diff --git a/internal/builder/testmocks/mock_lifecycle.go b/internal/builder/testmocks/mock_lifecycle.go
diff --git a/internal/commands/testmocks/mock_inspect_image_writer_factory.go b/internal/commands/testmocks/mock_inspect_image_writer_factory.go
diff --git a/internal/commands/testmocks/mock_pack_client.go b/internal/commands/testmocks/mock_pack_client.go
diff --git a/internal/fakes/fake_package.go b/internal/fakes/fake_package.go
@@ -28,7 +28,7 @@ type fakePackage struct {
 
 func NewPackage(tmpDir string, name string, buildpacks []buildpack.Buildpack) (Package, error) {
 	processBuildpack := func(bp buildpack.Buildpack) (tarFile string, diffID string, err error) {
-		tarFile, err = buildpack.BuildpackToLayerTar(tmpDir, bp)
+		tarFile, err = buildpack.ToLayerTar(tmpDir, bp)
 		if err != nil {
 			return "", "", err
 		}

diff --git a/internal/term/term_test.go b/internal/term/term_test.go
@@ -12,16 +12,11 @@ import (
 	h "github.com/buildpacks/pack/testhelpers"
 )
 
-const (
-	testTime = "2019/05/15 01:01:01.000000"
-)
-
 func TestTerm(t *testing.T) {
 	spec.Run(t, "Term", testTerm, spec.Parallel(), spec.Report(report.Terminal{}))
 }
 
 func testTerm(t *testing.T, when spec.G, it spec.S) {
-
 	when("#IsTerminal", func() {
 		it("returns false for a pipe", func() {
 			r, _, _ := os.Pipe()

diff --git a/pkg/buildpack/builder.go b/pkg/buildpack/builder.go
@@ -92,7 +92,7 @@ func (b *PackageBuilder) finalizeImage(image WorkableImage, tmpDir string) error
 
 	bpLayers := dist.BuildpackLayers{}
 	for _, bp := range append(b.dependencies, b.buildpack) {
-		bpLayerTar, err := BuildpackToLayerTar(tmpDir, bp)
+		bpLayerTar, err := ToLayerTar(tmpDir, bp)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/buildpack/buildpack.go b/pkg/buildpack/buildpack.go
@@ -41,19 +41,19 @@ func (b *buildpack) Descriptor() dist.BuildpackDescriptor {
 	return b.descriptor
 }
 
-// BuildpackFromBlob constructs a buildpack from a blob. It is assumed that the buildpack
+// FromBlob constructs a buildpack from a blob. It is assumed that the buildpack
 // contents are structured as per the distribution spec (currently '/cnbs/buildpacks/{ID}/{version}/*').
-func BuildpackFromBlob(bpd dist.BuildpackDescriptor, blob Blob) Buildpack {
+func FromBlob(bpd dist.BuildpackDescriptor, blob Blob) Buildpack {
 	return &buildpack{
 		Blob:       blob,
 		descriptor: bpd,
 	}
 }
 
-// BuildpackFromRootBlob constructs a buildpack from a blob. It is assumed that the buildpack contents reside at the
+// FromRootBlob constructs a buildpack from a blob. It is assumed that the buildpack contents reside at the
 // root of the blob. The constructed buildpack contents will be structured as per the distribution spec (currently
 // a tar with contents under '/cnbs/buildpacks/{ID}/{version}/*').
-func BuildpackFromRootBlob(blob Blob, layerWriterFactory archive.TarWriterFactory) (Buildpack, error) {
+func FromRootBlob(blob Blob, layerWriterFactory archive.TarWriterFactory) (Buildpack, error) {
 	bpd := dist.BuildpackDescriptor{}
 	rc, err := blob.Open()
 	if err != nil {
@@ -219,7 +219,7 @@ func validateDescriptor(bpd dist.BuildpackDescriptor) error {
 	return nil
 }
 
-func BuildpackToLayerTar(dest string, bp Buildpack) (string, error) {
+func ToLayerTar(dest string, bp Buildpack) (string, error) {
 	bpd := bp.Descriptor()
 	bpReader, err := bp.Open()
 	if err != nil {

diff --git a/pkg/buildpack/buildpack_test.go b/pkg/buildpack/buildpack_test.go
@@ -50,7 +50,7 @@ func testBuildpack(t *testing.T, when spec.G, it spec.S) {
 
 	when("#BuildpackFromRootBlob", func() {
 		it("parses the descriptor file", func() {
-			bp, err := buildpack.BuildpackFromRootBlob(
+			bp, err := buildpack.FromRootBlob(
 				&readerBlob{
 					openFn: func() io.ReadCloser {
 						tarBuilder := archive.TarBuilder{}
@@ -80,7 +80,7 @@ id = "some.stack.id"
 		})
 
 		it("translates blob to distribution format", func() {
-			bp, err := buildpack.BuildpackFromRootBlob(
+			bp, err := buildpack.FromRootBlob(
 				&readerBlob{
 					openFn: func() io.ReadCloser {
 						tarBuilder := archive.TarBuilder{}
@@ -162,7 +162,7 @@ id = "some.stack.id"
 				},
 			}
 
-			bp, err := buildpack.BuildpackFromRootBlob(
+			bp, err := buildpack.FromRootBlob(
 				&errorBlob{
 					realBlob: realBlob,
 				},
@@ -191,7 +191,7 @@ id = "some.stack.id"
 
 			when("no exec bits set", func() {
 				it("sets to 0755 if directory", func() {
-					bp, err := buildpack.BuildpackFromRootBlob(
+					bp, err := buildpack.FromRootBlob(
 						&readerBlob{
 							openFn: func() io.ReadCloser {
 								tarBuilder := archive.TarBuilder{}
@@ -216,7 +216,7 @@ id = "some.stack.id"
 
 			when("no exec bits set", func() {
 				it("sets to 0755 if 'bin/detect' or 'bin/build'", func() {
-					bp, err := buildpack.BuildpackFromRootBlob(
+					bp, err := buildpack.FromRootBlob(
 						&readerBlob{
 							openFn: func() io.ReadCloser {
 								tarBuilder := archive.TarBuilder{}
@@ -247,7 +247,7 @@ id = "some.stack.id"
 
 			when("not directory, 'bin/detect', or 'bin/build'", func() {
 				it("sets to 0755 if ANY exec bit is set", func() {
-					bp, err := buildpack.BuildpackFromRootBlob(
+					bp, err := buildpack.FromRootBlob(
 						&readerBlob{
 							openFn: func() io.ReadCloser {
 								tarBuilder := archive.TarBuilder{}
@@ -272,7 +272,7 @@ id = "some.stack.id"
 
 			when("not directory, 'bin/detect', or 'bin/build'", func() {
 				it("sets to 0644 if NO exec bits set", func() {
-					bp, err := buildpack.BuildpackFromRootBlob(
+					bp, err := buildpack.FromRootBlob(
 						&readerBlob{
 							openFn: func() io.ReadCloser {
 								tarBuilder := archive.TarBuilder{}
@@ -298,7 +298,7 @@ id = "some.stack.id"
 
 		when("there is no descriptor file", func() {
 			it("returns error", func() {
-				_, err := buildpack.BuildpackFromRootBlob(
+				_, err := buildpack.FromRootBlob(
 					&readerBlob{
 						openFn: func() io.ReadCloser {
 							tarBuilder := archive.TarBuilder{}
@@ -313,7 +313,7 @@ id = "some.stack.id"
 
 		when("there is no api field", func() {
 			it("assumes an api version", func() {
-				bp, err := buildpack.BuildpackFromRootBlob(
+				bp, err := buildpack.FromRootBlob(
 					&readerBlob{
 						openFn: func() io.ReadCloser {
 							tarBuilder := archive.TarBuilder{}
@@ -336,7 +336,7 @@ id = "some.stack.id"`))
 
 		when("there is no id", func() {
 			it("returns error", func() {
-				_, err := buildpack.BuildpackFromRootBlob(
+				_, err := buildpack.FromRootBlob(
 					&readerBlob{
 						openFn: func() io.ReadCloser {
 							tarBuilder := archive.TarBuilder{}
@@ -358,7 +358,7 @@ id = "some.stack.id"`))
 
 		when("there is no version", func() {
 			it("returns error", func() {
-				_, err := buildpack.BuildpackFromRootBlob(
+				_, err := buildpack.FromRootBlob(
 					&readerBlob{
 						openFn: func() io.ReadCloser {
 							tarBuilder := archive.TarBuilder{}
@@ -380,7 +380,7 @@ id = "some.stack.id"`))
 
 		when("both stacks and order are present", func() {
 			it("returns error", func() {
-				_, err := buildpack.BuildpackFromRootBlob(
+				_, err := buildpack.FromRootBlob(
 					&readerBlob{
 						openFn: func() io.ReadCloser {
 							tarBuilder := archive.TarBuilder{}
@@ -408,7 +408,7 @@ id = "some.stack.id"
 
 		when("missing stacks and order", func() {
 			it("returns error", func() {
-				_, err := buildpack.BuildpackFromRootBlob(
+				_, err := buildpack.FromRootBlob(
 					&readerBlob{
 						openFn: func() io.ReadCloser {
 							tarBuilder := archive.TarBuilder{}

diff --git a/pkg/buildpack/downloader.go b/pkg/buildpack/downloader.go
@@ -7,6 +7,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/buildpacks/imgutil"
+
 	"github.com/buildpacks/pack/internal/layer"
 	"github.com/buildpacks/pack/internal/paths"
 	"github.com/buildpacks/pack/internal/style"
@@ -150,7 +151,7 @@ func decomposeBuildpack(blob blob.Blob, imageOS string) (mainBP Buildpack, depBP
 			return mainBP, depBPs, errors.Wrapf(err, "get tar writer factory for OS %s", style.Symbol(imageOS))
 		}
 
-		mainBP, err = BuildpackFromRootBlob(blob, layerWriterFactory)
+		mainBP, err = FromRootBlob(blob, layerWriterFactory)
 		if err != nil {
 			return mainBP, depBPs, errors.Wrap(err, "reading buildpack")
 		}

diff --git a/pkg/buildpack/package.go b/pkg/buildpack/package.go
@@ -68,9 +68,9 @@ func ExtractBuildpacks(pkg Package) (mainBP Buildpack, depBPs []Buildpack, err e
 			}
 
 			if desc.Info.Match(md.BuildpackInfo) { // This is the order buildpack of the package
-				mainBP = BuildpackFromBlob(desc, b)
+				mainBP = FromBlob(desc, b)
 			} else {
-				depBPs = append(depBPs, BuildpackFromBlob(desc, b))
+				depBPs = append(depBPs, FromBlob(desc, b))
 			}
 		}
 	}