From eef3a4de9b80e04acdf9f3cc479a688458eb744d Mon Sep 17 00:00:00 2001
From: Tiger Kaovilai <tkaovila@redhat.com>
Date: Tue, 11 Jul 2023 17:45:39 -0400
Subject: [PATCH] Moving kopia logging to remove kopia from indirect dependency
 in velero plugins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

when running `go mod why -m github.com/kopia/kopia` in velero-plugins prior to this change you will see following

```
❯ go mod why -m github.com/kopia/kopia
github.com/konveyor/openshift-velero-plugin/velero-plugins
github.com/vmware-tanzu/velero/pkg/plugin/framework
github.com/vmware-tanzu/velero/pkg/util/logging
github.com/kopia/kopia/repo/logging
```

after
```
❯ go mod why -m github.com/kopia/kopia
(main module does not need module github.com/kopia/kopia)
```

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
---
 pkg/repository/udmrepo/kopialib/lib_repo.go                   | 2 +-
 .../udmrepo/kopialib}/logging/kopia_log.go                    | 4 ++--
 .../udmrepo/kopialib}/logging/kopia_log_test.go               | 0
 pkg/uploader/kopia/snapshot.go                                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename pkg/{util => repository/udmrepo/kopialib}/logging/kopia_log.go (100%)
 rename pkg/{util => repository/udmrepo/kopialib}/logging/kopia_log_test.go (100%)

diff --git a/pkg/repository/udmrepo/kopialib/lib_repo.go b/pkg/repository/udmrepo/kopialib/lib_repo.go
index 0246620bcc..ca44c31731 100644
--- a/pkg/repository/udmrepo/kopialib/lib_repo.go
+++ b/pkg/repository/udmrepo/kopialib/lib_repo.go
@@ -35,7 +35,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/vmware-tanzu/velero/pkg/repository/udmrepo"
-	"github.com/vmware-tanzu/velero/pkg/util/logging"
+	"github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/logging"
 )
 
 type kopiaRepoService struct {
diff --git a/pkg/util/logging/kopia_log.go b/pkg/repository/udmrepo/kopialib/logging/kopia_log.go
similarity index 100%
rename from pkg/util/logging/kopia_log.go
rename to pkg/repository/udmrepo/kopialib/logging/kopia_log.go
index d70784d237..40b3dc188d 100644
--- a/pkg/util/logging/kopia_log.go
+++ b/pkg/repository/udmrepo/kopialib/logging/kopia_log.go
@@ -1,3 +1,5 @@
+package logging
+
 /*
 Copyright the Velero contributors.
 
@@ -14,8 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package logging
-
 import (
 	"context"
 
diff --git a/pkg/util/logging/kopia_log_test.go b/pkg/repository/udmrepo/kopialib/logging/kopia_log_test.go
similarity index 100%
rename from pkg/util/logging/kopia_log_test.go
rename to pkg/repository/udmrepo/kopialib/logging/kopia_log_test.go
diff --git a/pkg/uploader/kopia/snapshot.go b/pkg/uploader/kopia/snapshot.go
index ce60aadb57..063591ebe2 100644
--- a/pkg/uploader/kopia/snapshot.go
+++ b/pkg/uploader/kopia/snapshot.go
@@ -29,8 +29,8 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/vmware-tanzu/velero/pkg/repository/udmrepo"
+	"github.com/vmware-tanzu/velero/pkg/repository/udmrepo/kopialib/logging"
 	"github.com/vmware-tanzu/velero/pkg/uploader"
-	"github.com/vmware-tanzu/velero/pkg/util/logging"
 
 	"github.com/kopia/kopia/fs"
 	"github.com/kopia/kopia/fs/localfs"