Merge branch 'master' into taskcluster-support

mozilla-services · Mar 23, 2020 · 8c0d3b9 · 8c0d3b9
2 parents 5ea72ab + 6e2c7a9
commit 8c0d3b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/main.go b/main.go
@@ -84,17 +84,19 @@ func main() {
 			return cli.NewExitError(err.Error(), 1)
 		}
 
-		handler := proxyservice.NewDockerHubWebhookHandler(
-			proxyservice.NewJenkins(
-				c.String("jenkins-base-url"),
-				c.String("jenkins-user"),
-				c.String("jenkins-password"),
-			),
+		jenkins := proxyservice.NewJenkins(
+			c.String("jenkins-base-url"),
+			c.String("jenkins-user"),
+			c.String("jenkins-password"),
+		)
+
+		dockerhubHandler := proxyservice.NewDockerHubWebhookHandler(
+			jenkins,
 			c.StringSlice("valid-namespace")...,
 		)
 
 		mux := http.NewServeMux()
-		mux.Handle("/dockerhub", handler)
+		mux.Handle("/dockerhub", dockerhubHandler)
 		mux.HandleFunc("/__heartbeat__", func(w http.ResponseWriter, req *http.Request) {
 			w.Write([]byte("OK"))
 		})

diff --git a/proxyservice/handlers.go → proxyservice/dockerhub_handler.go b/proxyservice/handlers.go → proxyservice/dockerhub_handler.go