Tidying, add redirection option

README.md

@@ -13,11 +13,27 @@ $ github-release-redirector -port 1234 -repo user/repo
 or using docker:
 
 ```console
-$ docker run -p 8080 csmith/github-release-redirector -repo user/repo
+$ docker run -p 8080:8080 csmith/github-release-redirector -repo user/repo
+```
+
+## Options
+
+```
+Usage of github-release-redirector:
+  -port int
+    	the port to listen on for HTTP requests (default 8080)
+  -redirect string
+    	if specified, requests for / will be redirected to this url
+  -repo string
+    	the repository to redirect releases for, in user/repo format [required]
 ```
 
 ## Notes
 
+If the `-redirect` option is specified, then requests to the root (i.e. `/`)
+will be redirected to that URL, and no further processing will be done for
+that request.
+
 Releases are refreshed at startup and then once an hour.
 
 Assets are matched on their name, so an asset attached to the latest release

main.go

@@ -17,6 +17,7 @@ import (
 var (
 	owner string
 	repo string
+	redirect *string
 	ctx context.Context
 	client *github.Client
 	release *github.RepositoryRelease
@@ -31,7 +32,17 @@ func fetchLatest() {
 	release = latest
 }
 
+func temporaryRedirect(w http.ResponseWriter, url string) {
+	w.Header().Add("Location", url)
+	w.WriteHeader(http.StatusTemporaryRedirect)
+}
+
 func serve(w http.ResponseWriter, request *http.Request) {
+	if "/" == request.RequestURI && len(*redirect) > 0 {
+		temporaryRedirect(w, *redirect)
+		return
+	}
+
 	if release == nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		_, _ = fmt.Fprint(w, "Unknown release")
@@ -40,8 +51,7 @@ func serve(w http.ResponseWriter, request *http.Request) {
 
 	for _, asset := range release.Assets {
 		if "/" + *asset.Name == request.RequestURI {
-			w.Header().Add("Location", *asset.BrowserDownloadURL)
-			w.WriteHeader(http.StatusTemporaryRedirect)
+			temporaryRedirect(w, *asset.BrowserDownloadURL)
 			return
 		}
 	}
@@ -50,20 +60,32 @@ func serve(w http.ResponseWriter, request *http.Request) {
 	_, _ = fmt.Fprint(w, "Asset not found in release ", *release.Name)
 }
 
+func parseRepo(fullRepo *string) error {
+	if len(*fullRepo) == 0 {
+		return fmt.Errorf("the repository option must be specified")
+	}
+	if strings.Count(*fullRepo, "/") != 1 {
+		return fmt.Errorf("the repository must be specified in `user/repo` format")
+	}
+	repoParts := strings.Split(*fullRepo, "/")
+	owner = repoParts[0]
+	repo = repoParts[1]
+	return nil
+}
+
 func main() {
-	var fullRepo = flag.String("repo", "", "the repository to redirect releases for, in user/repo format")
+	redirect = flag.String("redirect", "", "if specified, requests for / will be redirected to this url")
+	var fullRepo = flag.String("repo", "", "the repository to redirect releases for, in user/repo format [required]")
 	var port = flag.Int("port", 8080, "the port to listen on for HTTP requests")
+
 	flag.Parse()
 
-	if strings.Count(*fullRepo, "/") != 1 {
-		log.Println("Repository must be specified in user/repo format")
+	if err := parseRepo(fullRepo); err != nil {
+		_, _ = fmt.Fprintf(os.Stderr, "Error: %s\n\n", err.Error())
+		flag.Usage()
 		return
 	}
 
-	repoParts := strings.Split(*fullRepo, "/")
-	owner = repoParts[0]
-	repo = repoParts[1]
-
 	client = github.NewClient(nil)
 
 	ticker := time.NewTicker(time.Hour)