changes for failing tests

Author: ashpect

pkg/imgpkg/cmd/copy_repo_src.go

@@ -9,6 +9,7 @@ import (
 	"os"
 
 	ctlbundle "carvel.dev/imgpkg/pkg/imgpkg/bundle"
+	"carvel.dev/imgpkg/pkg/imgpkg/image"
 	"carvel.dev/imgpkg/pkg/imgpkg/imageset"
 	ctlimgset "carvel.dev/imgpkg/pkg/imgpkg/imageset"
 	"carvel.dev/imgpkg/pkg/imgpkg/imagetar"
@@ -17,15 +18,6 @@ import (
 	"carvel.dev/imgpkg/pkg/imgpkg/plainimage"
 	"carvel.dev/imgpkg/pkg/imgpkg/registry"
 	regname "github.com/google/go-containerregistry/pkg/name"
-	ctlbundle "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle"
-	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image"
-	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset"
-	ctlimgset "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageset"
-	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagetar"
-	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util"
-	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig"
-	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/plainimage"
-	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/registry"
 )
 
 type SignatureRetriever interface {

pkg/imgpkg/imagedesc/image_intermediate.go

@@ -8,6 +8,7 @@ import (
 	"github.com/google/go-containerregistry/pkg/v1/types"
 )
 
+// intermediate struct for Image and ImageIndex to convert to imagwithref type for oci image
 type ImageIndexIntermediate struct {
 	Index regv1.ImageIndex
 	ref   string

pkg/imgpkg/imagedesc/types.go

@@ -18,6 +18,7 @@ type ImageOrIndex struct {
 
 	OrigRef string
 }
+
 type ImageWithRef interface {
 	regv1.Image
 	Ref() string

pkg/imgpkg/imagetar/tar_reader.go

@@ -14,8 +14,6 @@ import (
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/layout"
-	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imagedesc"
-	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/imageutils/verify"
 )
 
 type TarReader struct {

pkg/imgpkg/registry/registry.go

@@ -410,8 +410,6 @@ func (r *SimpleRegistry) MultiWrite(imageOrIndexesToUpload map[regname.Reference
 	if updatesCh != nil {
 		rOpts = append(rOpts, regremote.WithProgress(updatesCh))
 	}
-
-	//THIS HERE FINAL PUSHES
 	return regremote.MultiWrite(overriddenImageOrIndexesToUploadRef, rOpts...)
 }