Merge pull request #473 from vitessio/remove-ghapp-server

docker-compose.prod.yml

@@ -23,13 +23,11 @@ services:
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
       - "--entrypoints.https.address=:443"
-      - "--entrypoints.https-ghapp.address=:8181"
       - "--certificatesresolvers.tlsresolver.acme.tlschallenge=true"
       - "--certificatesresolvers.tlsresolver.acme.email=cncf-vitess-project@cncf.io"
       - "--certificatesresolvers.tlsresolver.acme.storage=/letsencrypt/acme.json"
     ports:
       - "443:443"
-      - "8181:8181"
     volumes:
       - "/var/letsencrypt:/letsencrypt"
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
@@ -71,21 +69,3 @@ services:
       - "traefik.http.routers.api.tls.certresolver=tlsresolver"
       - "traefik.http.services.api.loadbalancer.server.port=8080"
     network_mode: bridge
-
-  ghapp:
-    restart: always
-    build:
-      context: .
-      dockerfile: Dockerfile.ghapp
-    image: "arewefastyet-ghapp"
-    container_name: "ghapp"
-    volumes:
-      - "./config/prod/config.yaml:/config/config.yaml"
-      - "./config/prod/secrets.yaml:/config/secrets.yaml"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.ghapp.rule=Host(`benchmark.vitess.io`)"
-      - "traefik.http.routers.ghapp.entrypoints=https-ghapp"
-      - "traefik.http.routers.ghapp.tls.certresolver=tlsresolver"
-      - "traefik.http.services.ghapp.loadbalancer.server.port=8181"
-    network_mode: bridge

docker-compose.yml

@@ -53,24 +53,6 @@ services:
       - "traefik.http.services.api.loadbalancer.server.port=8080"
     network_mode: bridge
 
-  ghapp:
-    restart: always
-    build:
-      context: .
-      dockerfile: Dockerfile.ghapp
-    image: "arewefastyet-ghapp"
-    container_name: "ghapp"
-    volumes:
-      - "./config/dev/config.yaml:/config/config.yaml"
-      - "./config/dev/secrets.yaml:/config/secrets.yaml"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.ghapp.rule=Host(`localhost`)"
-      - "traefik.http.routers.ghapp.rule=PathPrefix(`/ghapp`)"
-      - "traefik.http.routers.ghapp.entrypoints=http"
-      - "traefik.http.services.ghapp.loadbalancer.server.port=8181"
-    network_mode: bridge
-
   frontend:
     build:
       context: ./website

docs/arewefastyet.md

@@ -20,7 +20,6 @@ Vitess has to ensure it's delivering flawless performance to its users. In order
 * [arewefastyet completion](arewefastyet_completion.md)	 - Generate the autocompletion script for the specified shell
 * [arewefastyet exec](arewefastyet_exec.md)	 - Execute a task
 * [arewefastyet gen](arewefastyet_gen.md)	 - Generate things
-* [arewefastyet ghapp](arewefastyet_ghapp.md)	 - Starts the arewefastyet GitHub bot
 * [arewefastyet macrobench](arewefastyet_macrobench.md)	 - Top level command to manage macrobenchmarks
 * [arewefastyet microbench](arewefastyet_microbench.md)	 - Top level command to manage microbenchmarks
 

go.mod

@@ -17,7 +17,6 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/otiai10/copy v1.12.0
 	github.com/palantir/go-githubapp v0.18.0
-	github.com/pkg/errors v0.9.1
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/rs/zerolog v1.29.1
@@ -95,6 +94,7 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/philhofer/fwd v1.1.2 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.16.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect

go/cmd/root.go

@@ -25,7 +25,6 @@ import (
 	"github.com/vitessio/arewefastyet/go/cmd/api"
 	"github.com/vitessio/arewefastyet/go/cmd/exec"
 	"github.com/vitessio/arewefastyet/go/cmd/gen"
-	"github.com/vitessio/arewefastyet/go/cmd/ghapp"
 	"github.com/vitessio/arewefastyet/go/cmd/macrobench"
 	"github.com/vitessio/arewefastyet/go/cmd/microbench"
 
@@ -68,7 +67,6 @@ func init() {
 	rootCmd.AddCommand(macrobench.MacroBenchCmd())
 	rootCmd.AddCommand(exec.ExecCmd())
 	rootCmd.AddCommand(gen.GenCmd())
-	rootCmd.AddCommand(ghapp.GHAppCmd())
 }
 
 // initConfig reads in config file and ENV variables if set.

go/tools/github/github.go

@@ -20,7 +20,6 @@ package github
 
 import (
 	"context"
-	"net/http"
 	"os"
 	"time"
 
@@ -68,29 +67,6 @@ func (a *App) AddToCommand(cmd *cobra.Command) {
 	_ = viper.BindPFlag(flagInstallationID, cmd.Flags().Lookup(flagInstallationID))
 }
 
-func (a *App) Run() error {
-	prHandler := pullRequestHandler{
-		ClientCreator: a.cc,
-	}
-
-	webhookHandler := githubapp.NewEventDispatcher(
-		[]githubapp.EventHandler{prHandler},
-		a.webHookSecret,
-		githubapp.WithScheduler(
-			githubapp.AsyncScheduler(),
-		),
-	)
-
-	http.Handle("/ghapp"+githubapp.DefaultWebhookRoute, webhookHandler)
-
-	a.logger.Info().Msg("server running")
-	err := http.ListenAndServe(":"+a.port, webhookHandler)
-	if err != nil {
-		a.logger.Error().Err(err).Msg("failed to start server")
-	}
-	return err
-}
-
 func (a *App) Init() error {
 	// Create an authenticated client using go-githubapp
 	config := githubapp.Config{