Merge pull request #100 from pluralsh/mjg/eng-119-cli-fix-file-encryption-detection

Add repair command in the cli

Author: michaeljguarino

cmd/plural/git.go

@@ -3,8 +3,20 @@ package main
 import (
 	"os"
 	"os/exec"
+	"github.com/urfave/cli"
+	"github.com/pluralsh/plural/pkg/utils/git"
 )
 
+
+func handleRepair(c *cli.Context) error {
+	repoRoot, err := git.Root()
+	if err != nil {
+		return err
+	}
+
+	return git.Repair(repoRoot)
+}
+
 func gitConfig(name, val string) error {
 	cmd := gitCommand("config", name, val)
 	return cmd.Run()

cmd/plural/plural.go

@@ -217,6 +217,12 @@ func main() {
 			Action:   handleImport,
 			Category: "User Profile",
 		},
+		{
+			Name:     "repair",
+			Usage:    "commits any new encrypted changes in your local workspace automatically",
+			Action:   handleRepair,
+			Category: "WORKSPACE",
+		},
 		{
 			Name:     "serve",
 			Usage:    "launch the server",

pkg/utils/git/remote.go

@@ -3,6 +3,7 @@ package git
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	gogit "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/transport"
@@ -17,6 +18,20 @@ func Clone(auth transport.AuthMethod, url, path string) (*gogit.Repository, erro
 	})
 }
 
+func Repair(root string) error {
+	_, err := git(root, "diff-index", "--quiet", "HEAD", "--")
+	if err == nil {
+		return nil
+	}
+
+	diff, _ := git(root, "diff")
+	if strings.TrimSpace(diff) == "" && err != nil {
+		return Sync(root, "committing new encrypted files", false)
+	}
+
+	return fmt.Errorf("There were non-repairable changes in your local git repository, you'll need to investigate them manually")
+}
+
 func Sync(root, msg string, force bool) error {
 	if res, err := git(root, "add", "."); err != nil {
 		return errors.ErrorWrap(fmt.Errorf(res), "`git add .` failed")