Fix lakectl branch protection set 400 response (#7590)

* Fix lakectl branch protection set 400 response * pr comments
treeverse · Mar 24, 2024 · b821b82 · b821b82
1 parent aae8b80
commit b821b82
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/cmd/lakectl/cmd/branch_protect.go b/cmd/lakectl/cmd/branch_protect.go
@@ -62,9 +62,12 @@ var branchProtectAddCmd = &cobra.Command{
 		rules = append(rules, apigen.BranchProtectionRule{
 			Pattern: args[1],
 		})
-		setResp, err := client.SetBranchProtectionRulesWithResponse(cmd.Context(), u.Repository, &apigen.SetBranchProtectionRulesParams{
-			IfMatch: swag.String(resp.HTTPResponse.Header.Get("ETag")),
-		}, rules)
+		params := &apigen.SetBranchProtectionRulesParams{}
+		etag := swag.String(resp.HTTPResponse.Header.Get("ETag"))
+		if etag != nil && *etag != "" {
+			params.IfMatch = etag
+		}
+		setResp, err := client.SetBranchProtectionRulesWithResponse(cmd.Context(), u.Repository, params, rules)
 		DieOnErrorOrUnexpectedStatusCode(setResp, err, http.StatusNoContent)
 	},
 }

diff --git a/esti/golden/lakectl_branch_protection_list.term.golden b/esti/golden/lakectl_branch_protection_list.term.golden
@@ -0,0 +1,2 @@
+${BRANCH}
+
diff --git a/esti/lakectl_test.go b/esti/lakectl_test.go
@@ -811,3 +811,17 @@ func TestLakectlUsage(t *testing.T) {
 	runCmd(t, r.Replace("{lakectl} repo list"), false, false, nil)
 	RunCmdAndVerifyFailureWithFile(t, r.Replace("{lakectl} usage summary"), false, "lakectl_usage_summary", vars)
 }
+
+func TestLakectlBranchProtection(t *testing.T) {
+	repoName := generateUniqueRepositoryName()
+	storage := generateUniqueStorageNamespace(repoName)
+	vars := map[string]string{
+		"REPO":    repoName,
+		"STORAGE": storage,
+		"BRANCH":  mainBranch,
+	}
+	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" repo create lakefs://"+repoName+" "+storage, false, "lakectl_repo_create", vars)
+
+	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" branch-protect add lakefs://"+repoName+" "+mainBranch, false, "lakectl_empty", vars)
+	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" branch-protect list lakefs://"+repoName, false, "lakectl_branch_protection_list.term", vars)
+}