vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moving kopia logging to remove kopia from indirect dependency in velero plugins 

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>
pull/6484/head
Tiger Kaovilai 2023-07-11 17:45:39 -04:00
parent 49e80580b7
commit 05722876b9
No known key found for this signature in database
GPG Key ID: F05DADBB55627443
5 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/6484-kaovilai Normal file
View File

@ -0,0 +1 @@
Velero Plugins no longer need kopia indirect dependency in their go.mod

4
pkg/util/logging/kopia_log.go → pkg/kopia/kopia_log.go
View File

@ -1,3 +1,5 @@
package kopia
/* /*
Copyright the Velero contributors. Copyright the Velero contributors.
@ -14,8 +16,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package logging
import ( import (
"context" "context"

2
pkg/util/logging/kopia_log_test.go → pkg/kopia/kopia_log_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package logging package kopia
import ( import (
"testing" "testing"

28
pkg/repository/udmrepo/kopialib/lib_repo.go
View File

@ -33,8 +33,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/vmware-tanzu/velero/pkg/kopia"
"github.com/vmware-tanzu/velero/pkg/repository/udmrepo" "github.com/vmware-tanzu/velero/pkg/repository/udmrepo"
"github.com/vmware-tanzu/velero/pkg/util/logging"
) )
type kopiaRepoService struct { type kopiaRepoService struct {
@ -91,7 +91,7 @@ func NewKopiaRepoService(logger logrus.FieldLogger) udmrepo.BackupRepoService {
} }
func (ks *kopiaRepoService) Init(ctx context.Context, repoOption udmrepo.RepoOptions, createNew bool) error { func (ks *kopiaRepoService) Init(ctx context.Context, repoOption udmrepo.RepoOptions, createNew bool) error {
repoCtx := logging.SetupKopiaLog(ctx, ks.logger) repoCtx := kopia.SetupKopiaLog(ctx, ks.logger)
if createNew { if createNew {
if err := CreateBackupRepo(repoCtx, repoOption); err != nil { if err := CreateBackupRepo(repoCtx, repoOption); err != nil {
@ -113,7 +113,7 @@ func (ks *kopiaRepoService) Open(ctx context.Context, repoOption udmrepo.RepoOpt
return nil, errors.Wrapf(err, "repo config %s doesn't exist", repoConfig) return nil, errors.Wrapf(err, "repo config %s doesn't exist", repoConfig)
} }
repoCtx := logging.SetupKopiaLog(ctx, ks.logger) repoCtx := kopia.SetupKopiaLog(ctx, ks.logger)
r, err := openKopiaRepo(repoCtx, repoConfig, repoOption.RepoPassword) r, err := openKopiaRepo(repoCtx, repoConfig, repoOption.RepoPassword)
if err != nil { if err != nil {
@ -156,7 +156,7 @@ func (ks *kopiaRepoService) Maintain(ctx context.Context, repoOption udmrepo.Rep
return errors.Wrapf(err, "repo config %s doesn't exist", repoConfig) return errors.Wrapf(err, "repo config %s doesn't exist", repoConfig)
} }
repoCtx := logging.SetupKopiaLog(ctx, ks.logger) repoCtx := kopia.SetupKopiaLog(ctx, ks.logger)
r, err := openKopiaRepo(repoCtx, repoConfig, repoOption.RepoPassword) r, err := openKopiaRepo(repoCtx, repoConfig, repoOption.RepoPassword)
if err != nil { if err != nil {
@ -206,7 +206,7 @@ func (ks *kopiaRepoService) DefaultMaintenanceFrequency() time.Duration {
} }
func (km *kopiaMaintenance) runMaintenance(ctx context.Context, rep repo.DirectRepositoryWriter) error { func (km *kopiaMaintenance) runMaintenance(ctx context.Context, rep repo.DirectRepositoryWriter) error {
err := snapshotmaintenance.Run(logging.SetupKopiaLog(ctx, km.logger), rep, km.mode, false, maintenance.SafetyFull) err := snapshotmaintenance.Run(kopia.SetupKopiaLog(ctx, km.logger), rep, km.mode, false, maintenance.SafetyFull)
if err != nil { if err != nil {
return errors.Wrapf(err, "error to run maintenance under mode %s", km.mode) return errors.Wrapf(err, "error to run maintenance under mode %s", km.mode)
} }
@ -238,7 +238,7 @@ func (kr *kopiaRepository) OpenObject(ctx context.Context, id udmrepo.ID) (udmre
return nil, errors.Wrapf(err, "error to parse object ID from %v", id) return nil, errors.Wrapf(err, "error to parse object ID from %v", id)
} }
reader, err := kr.rawRepo.OpenObject(logging.SetupKopiaLog(ctx, kr.logger), objID) reader, err := kr.rawRepo.OpenObject(kopia.SetupKopiaLog(ctx, kr.logger), objID)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error to open object") return nil, errors.Wrap(err, "error to open object")
} }
@ -253,7 +253,7 @@ func (kr *kopiaRepository) GetManifest(ctx context.Context, id udmrepo.ID, mani
return errors.New("repo is closed or not open") return errors.New("repo is closed or not open")
} }
metadata, err := kr.rawRepo.GetManifest(logging.SetupKopiaLog(ctx, kr.logger), manifest.ID(id), mani.Payload) metadata, err := kr.rawRepo.GetManifest(kopia.SetupKopiaLog(ctx, kr.logger), manifest.ID(id), mani.Payload)
if err != nil { if err != nil {
return errors.Wrap(err, "error to get manifest") return errors.Wrap(err, "error to get manifest")
} }
@ -268,7 +268,7 @@ func (kr *kopiaRepository) FindManifests(ctx context.Context, filter udmrepo.Man
return nil, errors.New("repo is closed or not open") return nil, errors.New("repo is closed or not open")
} }
metadata, err := kr.rawRepo.FindManifests(logging.SetupKopiaLog(ctx, kr.logger), filter.Labels) metadata, err := kr.rawRepo.FindManifests(kopia.SetupKopiaLog(ctx, kr.logger), filter.Labels)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error to find manifests") return nil, errors.Wrap(err, "error to find manifests")
} }
@ -286,7 +286,7 @@ func (kr *kopiaRepository) Time() time.Time {
func (kr *kopiaRepository) Close(ctx context.Context) error { func (kr *kopiaRepository) Close(ctx context.Context) error {
if kr.rawWriter != nil { if kr.rawWriter != nil {
err := kr.rawWriter.Close(logging.SetupKopiaLog(ctx, kr.logger)) err := kr.rawWriter.Close(kopia.SetupKopiaLog(ctx, kr.logger))
if err != nil { if err != nil {
return errors.Wrap(err, "error to close repo writer") return errors.Wrap(err, "error to close repo writer")
} }
@ -295,7 +295,7 @@ func (kr *kopiaRepository) Close(ctx context.Context) error {
} }
if kr.rawRepo != nil { if kr.rawRepo != nil {
err := kr.rawRepo.Close(logging.SetupKopiaLog(ctx, kr.logger)) err := kr.rawRepo.Close(kopia.SetupKopiaLog(ctx, kr.logger))
if err != nil { if err != nil {
return errors.Wrap(err, "error to close repo") return errors.Wrap(err, "error to close repo")
} }
@ -311,7 +311,7 @@ func (kr *kopiaRepository) NewObjectWriter(ctx context.Context, opt udmrepo.Obje
return nil return nil
} }
writer := kr.rawWriter.NewObjectWriter(logging.SetupKopiaLog(ctx, kr.logger), object.WriterOptions{ writer := kr.rawWriter.NewObjectWriter(kopia.SetupKopiaLog(ctx, kr.logger), object.WriterOptions{
Description: opt.Description, Description: opt.Description,
Prefix: index.IDPrefix(opt.Prefix), Prefix: index.IDPrefix(opt.Prefix),
AsyncWrites: opt.AsyncWrites, AsyncWrites: opt.AsyncWrites,
@ -332,7 +332,7 @@ func (kr *kopiaRepository) PutManifest(ctx context.Context, manifest udmrepo.Rep
return "", errors.New("repo writer is closed or not open") return "", errors.New("repo writer is closed or not open")
} }
id, err := kr.rawWriter.PutManifest(logging.SetupKopiaLog(ctx, kr.logger), manifest.Metadata.Labels, manifest.Payload) id, err := kr.rawWriter.PutManifest(kopia.SetupKopiaLog(ctx, kr.logger), manifest.Metadata.Labels, manifest.Payload)
if err != nil { if err != nil {
return "", errors.Wrap(err, "error to put manifest") return "", errors.Wrap(err, "error to put manifest")
} }
@ -345,7 +345,7 @@ func (kr *kopiaRepository) DeleteManifest(ctx context.Context, id udmrepo.ID) er
return errors.New("repo writer is closed or not open") return errors.New("repo writer is closed or not open")
} }
err := kr.rawWriter.DeleteManifest(logging.SetupKopiaLog(ctx, kr.logger), manifest.ID(id)) err := kr.rawWriter.DeleteManifest(kopia.SetupKopiaLog(ctx, kr.logger), manifest.ID(id))
if err != nil { if err != nil {
return errors.Wrap(err, "error to delete manifest") return errors.Wrap(err, "error to delete manifest")
} }
@ -358,7 +358,7 @@ func (kr *kopiaRepository) Flush(ctx context.Context) error {
return errors.New("repo writer is closed or not open") return errors.New("repo writer is closed or not open")
} }
err := kr.rawWriter.Flush(logging.SetupKopiaLog(ctx, kr.logger)) err := kr.rawWriter.Flush(kopia.SetupKopiaLog(ctx, kr.logger))
if err != nil { if err != nil {
return errors.Wrap(err, "error to flush repo") return errors.Wrap(err, "error to flush repo")
} }

6
pkg/uploader/kopia/snapshot.go
View File

@ -28,9 +28,9 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/vmware-tanzu/velero/pkg/kopia"
"github.com/vmware-tanzu/velero/pkg/repository/udmrepo" "github.com/vmware-tanzu/velero/pkg/repository/udmrepo"
"github.com/vmware-tanzu/velero/pkg/uploader" "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"
"github.com/kopia/kopia/fs/localfs" "github.com/kopia/kopia/fs/localfs"
@ -121,7 +121,7 @@ func Backup(ctx context.Context, fsUploader SnapshotUploader, repoWriter repo.Re
return nil, false, errors.Wrap(err, "Unable to get local filesystem entry") return nil, false, errors.Wrap(err, "Unable to get local filesystem entry")
} }
kopiaCtx := logging.SetupKopiaLog(ctx, log) kopiaCtx := kopia.SetupKopiaLog(ctx, log)
snapID, snapshotSize, err := SnapshotSource(kopiaCtx, repoWriter, fsUploader, sourceInfo, rootDir, forceFull, parentSnapshot, tags, log, "Kopia Uploader") snapID, snapshotSize, err := SnapshotSource(kopiaCtx, repoWriter, fsUploader, sourceInfo, rootDir, forceFull, parentSnapshot, tags, log, "Kopia Uploader")
if err != nil { if err != nil {
return nil, false, err return nil, false, err
@ -306,7 +306,7 @@ func findPreviousSnapshotManifest(ctx context.Context, rep repo.Repository, sour
func Restore(ctx context.Context, rep repo.RepositoryWriter, progress *Progress, snapshotID, dest string, log logrus.FieldLogger, cancleCh chan struct{}) (int64, int32, error) { func Restore(ctx context.Context, rep repo.RepositoryWriter, progress *Progress, snapshotID, dest string, log logrus.FieldLogger, cancleCh chan struct{}) (int64, int32, error) {
log.Info("Start to restore...") log.Info("Start to restore...")
kopiaCtx := logging.SetupKopiaLog(ctx, log) kopiaCtx := kopia.SetupKopiaLog(ctx, log)
snapshot, err := snapshot.LoadSnapshot(kopiaCtx, rep, manifest.ID(snapshotID)) snapshot, err := snapshot.LoadSnapshot(kopiaCtx, rep, manifest.ID(snapshotID))
if err != nil { if err != nil {