5 files changed, 0 insertions, 185 deletions

diff --git a/util/file.go b/util/file.go
deleted file mode 100644
index b6fc86f..0000000
--- a/util/file.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package util
-
-import (
-        "io"
-        "io/ioutil"
-)
-
-func WriteReaderToFile(filename string, data io.Reader) error {
-        d, err := ioutil.ReadAll(data)
-        if err != nil {
-                return err
-        }
-
-        if err = ioutil.WriteFile(filename, d, 0644); err != nil {
-                return err
-        }
-
-        return nil
-}
diff --git a/util/gin.go b/util/gin.go
deleted file mode 100644
index 9bba6ee..0000000
--- a/util/gin.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package util
-
-import (
-        "context"
-        "log"
-        "net"
-        "net/http"
-        "os"
-        "os/signal"
-
-        "github.com/gin-gonic/gin"
-)
-
-// Copied from: https://github.com/gin-gonic/gin/blob/59ab588bf597f9f41faee4f217b5659893c2e925/utils.go#L137
-func resolveAddress(addr []string) string {
-        switch len(addr) {
-        case 0:
-                if port := os.Getenv("PORT"); port != "" {
-                        log.Printf("Environment variable PORT=\"%s\"", port)
-                        return ":" + port
-                }
-                log.Printf("Environment variable PORT is undefined. Using port :8080 by default")
-                return ":8080"
-        case 1:
-                return addr[0]
-        default:
-                panic("too many parameters")
-        }
-}
-
-// Runs a gin.Engine instance in a way that can be canceled by an SIGINT
-func GinRun(e *gin.Engine, debug bool, a ...string) {
-        if debug {
-                gin.SetMode(gin.DebugMode)
-        } else {
-                gin.SetMode(gin.ReleaseMode)
-        }
-
-        srv := &http.Server{
-                Addr:    resolveAddress(a),
-                Handler: e,
-        }
-
-        idleConnsClosed := make(chan struct{})
-
-        go func() {
-                sigint := make(chan os.Signal, 1)
-                signal.Notify(sigint, os.Interrupt)
-                <-sigint
-
-                log.Println("Caught SIGINT, shutting down")
-                if err := srv.Shutdown(context.Background()); err != nil {
-                        log.Printf("HTTP server Shutdown: %v", err)
-                }
-
-                close(idleConnsClosed)
-        }()
-
-        log.Printf("Listening and serving HTTP on %s\n", srv.Addr)
-        if err := srv.ListenAndServe(); err != http.ErrServerClosed {
-                log.Fatalf("HTTP server ListenAndServe: %v", err)
-        }
-
-        <-idleConnsClosed
-}
-
-func GetRequestIP(c *gin.Context) net.IP {
-        if xff := c.Request.Header.Get("X-Forwarded-For"); xff != "" {
-                return ParseIP(xff)
-        }
-        return ParseIP(c.Request.RemoteAddr)
-}
diff --git a/util/http.go b/util/http.go
deleted file mode 100644
index 31cd94d..0000000
--- a/util/http.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package util
-
-import (
-        "fmt"
-        "net/http"
-        "net/url"
-)
-
-func MakeURL(r *http.Request, path string, subs ...interface{}) *url.URL {
-        scheme := "https"
-        if r.TLS == nil {
-                scheme = "http"
-        }
-
-        // Always defer to whatever the proxy told us it was doing because this
-        // could be a mullet-VIP in either direction.
-        if fwProto := r.Header.Get("X-Forwarded-Proto"); fwProto != "" {
-                scheme = fwProto
-        }
-
-        return &url.URL{
-                Scheme: scheme,
-                Host:   r.Host,
-                Path:   fmt.Sprintf(path, subs...),
-        }
-}
diff --git a/util/ip.go b/util/ip.go
deleted file mode 100644
index 239973a..0000000
--- a/util/ip.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package util
-
-import (
-        "net"
-        "regexp"
-)
-
-// Matches:
-//  - IPv4: 192.168.1.1
-//  - IPv4 + Port: 192.168.1.1:2020
-//  - IPv6 + Port: [fe80::551f:5aff:49cf:13e4]:2020
-//  - IPv6: fe80::551f:5aff:49cf:13e4
-//
-// Return Order: []string{matched, IPv4, IPv6 (port notation), IPv6 (raw notation), Port
-var ipRegexp = regexp.MustCompile(`(?:((?:\d+\.){3}\d+)|\[([^\]]+)\]|([0-9a-f:]+))(?::(\d+))?`)
-
-func ParseIP(s string) net.IP {
-        ips := ipRegexp.FindStringSubmatch(s)
-        if ips == nil {
-                return nil
-        }
-
-        if ips[1] != "" {
-                return net.ParseIP(ips[1])
-        } else if ips[2] != "" {
-                return net.ParseIP(ips[2])
-        } else if ips[3] != "" {
-                return net.ParseIP(ips[3])
-        } else {
-                return nil
-        }
-}
diff --git a/util/viper.go b/util/viper.go
deleted file mode 100644
index 0f08a6c..0000000
--- a/util/viper.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package util
-
-import (
-        "strings"
-
-        "github.com/spf13/cobra"
-        "github.com/spf13/viper"
-)
-
-type ViperWrap struct {
-        cmd *cobra.Command
-}
-
-func WrapViper(cmd *cobra.Command, prefix string) *ViperWrap {
-        viper.SetEnvPrefix(prefix)
-        viper.AutomaticEnv()
-        return &ViperWrap{cmd}
-}
-
-func (v *ViperWrap) bindViper(name, short string, defaultv interface{}, help string) {
-        vname := strings.ReplaceAll(name, "-", "_")
-        viper.BindPFlag(vname, v.cmd.Flags().Lookup(name))
-        viper.SetDefault(vname, defaultv)
-}
-
-func (v *ViperWrap) BindString(name, short, defaultv, help string) *ViperWrap {
-        v.cmd.Flags().StringP(name, short, defaultv, help)
-        v.bindViper(name, short, defaultv, help)
-        return v
-}
-
-func (v *ViperWrap) BindBool(name, short string, defaultv bool, help string) *ViperWrap {
-        v.cmd.Flags().BoolP(name, short, defaultv, help)
-        v.bindViper(name, short, defaultv, help)
-        return v
-}