Fix: return bad request on reset branch with unknown type (#7210)

* fix reset branch unknown type status code * Return bad request status code on invalid type * update error message
treeverse · Dec 30, 2023 · 9896225 · 9896225
1 parent f450801
commit 9896225
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 1 deletion.
diff --git a/api/swagger.yml b/api/swagger.yml
@@ -3299,6 +3299,8 @@ paths:
       responses:
         204:
           description: reset successful
+        400:
+          $ref: "#/components/responses/BadRequest"
         401:
           $ref: "#/components/responses/Unauthorized"
         403:

diff --git a/clients/java-legacy/api/openapi.yaml b/clients/java-legacy/api/openapi.yaml
diff --git a/clients/java-legacy/docs/BranchesApi.md b/clients/java-legacy/docs/BranchesApi.md
diff --git a/clients/java-legacy/src/main/java/io/lakefs/clients/api/BranchesApi.java b/clients/java-legacy/src/main/java/io/lakefs/clients/api/BranchesApi.java
diff --git a/clients/java/api/openapi.yaml b/clients/java/api/openapi.yaml
diff --git a/clients/java/docs/BranchesApi.md b/clients/java/docs/BranchesApi.md
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/BranchesApi.java b/clients/java/src/main/java/io/lakefs/clients/sdk/BranchesApi.java
diff --git a/clients/python-legacy/docs/BranchesApi.md b/clients/python-legacy/docs/BranchesApi.md
diff --git a/clients/python/docs/BranchesApi.md b/clients/python/docs/BranchesApi.md
diff --git a/docs/assets/js/swagger.yml b/docs/assets/js/swagger.yml
@@ -3299,6 +3299,8 @@ paths:
       responses:
         204:
           description: reset successful
+        400:
+          $ref: "#/components/responses/BadRequest"
         401:
           $ref: "#/components/responses/Unauthorized"
         403:

diff --git a/pkg/api/controller.go b/pkg/api/controller.go
@@ -2338,7 +2338,8 @@ func (c *Controller) ResetBranch(w http.ResponseWriter, r *http.Request, body ap
 	case entryTypeObject:
 		err = c.Catalog.ResetEntry(ctx, repository, branch, swag.StringValue(body.Path), graveler.WithForce(swag.BoolValue(body.Force)))
 	default:
-		writeError(w, r, http.StatusNotFound, "reset type not found")
+		writeError(w, r, http.StatusBadRequest, "unknown reset type")
+		return
 	}
 	if c.handleAPIError(ctx, w, r, err) {
 		return