Merge branch 'main' into dependabot/go_modules/github.com/moby/spdystream-0.5.1

Author: reasonerjt

changelogs/unreleased/9724-Lyndon-Li

@@ -0,0 +1 @@
+Fix issue #9723, extend Unified Repo Interface to support block uploader

pkg/repository/udmrepo/kopialib/lib_repo.go

@@ -388,9 +388,9 @@ func (kr *kopiaRepository) Close(ctx context.Context) error {
 	return nil
 }
 
-func (kr *kopiaRepository) NewObjectWriter(ctx context.Context, opt udmrepo.ObjectWriteOptions) udmrepo.ObjectWriter {
+func (kr *kopiaRepository) NewObjectWriter(ctx context.Context, opt udmrepo.ObjectWriteOptions) (udmrepo.ObjectWriter, error) {
 	if kr.rawWriter == nil {
-		return nil
+		return nil, errors.New("repo writer is closed or not open")
 	}
 
 	writer := kr.rawWriter.NewObjectWriter(kopia.SetupKopiaLog(ctx, kr.logger), object.WriterOptions{
@@ -402,12 +402,22 @@ func (kr *kopiaRepository) NewObjectWriter(ctx context.Context, opt udmrepo.Obje
 	})
 
 	if writer == nil {
-		return nil
+		return nil, errors.Errorf("error creating writer for object %s", opt.Description)
 	}
 
 	return &kopiaObjectWriter{
 		rawWriter: writer,
-	}
+	}, nil
+}
+
+// TODO add implementation in following PRs
+func (kr *kopiaRepository) WriteMetadata(ctx context.Context, meta *udmrepo.Metadata, opt udmrepo.ObjectWriteOptions) (udmrepo.ID, error) {
+	return "", errors.New("not supported")
+}
+
+// TODO add implementation in following PRs
+func (kr *kopiaRepository) ReadMetadata(ctx context.Context, id udmrepo.ID) (*udmrepo.Metadata, error) {
+	return nil, errors.New("not supported")
 }
 
 func (kr *kopiaRepository) PutManifest(ctx context.Context, manifest udmrepo.RepoManifest) (udmrepo.ID, error) {
@@ -436,6 +446,21 @@ func (kr *kopiaRepository) DeleteManifest(ctx context.Context, id udmrepo.ID) er
 	return nil
 }
 
+// TODO add implementation in following PRs
+func (kr *kopiaRepository) SaveSnapshot(ctx context.Context, snap udmrepo.Snapshot) (udmrepo.ID, error) {
+	return "", errors.New("not supported")
+}
+
+// TODO add implementation in following PRs
+func (kr *kopiaRepository) GetSnapshot(ctx context.Context, id udmrepo.ID) (udmrepo.Snapshot, error) {
+	return udmrepo.Snapshot{}, errors.New("not supported")
+}
+
+// TODO add implementation in following PRs
+func (kr *kopiaRepository) DeleteSnapshot(ctx context.Context, id udmrepo.ID) error {
+	return errors.New("not supported")
+}
+
 func (kr *kopiaRepository) Flush(ctx context.Context) error {
 	if kr.rawWriter == nil {
 		return errors.New("repo writer is closed or not open")
@@ -546,8 +571,9 @@ func (kow *kopiaObjectWriter) Write(p []byte) (int, error) {
 	return kow.rawWriter.Write(p)
 }
 
-func (kow *kopiaObjectWriter) Seek(offset int64, whence int) (int64, error) {
-	return -1, errors.New("not supported")
+// TODO add implementation in following PRs
+func (kow *kopiaObjectWriter) WriteAt(p []byte, offset int64) (int, error) {
+	return 0, errors.New("not supported")
 }
 
 func (kow *kopiaObjectWriter) Checkpoint() (udmrepo.ID, error) {

pkg/repository/udmrepo/kopialib/lib_repo_test.go

@@ -663,13 +663,16 @@ func TestNewObjectWriter(t *testing.T) {
 		rawWriter    *repomocks.MockRepositoryWriter
 		rawWriterRet object.Writer
 		expectedRet  udmrepo.ObjectWriter
+		expectedErr  string
 	}{
 		{
-			name: "raw writer is nil",
+			name:        "raw writer is nil",
+			expectedErr: "repo writer is closed or not open",
 		},
 		{
-			name:      "new object writer fail",
-			rawWriter: repomocks.NewMockRepositoryWriter(t),
+			name:        "new object writer fail",
+			rawWriter:   repomocks.NewMockRepositoryWriter(t),
+			expectedErr: "error creating writer for object ",
 		},
 		{
 			name:         "succeed",
@@ -688,9 +691,14 @@ func TestNewObjectWriter(t *testing.T) {
 				kr.rawWriter = tc.rawWriter
 			}
 
-			ret := kr.NewObjectWriter(t.Context(), udmrepo.ObjectWriteOptions{})
+			ret, err := kr.NewObjectWriter(t.Context(), udmrepo.ObjectWriteOptions{})
 
-			assert.Equal(t, tc.expectedRet, ret)
+			if tc.expectedErr == "" {
+				require.NoError(t, err)
+				require.Equal(t, tc.expectedRet, ret)
+			} else {
+				require.EqualError(t, err, tc.expectedErr)
+			}
 		})
 	}
 }