From cc776f802f4d5b79507bfbb7954e0d84b9cbbf3f Mon Sep 17 00:00:00 2001
From: "Ariel Shaqed (Scolnicov)" <ariels@treeverse.io>
Date: Mon, 6 Jan 2025 16:01:43 +0200
Subject: [PATCH] [CR] Test lakectl with "--merge" option to "lakectl merge"

---
 .../lakectl_merge_with_squashed_commit.golden | 16 +++++
 esti/lakectl_test.go                          | 71 ++++++++++++++-----
 2 files changed, 70 insertions(+), 17 deletions(-)
 create mode 100644 esti/golden/lakectl_merge_with_squashed_commit.golden

diff --git a/esti/golden/lakectl_merge_with_squashed_commit.golden b/esti/golden/lakectl_merge_with_squashed_commit.golden
new file mode 100644
index 00000000000..e82a018a074
--- /dev/null
+++ b/esti/golden/lakectl_merge_with_squashed_commit.golden
@@ -0,0 +1,16 @@
+
+ID:            <COMMIT_ID>
+Author:        esti
+Date:          <DATE> <TIME> <TZ>
+Merge:         <COMMIT_ID>
+
+	${MESSAGE}
+
+Metadata:
+	
+	.lakefs.merge.strategy = default
+	
+	key1               = value1
+	
+	key2               = value2
+	
diff --git a/esti/lakectl_test.go b/esti/lakectl_test.go
index 5195bb267bf..cee33cd4657 100644
--- a/esti/lakectl_test.go
+++ b/esti/lakectl_test.go
@@ -224,31 +224,68 @@ func TestLakectlMerge(t *testing.T) {
 	commitMessage := "first commit to main"
 	vars["MESSAGE"] = commitMessage
 	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" commit lakefs://"+repoName+"/"+mainBranch+" -m \""+commitMessage+"\"", false, "lakectl_commit", vars)
-	featureBranch := "feature"
-	branchVars := map[string]string{
+
+	// create new branch 'feature'
+	featureBranchVars := map[string]string{
 		"REPO":          repoName,
 		"STORAGE":       storage,
 		"SOURCE_BRANCH": mainBranch,
-		"DEST_BRANCH":   featureBranch,
+		"DEST_BRANCH":   "feature",
 	}
 
-	t.Run("merge with commit message and meta", func(t *testing.T) {
-		// create new branch 'feature'
-		RunCmdAndVerifySuccessWithFile(t, Lakectl()+" branch create lakefs://"+repoName+"/"+featureBranch+" --source lakefs://"+repoName+"/"+mainBranch, false, "lakectl_branch_create", branchVars)
+	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" branch create lakefs://"+repoName+"/feature"+" --source lakefs://"+repoName+"/"+mainBranch, false, "lakectl_branch_create", featureBranchVars)
 
-		// update 'file1' on 'main' and commit
-		RunCmdAndVerifySuccessWithFile(t, Lakectl()+" fs upload -s files/ro_1k_other lakefs://"+repoName+"/"+mainBranch+"/"+filePath1, false, "lakectl_fs_upload", vars)
-		commitMessage = "file update on main branch"
-		vars["MESSAGE"] = commitMessage
-		RunCmdAndVerifySuccessWithFile(t, Lakectl()+" commit lakefs://"+repoName+"/"+mainBranch+" -m \""+commitMessage+"\"", false, "lakectl_commit", vars)
+	// update 'file1' on 'feature' and commit
+	vars["FILE_PATH"] = filePath1
+	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" fs upload -s files/ro_1k_other lakefs://"+repoName+"/feature/"+filePath1, false, "lakectl_fs_upload", vars)
+	commitMessage = "file update on feature branch"
+	vars["BRANCH"] = "feature"
+	vars["MESSAGE"] = commitMessage
+	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" commit lakefs://"+repoName+"/feature -m \""+commitMessage+"\"", false, "lakectl_commit", vars)
 
-		commitMessage = "merge commit"
-		vars["MESSAGE"] = commitMessage
-		meta := "key1=value1,key2=value2"
-		RunCmdAndVerifySuccessWithFile(t, Lakectl()+" merge lakefs://"+repoName+"/"+mainBranch+" lakefs://"+repoName+"/"+featureBranch+" -m '"+commitMessage+"' --meta "+meta, false, "lakectl_merge_success", branchVars)
+	// update 'file2' on 'main' and commit
+	vars["FILE_PATH"] = filePath2
+	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" fs upload -s files/ro_1k_other lakefs://"+repoName+"/feature/"+filePath2, false, "lakectl_fs_upload", vars)
+	commitMessage = "another file update on main branch"
+	vars["MESSAGE"] = commitMessage
+	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" commit lakefs://"+repoName+"/feature -m \""+commitMessage+"\"", false, "lakectl_commit", vars)
 
-		RunCmdAndVerifySuccessWithFile(t, Lakectl()+" log --amount 1 lakefs://"+repoName+"/"+featureBranch, false, "lakectl_merge_with_commit", vars)
-	})
+	cases := []struct {
+		Name   string
+		Squash bool
+	}{
+		{Name: "regular", Squash: false},
+		{Name: "squash", Squash: true},
+	}
+	for _, tc := range cases {
+		t.Run("merge with commit message and meta "+tc.Name, func(t *testing.T) {
+			destBranch := "dest-" + tc.Name
+			destBranchVars := map[string]string{
+				"REPO":          repoName,
+				"STORAGE":       storage,
+				"SOURCE_BRANCH": mainBranch,
+				"DEST_BRANCH":   destBranch,
+			}
+			// create new destBranch from main, before the additions to main.
+			RunCmdAndVerifySuccessWithFile(t, Lakectl()+" branch create lakefs://"+repoName+"/"+destBranch+" --source lakefs://"+repoName+"/"+mainBranch, false, "lakectl_branch_create", destBranchVars)
+
+			commitMessage = "merge commit"
+			vars["MESSAGE"] = commitMessage
+			meta := "key1=value1,key2=value2"
+			squash := ""
+			if tc.Squash {
+				squash = "--squash"
+			}
+			destBranchVars["SOURCE_BRANCH"] = "feature"
+			RunCmdAndVerifySuccessWithFile(t, Lakectl()+" merge lakefs://"+repoName+"/feature lakefs://"+repoName+"/"+destBranch+" -m '"+commitMessage+"' --meta "+meta+" "+squash, false, "lakectl_merge_success", destBranchVars)
+
+			golden := "lakectl_merge_with_commit"
+			if tc.Squash {
+				golden = "lakectl_merge_with_squashed_commit"
+			}
+			RunCmdAndVerifySuccessWithFile(t, Lakectl()+" log --amount 1 lakefs://"+repoName+"/"+destBranch, false, golden, vars)
+		})
+	}
 }
 
 func TestLakectlMergeAndStrategies(t *testing.T) {