fix: API merge message is optional (#1710)

treeverse · Apr 5, 2021 · 65cd6a2 · 65cd6a2
1 parent 2eb68e3
commit 65cd6a2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/api/swagger.yml b/api/swagger.yml
@@ -367,8 +367,6 @@ components:
 
     Merge:
       type: object
-      required:
-        - message
       properties:
         message:
           type: string

diff --git a/benchmarks/main.go b/benchmarks/main.go
@@ -197,7 +197,7 @@ func uploader(ctx context.Context, ch chan string, repoName, contentPrefix strin
 func merge(ctx context.Context) {
 	err := retry.Do(func() error {
 		resp, err := client.MergeIntoBranchWithResponse(ctx, repoName, branchName, "master", api.MergeIntoBranchJSONRequestBody{
-			Message: "merging all objects to master",
+			Message: api.StringPtr("merging all objects to master"),
 		})
 		if err != nil {
 			return err

diff --git a/docs/assets/js/swagger.yml b/docs/assets/js/swagger.yml
@@ -367,8 +367,6 @@ components:
 
     Merge:
       type: object
-      required:
-        - message
       properties:
         message:
           type: string
@@ -1777,6 +1775,30 @@ paths:
         required: true
         schema:
           type: string
+    get:
+      deprecated: true
+      tags:
+        - commits
+      operationId: logBranchCommits
+      summary: |
+        get commit log from branch.
+        Deprecated: replaced by logCommits by passing branch name as ref
+      parameters:
+        - $ref: "#/components/parameters/PaginationAfter"
+        - $ref: "#/components/parameters/PaginationAmount"
+      responses:
+        200:
+          description: commit log
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/CommitList"
+        401:
+          $ref: "#/components/responses/Unauthorized"
+        404:
+          $ref: "#/components/responses/NotFound"
+        default:
+          $ref: "#/components/responses/ServerError"
     post:
       tags:
         - commits

diff --git a/pkg/api/controller.go b/pkg/api/controller.go
@@ -2381,7 +2381,7 @@ func (c *Controller) MergeIntoBranch(w http.ResponseWriter, r *http.Request, bod
 	res, err := c.Catalog.Merge(ctx,
 		repository, destinationBranch, sourceRef,
 		user.Username,
-		body.Message,
+		StringValue(body.Message),
 		metadata)
 
 	var hookAbortErr *graveler.HookAbortError