support getting all of an organisations repos

Author: Stig Lindqvist

CHANGELOG.md

@@ -4,6 +4,31 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.6.0] - 2017-10-13
+
+### Changed
+
+- Configuration to get private and public repositories for Organisations
+- Configuration to get users public repositories
+
+### Removed
+
+- Configuration for getting repositories with wildcard syntax
+
+## [0.5.1] - 2017-10-11
+
+### Added
+- use of glide as a dependency manager to lock down the gitlab client to v3 of the gitlab API
+
+### Changed
+- escape &, > and < characters for slack
+- better Work-In-Progress (WIP) detection from the pull request titles
+
+## [0.5.0] - 2017-05-09
+
+### Changed
+- Exclude Github PR that are currently under review
+
 ## [0.4.0] - 2016-09-03
 
 ### Added

README.md

@@ -59,6 +59,12 @@ Example JSON
 ```
 {
   "github_token": "secret_token",
+  "github_organisations": [
+    "facebook"
+  ],
+  "github_user": [
+    "stojg"
+  ],
   "github_repos": [
     "user1/repo1",
     "user2/repo1"
@@ -78,18 +84,15 @@ Example JSON
 }
 ```
 
-To get all repos for a github user / organisation, replace the repository name with a star:
-
-```
-"github_repos": [ "user1/*" ]
-
-```
-
+Note that `github_organisations` will get all public and private repos and that `github_user` will only get the public
+repos for a user due to how gitlab works.
 
 The ENV variables are
 
 ```
 export GITHUB_TOKEN="<super_secret_github token>"
+export GITHUB_ORGANISATIONS - "facebook,twitter"
+export GITHUB_USERS - "stojg,KentBeck"
 export GITHUB_REPOS="user_org/repo1,user_org/repo2" # comma separated
 export GITLAB_TOKEN="<super_secret_github token>"
 export GITLAB_URL="http://example.com"
@@ -99,8 +102,6 @@ export SLACK_CHANNEL="my_slack_room"
 export USER_WHITELIST="user1,user2"
 ```
 
-GitLab configuration is optional.
-
 ## run it
 
 `purr --config my_team.json`

config.go

