refactor:

move public build function with other public functions backfill Build test Authored-by: Dennis Leon <[email protected]>
carvel-dev · Oct 19, 2021 · 4cc0463 · 4cc0463
1 parent 5cdb4d8
commit 4cc0463
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 18 deletions.
diff --git a/pkg/imgpkg/bundle/contents.go b/pkg/imgpkg/bundle/contents.go
@@ -64,6 +64,23 @@ func (b Contents) PresentsAsBundle() (bool, error) {
 	return true, nil
 }
 
+func (b Contents) Build(ui ui.UI) (*ctlimg.FileImage, error) {
+	err := b.validate()
+	if err != nil {
+		return nil, err
+	}
+
+	labels := map[string]string{BundleConfigLabel: "true"}
+	tarImg := ctlimg.NewTarImage(b.paths, b.excludedPaths, InfoLog{ui})
+
+	img, err := tarImg.AsFileImage(labels)
+	if err != nil {
+		return nil, err
+	}
+
+	return img, err
+}
+
 func (b Contents) validate() error {
 	imgpkgDirs, err := b.findImgpkgDirs()
 	if err != nil {
@@ -146,23 +163,6 @@ func (b Contents) validateImgpkgDirs(imgpkgDirs []string) error {
 	return bundleValidationError{msg}
 }
 
-func (b Contents) Build(ui ui.UI) (*ctlimg.FileImage, error) {
-	err := b.validate()
-	if err != nil {
-		return nil, err
-	}
-
-	labels := map[string]string{BundleConfigLabel: "true"}
-	tarImg := ctlimg.NewTarImage(b.paths, b.excludedPaths, InfoLog{ui})
-
-	img, err := tarImg.AsFileImage(labels)
-	if err != nil {
-		return nil, err
-	}
-
-	return img, err
-}
-
 type bundleValidationError struct {
 	msg string
 }

diff --git a/pkg/imgpkg/bundle/contents_test.go b/pkg/imgpkg/bundle/contents_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/k14s/imgpkg/pkg/imgpkg/bundle"
 	"github.com/k14s/imgpkg/pkg/imgpkg/bundle/bundlefakes"
 	"github.com/k14s/imgpkg/test/helpers"
+	"github.com/stretchr/testify/require"
 )
 
 func TestNewContentsBundleWithBundles(t *testing.T) {
@@ -49,6 +50,16 @@ images:
 			t.Fatalf("not expecting push to fail: %s", err)
 		}
 	})
+
+	t.Run("build is successful", func(t *testing.T) {
+		subject := bundle.NewContents([]string{bundleDir}, nil)
+
+		fileImage, err := subject.Build(fakeUI)
+		require.NoError(t, err)
+		config, err := fileImage.ConfigFile()
+		require.NoError(t, err)
+		require.Contains(t, config.Config.Labels, "dev.carvel.imgpkg.bundle")
+	})
 }
 
 func TestNewContentsBundleWithImages(t *testing.T) {

diff --git a/pkg/imgpkg/cmd/build.go b/pkg/imgpkg/cmd/build.go
@@ -218,7 +218,7 @@ func (bo *BuildOptions) getDigest(imageRef string, buildImage *ctlimg.FileImage)
 		return "", err
 	}
 
-	newDigest, err := regname.NewDigest(parseReference.Context().RepositoryStr() + "@" + digest.String())
+	newDigest, err := regname.NewDigest(fmt.Sprintf("%s@%s", parseReference.Context().Name(), digest.String()))
 	if err != nil {
 		return "", err
 	}