fix ssh (#446)

* fix ssh * remove debug logs
lekkodev · Jul 10, 2024 · db95962 · db95962
1 parent 0c834ba
commit db95962
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/pkg/repo/cmd.go b/pkg/repo/cmd.go
@@ -156,23 +156,30 @@ func PrepareGithubRepo() (string, error) {
 			shouldClone = true
 		}
 	}
-
 	repoOwner, repoName := dot.GetRepoInfo()
 	githubRepoURL := fmt.Sprintf("https://github.com/%s/%s.git", repoOwner, repoName)
-
+	githubRepoURLSSH := fmt.Sprintf("git@github.com:%s/%s.git", repoOwner, repoName)
 	if shouldClone {
-		cloneOut, err := gitcli.Clone(githubRepoURL, repoPath)
+		// first try ssh clone
+		cloneOut, err := gitcli.Clone(githubRepoURLSSH, repoPath)
 		if err != nil {
-			fmt.Println(string(cloneOut))
-			return "", errors.Wrapf(err, "git clone %s to %s", githubRepoURL, repoPath)
+			// next try https
+			cloneOut2, err2 := gitcli.Clone(githubRepoURL, repoPath)
+			if err2 != nil {
+				fmt.Println("failed to clone via ssh, trying via https")
+				fmt.Println(string(cloneOut))
+				fmt.Println(string(cloneOut2))
+				return "", errors.Wrapf(err2, "git cloning %s to %s with both https and ssh, your git setup may be unreachable, or you haven't created a Lekko account and linked to github Help @ https://docs.lekko.com", githubRepoURL, repoPath)
+
+			}
 		}
 	} else {
 		gitRepo, err := git.PlainOpen(repoPath)
 		if err == nil {
 			remote, err := gitRepo.Remote("origin")
 			if err == nil {
 				// TODO: support comparing ssh and https urls
-				if len(remote.Config().URLs) == 0 || remote.Config().URLs[0] != githubRepoURL {
+				if len(remote.Config().URLs) == 0 || (remote.Config().URLs[0] != githubRepoURL && remote.Config().URLs[0] != githubRepoURLSSH) {
 					return "", errors.Errorf("repo already exists at %s but with different origin: %s", repoPath, remote.Config().URLs[0])
 				}
 				if err := ResetAndClean(gitRepo); err != nil {