@@ -10,14 +10,16 @@ import (
 
 // Config contains the settings from the user
 type Config struct {
-	GitHubToken   string   `json:"github_token"`
-	GitHubRepos   []string `json:"github_repos"`
-	GitLabToken   string   `json:"gitlab_token"`
-	GitLabRepos   []string `json:"gitlab_repos"`
-	GitlabURL     string   `json:"gitlab_url"`
-	SlackToken    string   `json:"slack_token"`
-	SlackChannel  string   `json:"slack_channel"`
-	UserWhiteList []string `json:"user_whitelist"`
+	GitHubToken         string   `json:"github_token"`
+	GitHubOrganisations []string `json:"github_organisations"`
+	GitHubUsers         []string `json:"github_user"`
+	GitHubRepos         []string `json:"github_repos"`
+	GitLabToken         string   `json:"gitlab_token"`
+	GitLabRepos         []string `json:"gitlab_repos"`
+	GitlabURL           string   `json:"gitlab_url"`
+	SlackToken          string   `json:"slack_token"`
+	SlackChannel        string   `json:"slack_channel"`
+	UserWhiteList       []string `json:"user_whitelist"`
 }
 
 func newConfig(filePath string) (*Config, error) {
@@ -38,6 +40,12 @@ func newConfig(filePath string) (*Config, error) {
 	if os.Getenv("GITHUB_TOKEN") != "" {
 		c.GitHubToken = os.Getenv("GITHUB_TOKEN")
 	}
+	if os.Getenv("GITHUB_ORGANISATIONS") != "" {
+		c.GitHubOrganisations = strings.Split(os.Getenv("GITHUB_ORGANISATIONS"), ",")
+	}
+	if os.Getenv("GITHUB_USERS") != "" {
+		c.GitHubUsers = strings.Split(os.Getenv("GITHUB_USERS"), ",")
+	}
 	if os.Getenv("GITHUB_REPOS") != "" {
 		c.GitHubRepos = strings.Split(os.Getenv("GITHUB_REPOS"), ",")
 	}
@@ -67,9 +75,6 @@ func (c *Config) validate() []error {
 	if c.GitHubToken == "" {
 		errors = append(errors, fmt.Errorf("GitHub token cannot be empty"))
 	}
-	if len(c.GitHubRepos) == 0 {
-		errors = append(errors, fmt.Errorf("GitHub repos cannot be empty"))
-	}
 	if c.SlackToken == "" {
 		errors = append(errors, fmt.Errorf("Slack token cannot be empty"))
 	}
@@ -86,14 +91,16 @@ func configHelp() {
 	fmt.Fprintln(os.Stderr, "\nThe configuration file (--config) looks like this:")
 
 	exampleConfig := &Config{
-		GitHubToken:   "secret_token",
-		GitHubRepos:   []string{"user1/repo1", "user2/repo1"},
-		GitLabToken:   "secret_token",
-		GitLabRepos:   []string{"project1/repo1", "project2/repo1"},
-		GitlabURL:     "https://www.example.com",
-		SlackToken:    "secret_token",
-		SlackChannel:  "myteamchat",
-		UserWhiteList: []string{"user1", "user2"},
+		GitHubToken:         "secret_token",
+		GitHubOrganisations: []string{"facebook"},
+		GitHubUsers:         []string{"stojg"},
+		GitHubRepos:         []string{"user1/repo1", "user2/repo1"},
+		GitLabToken:         "secret_token",
+		GitLabRepos:         []string{"project1/repo1", "project2/repo1"},
+		GitlabURL:           "https://www.example.com",
+		SlackToken:          "secret_token",
+		SlackChannel:        "myteamchat",
+		UserWhiteList:       []string{"user1", "user2"},
 	}
 	b, err := json.MarshalIndent(exampleConfig, "", "  ")
 	if err != nil {
@@ -103,6 +110,8 @@ func configHelp() {
 
 	fmt.Fprint(os.Stderr, "The above configuration can be overridden with ENV variables:\n\n")
 	fmt.Fprintln(os.Stderr, " * GITHUB_TOKEN")
+	fmt.Fprintln(os.Stderr, " * GITHUB_ORGANISATIONS - comma separated list")
+	fmt.Fprintln(os.Stderr, " * GITHUB_USERS - comma separated list")
 	fmt.Fprintln(os.Stderr, " * GITHUB_REPOS - comma separated list")
 	fmt.Fprintln(os.Stderr, " * GITLAB_TOKEN")
 	fmt.Fprintln(os.Stderr, " * GITLAB_URL")

main.go

@@ -108,27 +108,40 @@ func trawlGitHub(conf *Config) <-chan *PullRequest {
 	tc := oauth2.NewClient(oauth2.NoContext, ts)
 	client := github.NewClient(tc)
 
-	// check for wildcards in the repo name and expand them into individual repos
 	var repos []string
-	for _, repoName := range conf.GitHubRepos {
-		repoParts := strings.Split(repoName, "/")
-		if len(repoParts) != 2 {
-			logrus.Errorf("%s is not a valid GitHub repository\n", repoName)
+
+	// check for a organisation and all it's repositories
+	for _, organisationName := range conf.GitHubOrganisations {
+		// first try listing by organisation
+		allRepos, _, err := client.Repositories.ListByOrg(context.Background(), organisationName, nil)
+		if err != nil {
+			logrus.Errorf("Failed getting repositories for organisation %s: %v", organisationName, err)
 			continue
 		}
-		if repoParts[1] != "*" {
-			repos = append(repos, repoName)
-			continue
+		for i := range allRepos {
+			repos = append(repos, *allRepos[i].FullName)
 		}
-		logrus.Debugf("expanding wildcard on %s", repoName)
-		allRepos, _, err := client.Repositories.List(context.Background(), repoParts[0], nil)
+	}
+
+	for _, user := range conf.GitHubUsers {
+		// first try listing by organisation
+		allRepos, _, err := client.Repositories.List(context.Background(), user, nil)
 		if err != nil {
-			logrus.Error(err)
+			logrus.Errorf("Failed getting repositories for organisation %s: %v", user, err)
 			continue
 		}
 		for i := range allRepos {
-			repos = append(repos, fmt.Sprintf("%s/%s", repoParts[0], *allRepos[i].Name))
+			repos = append(repos, *allRepos[i].FullName)
+		}
+	}
+
+	for _, repoName := range conf.GitHubRepos {
+		repoParts := strings.Split(repoName, "/")
+		if len(repoParts) != 2 {
+			logrus.Errorf("%s is not a valid GitHub repository\n", repoName)
+			continue
 		}
+		repos = append(repos, repoName)
 	}
 
 	// spin out each request to find PRs on a repo into a separate goroutine so we fetch them