Run bisync post-merge for go pull (#401)

* Run bisync post-merge for go pull

* Add check for merge conflicts

Author: DavidSGK

cmd/lekko/repo.go

@@ -432,6 +432,7 @@ func pullCmd() *cobra.Command {
 		Short: "Pull remote changes and merge them with local changes.",
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			defer err2.Handle(&err)
+			ctx := cmd.Context()
 
 			dot := try.To1(dotlekko.ReadDotLekko(""))
 			nativeMetadata, nativeLang := try.To2(native.DetectNativeLang(""))
@@ -475,7 +476,7 @@ func pullCmd() *cobra.Command {
 						return fmt.Errorf("please commit or stash changes in '%s' before pulling", lekkoPath)
 					}
 				}
-				try.To(gen.GenNative(cmd.Context(), nativeLang, dot.LekkoPath, repoPath, gen.GenOptions{NativeMetadata: nativeMetadata}))
+				try.To(gen.GenNative(ctx, nativeLang, dot.LekkoPath, repoPath, gen.GenOptions{NativeMetadata: nativeMetadata}))
 
 				dot.LockSHA = newHead.Hash().String()
 				if err := dot.WriteBack(); err != nil {
@@ -500,12 +501,18 @@ func pullCmd() *cobra.Command {
 					return errors.Wrap(err, "ts pull")
 				}
 			case native.GO:
-				files, err := sync.BisyncGo(cmd.Context(), lekkoPath, lekkoPath, repoPath)
+				files, err := sync.BisyncGo(ctx, lekkoPath, lekkoPath, repoPath)
 				if err != nil {
 					return errors.Wrap(err, "go bisync")
 				}
+				hasConflicts := false
 				for _, f := range files {
-					try.To(mergeFile(cmd.Context(), f, dot, nativeMetadata))
+					hasConflicts = hasConflicts && try.To1(mergeFile(ctx, f, dot, nativeMetadata))
+				}
+				if !hasConflicts {
+					if _, err := sync.BisyncGo(ctx, lekkoPath, lekkoPath, repoPath); err != nil {
+						return errors.Wrap(err, "post-merge go bisync")
+					}
 				}
 			default:
 				return fmt.Errorf("unsupported language: %s", nativeLang)
@@ -523,54 +530,54 @@ func pullCmd() *cobra.Command {
 	return cmd
 }
 
-func mergeFile(ctx context.Context, filename string, dot *dotlekko.DotLekko, nativeMetadata native.Metadata) (err error) {
+func mergeFile(ctx context.Context, filename string, dot *dotlekko.DotLekko, nativeMetadata native.Metadata) (hasConflicts bool, err error) {
 	defer err2.Handle(&err)
 	nativeLang, err := native.NativeLangFromExt(filename)
 	if err != nil {
-		return err
+		return false, err
 	}
 	ns := try.To1(nativeLang.GetNamespace(filename))
 
 	fileBytes, err := os.ReadFile(filename)
 	if err != nil {
-		return errors.Wrap(err, "read file")
+		return false, errors.Wrap(err, "read file")
 	}
 	if bytes.Contains(fileBytes, []byte("<<<<<<<")) {
-		return fmt.Errorf("%s has unresolved merge conflicts", filename)
+		return false, fmt.Errorf("%s has unresolved merge conflicts", filename)
 	}
 
 	if len(dot.LockSHA) == 0 {
-		return errors.New("no Lekko lock information found")
+		return false, errors.New("no Lekko lock information found")
 	}
 
 	repoPath, err := repo.PrepareGithubRepo()
 	if err != nil {
-		return err
+		return false, err
 	}
 	gitRepo, err := git.PlainOpen(repoPath)
 	if err != nil {
-		return errors.Wrap(err, "open git repo")
+		return false, errors.Wrap(err, "open git repo")
 	}
 	err = repo.ResetAndClean(gitRepo)
 	if err != nil {
-		return err
+		return false, err
 	}
 	worktree, err := gitRepo.Worktree()
 	if err != nil {
-		return errors.Wrap(err, "get worktree")
+		return false, errors.Wrap(err, "get worktree")
 	}
 
 	// base
 	err = worktree.Checkout(&git.CheckoutOptions{
 		Hash: plumbing.NewHash(dot.LockSHA),
 	})
 	if err != nil {
-		return errors.Wrap(err, fmt.Sprintf("checkout %s", dot.LockSHA))
+		return false, errors.Wrap(err, fmt.Sprintf("checkout %s", dot.LockSHA))
 	}
 
 	baseDir, err := os.MkdirTemp("", "lekko-merge-base-")
 	if err != nil {
-		return errors.Wrap(err, "create temp dir")
+		return false, errors.Wrap(err, "create temp dir")
 	}
 	defer os.RemoveAll(baseDir)
 	err = gen.GenNative(ctx, nativeLang, dot.LekkoPath, repoPath, gen.GenOptions{
@@ -579,7 +586,7 @@ func mergeFile(ctx context.Context, filename string, dot *dotlekko.DotLekko, nat
 		NativeMetadata: nativeMetadata,
 	})
 	if err != nil {
-		return errors.Wrap(err, "gen native")
+		return false, errors.Wrap(err, "gen native")
 	}
 
 	getCommitInfo := func() (string, error) {
@@ -598,19 +605,19 @@ func mergeFile(ctx context.Context, filename string, dot *dotlekko.DotLekko, nat
 
 	baseCommitInfo, err := getCommitInfo()
 	if err != nil {
-		return errors.Wrap(err, "get commit info")
+		return false, errors.Wrap(err, "get commit info")
 	}
 
 	// remote
 	err = worktree.Checkout(&git.CheckoutOptions{
 		Branch: plumbing.NewBranchReferenceName("main"),
 	})
 	if err != nil {
-		return errors.Wrap(err, "checkout main")
+		return false, errors.Wrap(err, "checkout main")
 	}
 	remoteDir, err := os.MkdirTemp("", "lekko-merge-remote-")
 	if err != nil {
-		return errors.Wrap(err, "create temp dir")
+		return false, errors.Wrap(err, "create temp dir")
 	}
 	defer os.RemoveAll(remoteDir)
 	err = gen.GenNative(ctx, nativeLang, dot.LekkoPath, repoPath, gen.GenOptions{
@@ -619,12 +626,12 @@ func mergeFile(ctx context.Context, filename string, dot *dotlekko.DotLekko, nat
 		NativeMetadata: nativeMetadata,
 	})
 	if err != nil {
-		return errors.Wrap(err, "gen native")
+		return false, errors.Wrap(err, "gen native")
 	}
 
 	remoteCommitInfo, err := getCommitInfo()
 	if err != nil {
-		return errors.Wrap(err, "get commit info")
+		return false, errors.Wrap(err, "get commit info")
 	}
 
 	baseFilename := filepath.Join(baseDir, filename)
@@ -644,12 +651,13 @@ func mergeFile(ctx context.Context, filename string, dot *dotlekko.DotLekko, nat
 		// positive error code is fine, it signals number of conflicts
 		if ok && exitErr.ExitCode() > 0 {
 			fmt.Printf("CONFLICT (content): Merge conflict in %s\n", filename)
+			return true, nil
 		} else {
-			return errors.Wrap(err, "git merge-file")
+			return false, errors.Wrap(err, "git merge-file")
 		}
 	}
 
-	return nil
+	return false, nil
 }
 
 func mergeFileCmd() *cobra.Command {
@@ -664,7 +672,8 @@ func mergeFileCmd() *cobra.Command {
 			if err != nil {
 				return errors.Wrap(err, "open Lekko configuration file")
 			}
-			return mergeFile(cmd.Context(), tsFilename, dot, nil)
+			_, err = mergeFile(cmd.Context(), tsFilename, dot, nil)
+			return err
 		},
 	}
 	cmd.Flags().StringVarP(&tsFilename, "filename", "f", "", "path to ts file to pull changes into")