Tidy git resource logic

We should always ensure permissions rather than returning early.
surminus · May 31, 2023 · 21452c4 · 21452c4
1 parent d545008
commit 21452c4
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/resources/git.go b/resources/git.go
@@ -120,17 +120,7 @@ func (g *Git) createGit(log *viaduct.Logger) error {
 		return nil
 	}
 
-	var pathExists bool
-	if viaduct.FileExists(path) {
-		if !g.Ensure {
-			log.Noop(logmsg)
-			return nil
-		}
-
-		pathExists = true
-	}
-
-	if pathExists {
+	if viaduct.FileExists(path) && g.Ensure {
 		r, err := git.PlainOpen(path)
 		if err != nil {
 			return err
@@ -150,7 +140,6 @@ func (g *Git) createGit(log *viaduct.Logger) error {
 
 		// nolint:exhaustivestruct
 		err = w.Pull(&git.PullOptions{
-			// Auth:          auth,
 			RemoteName:    "origin",
 			Progress:      os.Stdout,
 			ReferenceName: plumbing.ReferenceName(g.Reference),
@@ -166,7 +155,7 @@ func (g *Git) createGit(log *viaduct.Logger) error {
 		}
 	}
 
-	if !pathExists {
+	if !viaduct.FileExists(path) {
 		progress := os.Stdout
 
 		if viaduct.Config.Quiet || viaduct.Config.Silent {