update wof-create-hooks to use common list repos code; update vendor deps

Author: thisisaaronland

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016, Mapzen
+Copyright (c) 2020, Aaron Straup Cope
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -20,26 +20,44 @@ _All of the webhook tools need some documentation loving..._
 
 #### wof-create-hook
 
-_Please write me_
-
 ```
-./bin/wof-create-hook -token {TOKEN} -hook-url {URL} -hook-secret {SECRET} -org whosonfirst-data -repo whosonfirst-data-venue-us-il
+> ./bin/wof-create-hook -h
+Usage of ./bin/wof-create-hook:
+  -dryrun
+    	Go through the motions but don't create webhooks.
+  -exclude value
+    	Exclude repositories with this prefix
+  -hook-content-type string
+    	The content type for your webhook. (default "json")
+  -hook-secret string
+    	The secret for your webhook.
+  -hook-url string
+    	A valid webhook URL.
+  -org string
+    	The GitHub organization to create webhookd in.
+  -prefix value
+    	Limit repositories to only those with this prefix
+  -token string
+    	A valid GitHub API access token.
 ```
 
-You can also create webhooks for all of the repositories in an organization by passing the `-repo '*'` flag. You can still filter the list of repos by setting the `-prefix` flag.
+For example:
 
 ```
-./bin/wof-create-hook -token {TOKEN} -hook-url {URL} -hook-secret {SECRET} -org whosonfirst-data -repo '*' -prefix whosonfirst-data
-fetching repo list...🕓 
-2017/04/05 15:42:24 webhook already configured for whosonfirst-data, skipping
-2017/04/05 15:42:24 created webhook for whosonfirst-data-venue-us-wv
-2017/04/05 15:42:25 created webhook for whosonfirst-data-venue-us-ne
-2017/04/05 15:42:25 created webhook for whosonfirst-data-venue-us-wi
-2017/04/05 15:42:25 created webhook for whosonfirst-data-venue-us-nv
-2017/04/05 15:42:25 created webhook for whosonfirst-data-venue-us-ar
-2017/04/05 15:42:25 created webhook for whosonfirst-data-venue-us-ms
-
-...and so on
+$> ./bin/wof-create-hook -org sfomuseum-data -hook-secret {SECRET} -hook-url {WEBHOOK_URL} -prefix sfomuseum-data -exclude sfomuseum-data-flights -exclude sfomuseum-data-faa -token {GITHUB_TOKEN}
+2020/09/08 16:46:17 created webhook for sfomuseum-data-whosonfirst
+2020/09/08 16:46:18 created webhook for sfomuseum-data-publicart
+2020/09/08 16:46:19 created webhook for sfomuseum-data-architecture
+2020/09/08 16:46:20 created webhook for sfomuseum-data-maps
+2020/09/08 16:46:21 created webhook for sfomuseum-data-exhibition
+2020/09/08 16:46:22 created webhook for sfomuseum-data-enterprise
+2020/09/08 16:46:23 created webhook for sfomuseum-data-aircraft
+2020/09/08 16:46:24 created webhook for sfomuseum-data-media
+2020/09/08 16:46:25 created webhook for sfomuseum-data-media-flickr
+2020/09/08 16:46:26 created webhook for sfomuseum-data-testing
+2020/09/08 16:46:28 created webhook for sfomuseum-data-collection-classifications
+2020/09/08 16:46:29 created webhook for sfomuseum-data-media-collection
+2020/09/08 16:46:29 created webhook for sfomuseum-data-collection
 ```
 
 #### wof-list-hooks

cmd/wof-create-hook/main.go

@@ -9,25 +9,29 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/briandowns/spinner"
 	"github.com/google/go-github/v27/github"
+	"github.com/sfomuseum/go-flags/multi"
+	"github.com/whosonfirst/go-whosonfirst-github/organizations"
 	"github.com/whosonfirst/go-whosonfirst-github/util"
 	"log"
