test: add test for object

Author: hunjixin

api/jiaozifs.gen.go

@@ -736,26 +736,6 @@ paths:
             schema:
               type: string
               format: binary
-
-      parameters:
-        - in: query
-          name: wipID
-          description: working in process
-          required: true
-          schema:
-            type: string
-            format: uuid
-        - in: header
-          name: If-None-Match
-          description: |
-            Currently supports only "*" to allow uploading an object only if one doesn't exist yet.
-            Deprecated, this capability will not be supported in future releases.
-          example: "*"
-          required: false
-          deprecated: true
-          schema:
-            type: string
-            pattern: '^\*$' # Currently, only "*" is supported
       responses:
         201:
           description: object metadata
@@ -780,14 +760,6 @@ paths:
         - objects
       operationId: deleteObject
       summary: delete object. Missing objects will not return a NotFound error.
-      parameters:
-        - in: query
-          name: wipID
-          description: working in process
-          required: true
-          schema:
-            type: string
-            format: uuid
       responses:
         204:
           description: object deleted successfully

api/swagger.yml

@@ -10,6 +10,8 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/jiaozifs/jiaozifs/utils/hash"
+
 	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/go-openapi/swag"
@@ -39,7 +41,7 @@ type ObjectController struct {
 }
 
 func (oct ObjectController) DeleteObject(ctx context.Context, w *api.JiaozifsResponse, r *http.Request, ownerName string, repositoryName string, params api.DeleteObjectParams) { //nolint
-	user, err := auth.GetOperator(ctx)
+	operator, err := auth.GetOperator(ctx)
 	if err != nil {
 		w.Error(err)
 		return
@@ -51,7 +53,7 @@ func (oct ObjectController) DeleteObject(ctx context.Context, w *api.JiaozifsRes
 		return
 	}
 
-	if user.Name != ownerName { //todo check permission
+	if operator.Name != ownerName { //todo check permission
 		w.Forbidden()
 		return
 	}
@@ -73,6 +75,12 @@ func (oct ObjectController) DeleteObject(ctx context.Context, w *api.JiaozifsRes
 		return
 	}
 
+	wip, err := oct.Repo.WipRepo().Get(ctx, models.NewGetWipParams().SetCreatorID(operator.ID).SetRepositoryID(repository.ID).SetRefID(ref.ID))
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
 	workTree, err := versionmgr.NewWorkTree(ctx, oct.Repo.FileTreeRepo(), models.NewRootTreeEntry(commit.TreeHash))
 	if err != nil {
 		w.Error(err)
@@ -81,11 +89,11 @@ func (oct ObjectController) DeleteObject(ctx context.Context, w *api.JiaozifsRes
 
 	err = workTree.RemoveEntry(ctx, params.Path)
 	if errors.Is(err, versionmgr.ErrPathNotFound) {
-		w.Code(http.StatusNotFound)
+		w.BadRequest(fmt.Sprintf("path %s not found", params.Path))
 		return
 	}
 
-	err = oct.Repo.WipRepo().UpdateByID(ctx, models.NewUpdateWipParams(params.WipID).SetCurrentTree(workTree.Root().Hash()))
+	err = oct.Repo.WipRepo().UpdateByID(ctx, models.NewUpdateWipParams(wip.ID).SetCurrentTree(workTree.Root().Hash()))
 	if err != nil {
 		w.Error(err)
 		return
@@ -123,20 +131,28 @@ func (oct ObjectController) GetObject(ctx context.Context, w *api.JiaozifsRespon
 		return
 	}
 
-	commit, err := oct.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
-	if err != nil {
-		w.Error(err)
-		return
+	treeHash := hash.EmptyHash
+	if !ref.CommitHash.IsEmpty() {
+		commit, err := oct.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
+		if err != nil {
+			w.Error(err)
+			return
+		}
+		treeHash = commit.TreeHash
 	}
 
-	workTree, err := versionmgr.NewWorkTree(ctx, oct.Repo.FileTreeRepo(), models.NewRootTreeEntry(commit.TreeHash))
+	workTree, err := versionmgr.NewWorkTree(ctx, oct.Repo.FileTreeRepo(), models.NewRootTreeEntry(treeHash))
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
 	blob, name, err := workTree.FindBlob(ctx, params.Path)
 	if err != nil {
+		if errors.Is(err, versionmgr.ErrPathNotFound) {
+			w.BadRequest(fmt.Sprintf("path %s not found", params.Path))
+			return
+		}
 		w.Error(err)
 		return
 	}
@@ -160,7 +176,7 @@ func (oct ObjectController) GetObject(ctx context.Context, w *api.JiaozifsRespon
 		w.Header().Set("Content-Length", fmt.Sprint(blob.Size))
 	}
 
-	etag := httputil.ETag(blob.Hash.Hex())
+	etag := httputil.ETag(blob.CheckSum.Hex())
 	w.Header().Set("ETag", etag)
 	lastModified := httputil.HeaderTimestamp(blob.CreatedAt)
 	w.Header().Set("Last-Modified", lastModified)
@@ -212,44 +228,40 @@ func (oct ObjectController) HeadObject(ctx context.Context, w *api.JiaozifsRespo
 		return
 	}
 
-	commit, err := oct.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
-	if err != nil {
-		w.Error(err)
-		return
+	treeHash := hash.EmptyHash
+	if !ref.CommitHash.IsEmpty() {
+		commit, err := oct.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
+		if err != nil {
+			w.Error(err)
+			return
+		}
+		treeHash = commit.TreeHash
 	}
 
 	fileRepo := oct.Repo.FileTreeRepo()
-	treeOp, err := versionmgr.NewWorkTree(ctx, fileRepo, models.NewRootTreeEntry(commit.TreeHash))
+	workTree, err := versionmgr.NewWorkTree(ctx, fileRepo, models.NewRootTreeEntry(treeHash))
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	existNodes, missingPath, err := treeOp.MatchPath(ctx, params.Path)
-	if err != nil {
-		w.Error(err)
-		return
-	}
-	if len(missingPath) == 0 {
-		w.Error(versionmgr.ErrPathNotFound)
-		return
-	}
-
-	objectWithName := existNodes[len(existNodes)-1]
-
-	blob, err := fileRepo.Blob(ctx, objectWithName.Node().Hash)
+	blob, name, err := workTree.FindBlob(ctx, params.Path)
 	if err != nil {
+		if errors.Is(err, versionmgr.ErrPathNotFound) {
+			w.BadRequest(fmt.Sprintf("path %s not found", params.Path))
+			return
+		}
 		w.Error(err)
 		return
 	}
 
 	//lookup files
-	etag := httputil.ETag(objectWithName.Node().Hash.Hex())
+	etag := httputil.ETag(blob.CheckSum.Hex())
 	w.Header().Set("ETag", etag)
-	lastModified := httputil.HeaderTimestamp(objectWithName.Node().CreatedAt)
+	lastModified := httputil.HeaderTimestamp(blob.CreatedAt)
 	w.Header().Set("Last-Modified", lastModified)
 	w.Header().Set("Accept-Ranges", "bytes")
-	w.Header().Set("Content-Type", httputil.ExtensionsByType(objectWithName.Entry().Name))
+	w.Header().Set("Content-Type", httputil.ExtensionsByType(name))
 	// for security, make sure the browser and any proxies en route don't cache the response
 	w.Header().Set("Cache-Control", "no-store, must-revalidate")
 	w.Header().Set("Expires", "0")
@@ -315,7 +327,7 @@ func (oct ObjectController) UploadObject(ctx context.Context, w *api.JiaozifsRes
 	}
 	defer reader.Close() //nolint
 
-	user, err := auth.GetOperator(ctx)
+	operator, err := auth.GetOperator(ctx)
 	if err != nil {
 		w.Error(err)
 		return
@@ -327,18 +339,30 @@ func (oct ObjectController) UploadObject(ctx context.Context, w *api.JiaozifsRes
 		return
 	}
 
-	if user.Name != ownerName { //todo check permission
+	if operator.Name != ownerName { //todo check permission
 		w.Forbidden()
 		return
 	}
 
-	_, err = oct.Repo.RepositoryRepo().Get(ctx, models.NewGetRepoParams().SetOwnerID(owner.ID).SetName(repositoryName))
+	repository, err := oct.Repo.RepositoryRepo().Get(ctx, models.NewGetRepoParams().SetOwnerID(owner.ID).SetName(repositoryName))
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	ref, err := oct.Repo.RefRepo().Get(ctx, models.NewGetRefParams().SetName(params.Branch).SetRepositoryID(repository.ID))
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	wip, err := oct.Repo.WipRepo().Get(ctx, models.NewGetWipParams().SetCreatorID(operator.ID).SetRepositoryID(repository.ID).SetRefID(ref.ID))
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	stash, err := oct.Repo.WipRepo().Get(ctx, models.NewGetWipParams().SetID(params.WipID))
+	stash, err := oct.Repo.WipRepo().Get(ctx, models.NewGetWipParams().SetID(wip.ID))
 	if err != nil {
 		w.Error(err)
 		return
@@ -351,6 +375,7 @@ func (oct ObjectController) UploadObject(ctx context.Context, w *api.JiaozifsRes
 			return err
 		}
 
+		// todo move write blob out of transaction
 		blob, err := workingTree.WriteBlob(ctx, oct.BlockAdapter, reader, r.ContentLength, models.DefaultLeafProperty())
 		if err != nil {
 			return err
@@ -361,7 +386,7 @@ func (oct ObjectController) UploadObject(ctx context.Context, w *api.JiaozifsRes
 			return err
 		}
 		response = api.ObjectStats{
-			Checksum:    blob.Hash.Hex(),
+			Checksum:    blob.CheckSum.Hex(),
 			Mtime:       time.Now().Unix(),
 			Path:        params.Path,
 			PathMode:    utils.Uint32(uint32(filemode.Regular)),
@@ -377,5 +402,5 @@ func (oct ObjectController) UploadObject(ctx context.Context, w *api.JiaozifsRes
 		return
 	}
 
-	w.JSON(response)
+	w.JSON(response, http.StatusCreated)
 }

controller/object_ctl.go

@@ -202,22 +202,26 @@ func (wipCtl WipController) CommitWip(ctx context.Context, w *api.JiaozifsRespon
 		return
 	}
 
-	commit, err := wipCtl.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
-	if err != nil {
-		w.Error(err)
-		return
-	}
-
 	wip, err := wipCtl.Repo.WipRepo().Get(ctx, models.NewGetWipParams().SetRefID(ref.ID).SetCreatorID(operator.ID).SetRepositoryID(repository.ID))
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	if !bytes.Equal(commit.Hash, wip.BaseCommit) {
+	if !bytes.Equal(ref.CommitHash, wip.BaseCommit) {
 		w.Error(fmt.Errorf("base commit not equal with branch, please update wip"))
 		return
 	}
+
+	var commit *models.Commit
+	if !ref.CommitHash.IsEmpty() {
+		commit, err = wipCtl.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
+		if err != nil {
+			w.Error(err)
+			return
+		}
+	}
+
 	var msg string
 	if params.Msg != nil {
 		msg = *params.Msg
@@ -232,7 +236,8 @@ func (wipCtl WipController) CommitWip(ctx context.Context, w *api.JiaozifsRespon
 		}
 
 		wip.BaseCommit = commit.Commit().Hash //set for response
-		err = repo.WipRepo().UpdateByID(ctx, models.NewUpdateWipParams(wip.ID).SetBaseCommit(wip.BaseCommit))
+		wip.CurrentTree = commit.Commit().TreeHash
+		err = repo.WipRepo().UpdateByID(ctx, models.NewUpdateWipParams(wip.ID).SetBaseCommit(wip.BaseCommit).SetCurrentTree(wip.CurrentTree))
 		if err != nil {
 			return err
 		}
@@ -244,7 +249,7 @@ func (wipCtl WipController) CommitWip(ctx context.Context, w *api.JiaozifsRespon
 		return
 	}
 
-	w.JSON(wip)
+	w.JSON(wip, http.StatusCreated)
 }
 
 // DeleteWip delete a active working in process operator only can delete himself wip

controller/wip_ctl.go

@@ -3,6 +3,7 @@ package integrationtest
 import (
 	"bytes"
 	"context"
+	"crypto/rand"
 	"errors"
 	"fmt"
 	"io"
@@ -12,7 +13,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/jiaozifs/jiaozifs/api"
+	"github.com/jiaozifs/jiaozifs/utils"
 	"github.com/smartystreets/goconvey/convey"
 
 	"github.com/jiaozifs/jiaozifs/testhelper"
@@ -141,3 +144,27 @@ func createRepo(ctx context.Context, c convey.C, client *api.Client, repoName st
 		convey.So(resp.StatusCode, convey.ShouldEqual, http.StatusOK)
 	})
 }
+
+func uploadRandomObject(ctx context.Context, c convey.C, client *api.Client, user string, repoName string, refName string, path string) { //nolint
+	c.Convey("upload object "+uuid.New().String(), func(c convey.C) {
+		c.Convey("success upload object", func() {
+			resp, err := client.UploadObjectWithBody(ctx, user, repoName, &api.UploadObjectParams{
+				Branch: refName,
+				Path:   path,
+			}, "application/octet-stream", io.LimitReader(rand.Reader, 50))
+			convey.So(err, convey.ShouldBeNil)
+			convey.So(resp.StatusCode, convey.ShouldEqual, http.StatusCreated)
+		})
+	})
+}
+
+func commitWip(ctx context.Context, c convey.C, client *api.Client, user string, repoName string, refName string) {
+	c.Convey("commit wip "+uuid.New().String(), func() {
+		resp, err := client.CommitWip(ctx, user, repoName, &api.CommitWipParams{
+			RefName: refName,
+			Msg:     utils.String("test commit msg"),
+		})
+		convey.So(err, convey.ShouldBeNil)
+		convey.So(resp.StatusCode, convey.ShouldEqual, http.StatusCreated)
+	})
+}