make db configurable

Author: jhrv

Dockerfile

@@ -0,0 +1,16 @@
+FROM golang:1.13-alpine as builder
+RUN apk add --no-cache git make
+ENV GOOS=linux
+ENV CGO_ENABLED=0
+ENV GO111MODULE=on
+COPY . /src
+WORKDIR /src
+RUN rm -f go.sum
+RUN make test
+RUN make alpine
+
+FROM alpine:3.11
+RUN apk add --no-cache ca-certificates git curl
+WORKDIR /app
+COPY --from=builder /src/bin/apiserver /app/apiserver
+CMD ["/app/apiserver"]

Makefile

@@ -0,0 +1,9 @@
+.PHONY: test alpine
+
+all: test alpine
+
+alpine:
+	go build -a -installsuffix cgo -o bin/apiserver cmd/apiserver/main.go
+
+test:
+	go test ./... -count=1

cmd/apiserver/main.go

@@ -6,9 +6,29 @@ import (
 	"fmt"
 	"net/http"
 
+	log "github.com/sirupsen/logrus"
+	flag "github.com/spf13/pflag"
+
 	_ "github.com/lib/pq"
 )
 
+var (
+	dbUser     string
+	dbPassword string
+	dbHost     string
+	dbName     string
+)
+
+func init() {
+	log.SetFormatter(&log.JSONFormatter{})
+
+	flag.StringVar(&dbName, "db-name", getEnv("DB_NAME", "postgres"), "database name")
+	flag.StringVar(&dbUser, "db-user", getEnv("DB_USER", "postgres"), "database username")
+	flag.StringVar(&dbPassword, "db-password", os.Getenv("DB_PASSWORD"), "database password")
+	flag.StringVar(&dbHost, "db-hostname", getEnv("DB_HOST", "localhost"), "database hostname")
+	flag.Parse()
+}
+
 type Client struct {
 	PSK string `json:"psk"`
 	Peer
@@ -24,12 +44,20 @@ type GatewayResponse struct {
 }
 
 func main() {
-	http.HandleFunc("/gateways/gw0", func(w http.ResponseWriter, _ *http.Request) {
+	http.HandleFunc("/gateways/gw0", gatewayConfigHandler())
+
+	bindAddr := fmt.Sprintf("%s:%d", "127.0.0.1", 6969)
+	fmt.Println("running @", bindAddr)
+	fmt.Println((&http.Server{Addr: bindAddr}).ListenAndServe())
+}
+
+func gatewayConfigHandler() func(w http.ResponseWriter, _ *http.Request) {
+	return func(w http.ResponseWriter, _ *http.Request) {
 		postgresConnection := fmt.Sprintf("user=%s password=%s dbname=%s host=%s sslmode=disable",
-			"postgres",
-			"asdf",
-			"postgres",
-			"localhost")
+			dbUser,
+			dbPassword,
+			dbName,
+			dbHost)
 
 		db, err := sql.Open("postgres", postgresConnection)
 		if err != nil {
@@ -62,9 +90,13 @@ func main() {
 
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(resp)
-	})
+	}
+}
 
-	bindAddr := fmt.Sprintf("%s:%d", "127.0.0.1", 6969)
-	fmt.Println("running @", bindAddr)
-	fmt.Println((&http.Server{Addr: bindAddr}).ListenAndServe())
+func getEnv(key, fallback string) string {
+	if value, ok := os.LookupEnv(key); ok {
+		return value
+	}
+
+	return fallback
 }

go.mod

@@ -0,0 +1,5 @@
+module github.com/nais/device
+
+go 1.13
+
+require github.com/lib/pq v1.3.0

go.sum

@@ -0,0 +1,2 @@
+github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
+github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=

main.go

@@ -0,0 +1 @@
+package naisdevice