Skip to content

Commit a530174

Browse files
kaovilaikaovilai
authored
Merge pull request vmware-tanzu#279 from kaovilai/unkopia-openshift-for-plugins
oadp-1.2: Moving kopia logging to remove kopia from indirect dependency in vele…
2 parents cfd301e + d70733f commit a530174

File tree

5 files changed

+26
-20
lines changed

5 files changed

+26
-20
lines changed

‎changelogs/unreleased/6484-kaovilai

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Velero Plugins no longer need kopia indirect dependency in their go.mod

‎pkg/util/logging/kopia_log.go ‎pkg/kopia/kopia_log.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package kopia
2+
13
/*
24
Copyright the Velero contributors.
35
@@ -14,8 +16,6 @@ See the License for the specific language governing permissions and
1416
limitations under the License.
1517
*/
1618

17-
package logging
18-
1919
import (
2020
"context"
2121

‎pkg/util/logging/kopia_log_test.go ‎pkg/kopia/kopia_log_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package logging
17+
package kopia
1818

1919
import (
2020
"testing"

‎pkg/repository/udmrepo/kopialib/lib_repo.go

+19-14
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434
"github.com/pkg/errors"
3535
"github.com/sirupsen/logrus"
3636

37+
"github.com/vmware-tanzu/velero/pkg/kopia"
3738
"github.com/vmware-tanzu/velero/pkg/repository/udmrepo"
38-
"github.com/vmware-tanzu/velero/pkg/util/logging"
3939
)
4040

4141
type kopiaRepoService struct {
@@ -92,7 +92,7 @@ func NewKopiaRepoService(logger logrus.FieldLogger) udmrepo.BackupRepoService {
9292
}
9393

9494
func (ks *kopiaRepoService) Init(ctx context.Context, repoOption udmrepo.RepoOptions, createNew bool) error {
95-
repoCtx := logging.SetupKopiaLog(ctx, ks.logger)
95+
repoCtx := kopia.SetupKopiaLog(ctx, ks.logger)
9696

9797
if createNew {
9898
if err := CreateBackupRepo(repoCtx, repoOption); err != nil {
@@ -115,7 +115,7 @@ func (ks *kopiaRepoService) Open(ctx context.Context, repoOption udmrepo.RepoOpt
115115
return nil, errors.Wrapf(err, "repo config %s doesn't exist", repoConfig)
116116
}
117117

118-
repoCtx := logging.SetupKopiaLog(ctx, ks.logger)
118+
repoCtx := kopia.SetupKopiaLog(ctx, ks.logger)
119119

120120
r, err := openKopiaRepo(repoCtx, repoConfig, repoOption.RepoPassword)
121121
if err != nil {
@@ -158,7 +158,7 @@ func (ks *kopiaRepoService) Maintain(ctx context.Context, repoOption udmrepo.Rep
158158
return errors.Wrapf(err, "repo config %s doesn't exist", repoConfig)
159159
}
160160

161-
repoCtx := logging.SetupKopiaLog(ctx, ks.logger)
161+
repoCtx := kopia.SetupKopiaLog(ctx, ks.logger)
162162

163163
r, err := openKopiaRepo(repoCtx, repoConfig, repoOption.RepoPassword)
164164
if err != nil {
@@ -208,7 +208,7 @@ func (ks *kopiaRepoService) DefaultMaintenanceFrequency() time.Duration {
208208
}
209209

210210
func (km *kopiaMaintenance) runMaintenance(ctx context.Context, rep repo.DirectRepositoryWriter) error {
211-
err := snapshotmaintenance.Run(logging.SetupKopiaLog(ctx, km.logger), rep, km.mode, false, maintenance.SafetyFull)
211+
err := snapshotmaintenance.Run(kopia.SetupKopiaLog(ctx, km.logger), rep, km.mode, false, maintenance.SafetyFull)
212212
if err != nil {
213213
return errors.Wrapf(err, "error to run maintenance under mode %s", km.mode)
214214
}
@@ -235,7 +235,12 @@ func (kr *kopiaRepository) OpenObject(ctx context.Context, id udmrepo.ID) (udmre
235235
return nil, errors.New("repo is closed or not open")
236236
}
237237

238-
reader, err := kr.rawRepo.OpenObject(logging.SetupKopiaLog(ctx, kr.logger), object.ID(id))
238+
objID, err := object.ParseID(string(id))
239+
if err != nil {
240+
return nil, errors.Wrapf(err, "error to parse object ID from %v", id)
241+
}
242+
243+
reader, err := kr.rawRepo.OpenObject(kopia.SetupKopiaLog(ctx, kr.logger), objID)
239244
if err != nil {
240245
return nil, errors.Wrap(err, "error to open object")
241246
}
@@ -250,7 +255,7 @@ func (kr *kopiaRepository) GetManifest(ctx context.Context, id udmrepo.ID, mani
250255
return errors.New("repo is closed or not open")
251256
}
252257

253-
metadata, err := kr.rawRepo.GetManifest(logging.SetupKopiaLog(ctx, kr.logger), manifest.ID(id), mani.Payload)
258+
metadata, err := kr.rawRepo.GetManifest(kopia.SetupKopiaLog(ctx, kr.logger), manifest.ID(id), mani.Payload)
254259
if err != nil {
255260
return errors.Wrap(err, "error to get manifest")
256261
}
@@ -265,7 +270,7 @@ func (kr *kopiaRepository) FindManifests(ctx context.Context, filter udmrepo.Man
265270
return nil, errors.New("repo is closed or not open")
266271
}
267272

268-
metadata, err := kr.rawRepo.FindManifests(logging.SetupKopiaLog(ctx, kr.logger), filter.Labels)
273+
metadata, err := kr.rawRepo.FindManifests(kopia.SetupKopiaLog(ctx, kr.logger), filter.Labels)
269274
if err != nil {
270275
return nil, errors.Wrap(err, "error to find manifests")
271276
}
@@ -283,7 +288,7 @@ func (kr *kopiaRepository) Time() time.Time {
283288

284289
func (kr *kopiaRepository) Close(ctx context.Context) error {
285290
if kr.rawWriter != nil {
286-
err := kr.rawWriter.Close(logging.SetupKopiaLog(ctx, kr.logger))
291+
err := kr.rawWriter.Close(kopia.SetupKopiaLog(ctx, kr.logger))
287292
if err != nil {
288293
return errors.Wrap(err, "error to close repo writer")
289294
}
@@ -292,7 +297,7 @@ func (kr *kopiaRepository) Close(ctx context.Context) error {
292297
}
293298

294299
if kr.rawRepo != nil {
295-
err := kr.rawRepo.Close(logging.SetupKopiaLog(ctx, kr.logger))
300+
err := kr.rawRepo.Close(kopia.SetupKopiaLog(ctx, kr.logger))
296301
if err != nil {
297302
return errors.Wrap(err, "error to close repo")
298303
}
@@ -308,7 +313,7 @@ func (kr *kopiaRepository) NewObjectWriter(ctx context.Context, opt udmrepo.Obje
308313
return nil
309314
}
310315

311-
writer := kr.rawWriter.NewObjectWriter(logging.SetupKopiaLog(ctx, kr.logger), object.WriterOptions{
316+
writer := kr.rawWriter.NewObjectWriter(kopia.SetupKopiaLog(ctx, kr.logger), object.WriterOptions{
312317
Description: opt.Description,
313318
Prefix: index.ID(opt.Prefix),
314319
AsyncWrites: getAsyncWrites(),
@@ -329,7 +334,7 @@ func (kr *kopiaRepository) PutManifest(ctx context.Context, manifest udmrepo.Rep
329334
return "", errors.New("repo writer is closed or not open")
330335
}
331336

332-
id, err := kr.rawWriter.PutManifest(logging.SetupKopiaLog(ctx, kr.logger), manifest.Metadata.Labels, manifest.Payload)
337+
id, err := kr.rawWriter.PutManifest(kopia.SetupKopiaLog(ctx, kr.logger), manifest.Metadata.Labels, manifest.Payload)
333338
if err != nil {
334339
return "", errors.Wrap(err, "error to put manifest")
335340
}
@@ -342,7 +347,7 @@ func (kr *kopiaRepository) DeleteManifest(ctx context.Context, id udmrepo.ID) er
342347
return errors.New("repo writer is closed or not open")
343348
}
344349

345-
err := kr.rawWriter.DeleteManifest(logging.SetupKopiaLog(ctx, kr.logger), manifest.ID(id))
350+
err := kr.rawWriter.DeleteManifest(kopia.SetupKopiaLog(ctx, kr.logger), manifest.ID(id))
346351
if err != nil {
347352
return errors.Wrap(err, "error to delete manifest")
348353
}
@@ -355,7 +360,7 @@ func (kr *kopiaRepository) Flush(ctx context.Context) error {
355360
return errors.New("repo writer is closed or not open")
356361
}
357362

358-
err := kr.rawWriter.Flush(logging.SetupKopiaLog(ctx, kr.logger))
363+
err := kr.rawWriter.Flush(kopia.SetupKopiaLog(ctx, kr.logger))
359364
if err != nil {
360365
return errors.Wrap(err, "error to flush repo")
361366
}

‎pkg/uploader/kopia/snapshot.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import (
2828

2929
"github.com/sirupsen/logrus"
3030

31+
"github.com/vmware-tanzu/velero/pkg/kopia"
3132
"github.com/vmware-tanzu/velero/pkg/repository/udmrepo"
3233
"github.com/vmware-tanzu/velero/pkg/uploader"
33-
"github.com/vmware-tanzu/velero/pkg/util/logging"
3434

3535
"github.com/kopia/kopia/fs"
3636
"github.com/kopia/kopia/fs/localfs"
@@ -121,7 +121,7 @@ func Backup(ctx context.Context, fsUploader *snapshotfs.Uploader, repoWriter rep
121121
return nil, false, errors.Wrap(err, "Unable to get local filesystem entry")
122122
}
123123

124-
kopiaCtx := logging.SetupKopiaLog(ctx, log)
124+
kopiaCtx := kopia.SetupKopiaLog(ctx, log)
125125
snapID, snapshotSize, err := SnapshotSource(kopiaCtx, repoWriter, fsUploader, sourceInfo, rootDir, parentSnapshot, log, "Kopia Uploader")
126126
if err != nil {
127127
return nil, false, err
@@ -277,7 +277,7 @@ func findPreviousSnapshotManifest(ctx context.Context, rep repo.Repository, sour
277277
func Restore(ctx context.Context, rep repo.RepositoryWriter, progress *KopiaProgress, snapshotID, dest string, log logrus.FieldLogger, cancleCh chan struct{}) (int64, int32, error) {
278278
log.Info("Start to restore...")
279279

280-
kopiaCtx := logging.SetupKopiaLog(ctx, log)
280+
kopiaCtx := kopia.SetupKopiaLog(ctx, log)
281281

282282
rootEntry, err := snapshotfs.FilesystemEntryFromIDWithPath(kopiaCtx, rep, snapshotID, false)
283283
if err != nil {

0 commit comments

Comments
 (0)