From 04dc8e943424fa741b4ff8866a4556d5fb500c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <joao.pereira@broadcom.com>
Date: Wed, 18 Sep 2024 16:05:30 -0500
Subject: [PATCH] Move interface of TagGenerator near to consumer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: João Pereira <joao.pereira@broadcom.com>
---
 pkg/imgpkg/cmd/copy.go           |  2 +-
 pkg/imgpkg/image/tag.go          |  5 -----
 pkg/imgpkg/imageset/image_set.go | 10 +++++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

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}
 }