diff --git a/pkg/imgpkg/cmd/copy.go b/pkg/imgpkg/cmd/copy.go index f144365a..5e947494 100644 --- a/pkg/imgpkg/cmd/copy.go +++ b/pkg/imgpkg/cmd/copy.go @@ -107,7 +107,7 @@ func (c *CopyOptions) Run() error { levelLogger := util.NewUILevelLogger(util.LogWarn, prefixedLogger) imagesUploaderLogger := util.NewProgressBar(levelLogger, "done uploading images", "Error uploading images") - var tagGen image.TagGenerator + var tagGen ctlimgset.TagGenerator tagGen = image.DefaultTagGenerator{} if c.UseRepoBasedTags { tagGen = image.RepoBasedTagGenerator{} diff --git a/pkg/imgpkg/image/tag.go b/pkg/imgpkg/image/tag.go index e8a05cc2..b394b94c 100644 --- a/pkg/imgpkg/image/tag.go +++ b/pkg/imgpkg/image/tag.go @@ -32,11 +32,6 @@ func (t TagGenDigest) Digest() (regv1.Hash, error) { }, nil } -// TagGenerator interface -type TagGenerator interface { - GenerateTag(item imagedigest.DigestWrap, destinationRepo regname.Repository) (regname.Tag, error) -} - // DefaultTagGenerator implements GenerateTag // and generates default tag type DefaultTagGenerator struct{} diff --git a/pkg/imgpkg/imageset/image_set.go b/pkg/imgpkg/imageset/image_set.go index cb7d76ce..07da7f19 100644 --- a/pkg/imgpkg/imageset/image_set.go +++ b/pkg/imgpkg/imageset/image_set.go @@ -7,7 +7,6 @@ import ( "fmt" "sync" - "carvel.dev/imgpkg/pkg/imgpkg/image" "carvel.dev/imgpkg/pkg/imgpkg/imagedesc" "carvel.dev/imgpkg/pkg/imgpkg/imagedigest" "carvel.dev/imgpkg/pkg/imgpkg/internal/util" @@ -21,14 +20,19 @@ type Logger interface { Logf(str string, args ...interface{}) } +// TagGenerator interface +type TagGenerator interface { + GenerateTag(item imagedigest.DigestWrap, destinationRepo regname.Repository) (regname.Tag, error) +} + type ImageSet struct { concurrency int logger Logger - tagGen image.TagGenerator + tagGen TagGenerator } // NewImageSet constructor for creating an ImageSet -func NewImageSet(concurrency int, logger Logger, tagGen image.TagGenerator) ImageSet { +func NewImageSet(concurrency int, logger Logger, tagGen TagGenerator) ImageSet { return ImageSet{concurrency, logger, tagGen} }