Add github clone URL

leapfrogtechnology · Aug 30, 2019 · 7102282 · 7102282
1 parent 77f8677
commit 7102282
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/cli/internal/setup/setup.go b/cli/internal/setup/setup.go
@@ -143,14 +143,15 @@ func chooseOrganization(personalToken string) string {
 	return org
 }
 
-func chooseRepo(personalToken string, organization string) string {
+func chooseRepo(personalToken string, organization string) (string, string) {
 	repos := []string{}
+	repoURL := map[string]string{}
 
 	spinner.Start("Fetching your repositories...")
 	if strings.Contains(organization, "(User)") {
-		repos, _ = github.FetchUserRepos(personalToken)
+		repos, repoURL, _ = github.FetchUserRepos(personalToken)
 	} else {
-		repos, _ = github.FetchOrgRepos(personalToken, organization)
+		repos, repoURL, _ = github.FetchOrgRepos(personalToken, organization)
 	}
 	spinner.Stop()
 
@@ -166,7 +167,7 @@ func chooseRepo(personalToken string, organization string) string {
 		fmt.Println(err)
 	}
 
-	return org
+	return org, repoURL[org]
 }
 
 // Run initializes setup for shift projects.
@@ -180,7 +181,7 @@ func Run() {
 	spinner.Stop()
 
 	organization := chooseOrganization(personalToken)
-	repo := chooseRepo(personalToken, organization)
+	repo, repoURL := chooseRepo(personalToken, organization)
 
 	fmt.Print("ProjectDetails: ")
 	fmt.Println(projectDetails)
@@ -196,4 +197,6 @@ func Run() {
 
 	fmt.Print("Repository: ")
 	fmt.Println(repo)
+	fmt.Print("Clone URL: ")
+	fmt.Println(repoURL)
 }
diff --git a/cli/utils/github/github.go b/cli/utils/github/github.go
@@ -40,7 +40,8 @@ type user struct {
 }
 
 type repo struct {
-	Name string `json:"name"`
+	Name     string `json:"name"`
+	CloneURL string `json:"clone_url"`
 }
 
 // CreatePersonalToken creates a personal access token in github
@@ -112,8 +113,10 @@ func FetchUser(personalToken string) (string, error) {
 }
 
 // FetchOrgRepos fetches user's repositories
-func FetchOrgRepos(personalToken string, organization string) ([]string, error) {
+func FetchOrgRepos(personalToken string, organization string) ([]string, map[string]string, error) {
 	response := []repo{}
+	repos := []string{}
+	repoURL := map[string]string{}
 
 	_, err := http.Client.R().
 		SetHeader("Authorization", "token "+personalToken).
@@ -124,21 +127,22 @@ func FetchOrgRepos(personalToken string, organization string) ([]string, error)
 		fmt.Println("Error:")
 		fmt.Println(err)
 
-		return []string{}, err
+		return repos, repoURL, err
 	}
 
-	repos := []string{}
-
 	for _, repo := range response {
 		repos = append(repos, repo.Name)
+		repoURL[repo.Name] = repo.CloneURL
 	}
 
-	return repos, nil
+	return repos, repoURL, nil
 }
 
 // FetchUserRepos fetches user's repositories
-func FetchUserRepos(personalToken string) ([]string, error) {
+func FetchUserRepos(personalToken string) ([]string, map[string]string, error) {
 	response := []repo{}
+	repos := []string{}
+	repoURL := map[string]string{}
 
 	_, err := http.Client.R().
 		SetHeader("Authorization", "token "+personalToken).
@@ -149,14 +153,13 @@ func FetchUserRepos(personalToken string) ([]string, error) {
 		fmt.Println("Error:")
 		fmt.Println(err)
 
-		return []string{}, err
+		return repos, repoURL, err
 	}
 
-	repos := []string{}
-
 	for _, repo := range response {
 		repos = append(repos, repo.Name)
+		repoURL[repo.Name] = repo.CloneURL
 	}
 
-	return repos, nil
+	return repos, repoURL, nil
 }