-	"strings"
-	"time"
 )
 
 func main() {
 
-	org := flag.String("org", "", "")
-	repo := flag.String("repo", "", "")
-	token := flag.String("token", "", "...")
-	prefix := flag.String("prefix", "", "Limit repositories to only those with this prefix")
+	org := flag.String("org", "", "The GitHub organization to create webhookd in.")
+	token := flag.String("token", "", "A valid GitHub API access token.")
 
-	// name := flag.String("hook-name", "web", "")
-	url := flag.String("hook-url", "", "")
-	content_type := flag.String("hook-content-type", "json", "")
-	secret := flag.String("hook-secret", "", "")
+	url := flag.String("hook-url", "", "A valid webhook URL.")
+	content_type := flag.String("hook-content-type", "json", "The content type for your webhook.")
+	secret := flag.String("hook-secret", "", "The secret for your webhook.")
+
+	var prefix multi.MultiString
+	flag.Var(&prefix, "prefix", "Limit repositories to only those with this prefix")
+
+	var exclude multi.MultiString
+	flag.Var(&exclude, "exclude", "Exclude repositories with this prefix")
+
+	dryrun := flag.Bool("dryrun", false, "Go through the motions but don't create webhooks.")
 
 	flag.Parse()
 
@@ -41,119 +45,68 @@ func main() {
 		log.Fatal(err)
 	}
 
-	config := make(map[string]interface{})
+	hook_config := make(map[string]interface{})
 
-	config["url"] = *url
-	config["content_type"] = *content_type
-	config["secret"] = *secret
+	hook_config["url"] = *url
+	hook_config["content_type"] = *content_type
+	hook_config["secret"] = *secret
 
 	hook := github.Hook{
 		// Name:   name,
-		Config: config,
+		Config: hook_config,
 	}
 
-	if *repo == "" {
-
-		_, _, err = client.Organizations.CreateHook(ctx, *org, &hook)
-
-		if err != nil {
-			log.Fatal(err)
-		}
-
-	} else {
-
-		has_hook := make(map[string]bool)
-
-		repos := make([]string, 0)
-
-		if *repo == "*" {
-
-			done := make(chan bool)
-
-			go func() {
-
-				sp := spinner.New(spinner.CharSets[38], 200*time.Millisecond)
-				sp.Prefix = "fetching repo list..."
-				sp.Start()
-
-				for {
-
-					select {
-					case <-done:
-						sp.Stop()
-						return
-					}
-				}
-			}()
-
-			repos_opts := &github.RepositoryListByOrgOptions{
-				ListOptions: github.ListOptions{PerPage: 100},
-			}
-
-			for {
+	opts := organizations.NewDefaultListOptions()
 
-				repos_list, repos_rsp, err := client.Repositories.ListByOrg(ctx, *org, repos_opts)
+	opts.Prefix = prefix
+	opts.Exclude = exclude
+	// opts.Forked = *forked
+	// opts.NotForked = *not_forked
+	opts.AccessToken = *token
 
-				if err != nil {
-					log.Fatal(err)
-				}
+	repos, err := organizations.ListRepos(*org, opts)
 
-				for _, r := range repos_list {
-
-					if *prefix != "" && !strings.HasPrefix(*r.Name, *prefix) {
-						continue
-					}
-
-					repos = append(repos, *r.Name)
-
-					hooks_opts := github.ListOptions{PerPage: 100}
+	if err != nil {
+		log.Fatal(err)
+	}
 
-					hooks, _, err := client.Repositories.ListHooks(ctx, *org, *r.Name, &hooks_opts)
+	for _, r := range repos {
 
-					if err != nil {
-						log.Fatal(err)
-					}
+		has_hook := false
 
-					for _, h := range hooks {
+		hooks_opts := github.ListOptions{PerPage: 100}
 
-						if h.Config["url"] == *url {
-							has_hook[*r.Name] = true
-							break
-						}
-					}
+		hooks, _, err := client.Repositories.ListHooks(ctx, *org, r, &hooks_opts)
 
-				}
+		if err != nil {
+			log.Fatal(err)
+		}
 
-				if repos_rsp.NextPage == 0 {
-					break
-				}
+		for _, h := range hooks {
 
-				repos_opts.ListOptions.Page = repos_rsp.NextPage
+			if h.Config["url"] == *url {
+				has_hook = true
+				break
 			}
-
-			done <- true
-
-		} else {
-			repos = append(repos, *repo)
 		}
 
-		for _, r := range repos {
-
-			_, ok := has_hook[r]
-
-			if ok {
-				log.Println(fmt.Sprintf("webhook already configured for %s, skipping", r))
-				continue
-			}
+		if has_hook {
+			log.Println(fmt.Sprintf("webhook already configured for %s, skipping", r))
+			continue
+		}
 
-			_, _, err = client.Repositories.CreateHook(ctx, *org, r, &hook)
+		if *dryrun {
+			log.Printf("Create Webhook for %s\n", r)
+			continue
+		}
 
-			if err != nil {
-				log.Fatal(err)
-			}
+		_, _, err = client.Repositories.CreateHook(ctx, *org, r, &hook)
 
-			log.Println(fmt.Sprintf("created webhook for %s", r))
+		if err != nil {
+			log.Fatal(err)
 		}
+
+		log.Println(fmt.Sprintf("created webhook for %s", r))
 	}
 
 }

go.mod

@@ -5,7 +5,7 @@ go 1.12
 require (
 	github.com/briandowns/spinner v1.11.1
 	github.com/google/go-github/v27 v27.0.6
-	github.com/sfomuseum/go-flags v0.3.1
+	github.com/sfomuseum/go-flags v0.4.1
 	github.com/whosonfirst/iso8601duration v0.0.0-20150204201828-8da3af7a2a61
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
+	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
 )