k8s deployment updates

Author: jirfag

.dockerignore

@@ -0,0 +1 @@
+/vendor/

build.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -exu
+
+# if [[ `git status --porcelain` ]]; then
+#     echo has git changes;
+#     echo exit 1;
+# fi
+
+GO111MODULE=on GOOS=linux CGO_ENABLED=0 GOARCH=amd64 \
+    go build \
+    -ldflags "-s -w -X 'main.version=$(git name-rev --tags --name-only $(git rev-parse HEAD))' -X 'main.commit=$(git rev-parse --short HEAD)' -X 'main.date=$(date)'" \
+    -o golangci-${1} \
+    ./cmd/golangci-${1}/main.go

internal/api/session/factory.go

@@ -1,7 +1,6 @@
 package session
 
 import (
-	"strings"
 	"time"
 
 	"github.com/garyburd/redigo/redis"
@@ -16,7 +15,12 @@ type Factory struct {
 }
 
 func NewFactory(redisPool *redis.Pool, cfg config.Config, maxAge time.Duration) (*Factory, error) {
-	store, err := redistore.NewRediStoreWithPool(redisPool, []byte(cfg.GetString("SESSION_SECRET")))
+	sessSecret := cfg.GetString("SESSION_SECRET")
+	if sessSecret == "" {
+		return nil, errors.New("SESSION_SECRET isn't set")
+	}
+
+	store, err := redistore.NewRediStoreWithPool(redisPool, []byte(sessSecret))
 	if err != nil {
 		return nil, errors.Wrap(err, "can't create redis session store")
 	}
@@ -34,13 +38,7 @@ func NewFactory(redisPool *redis.Pool, cfg config.Config, maxAge time.Duration)
 }
 
 func (f *Factory) updateOptions() {
-	// https for dev/prod, http for testing
-	d := strings.TrimPrefix(f.cfg.GetString("WEB_ROOT"), "https://")
-	d = strings.TrimPrefix(d, "http://")
-	if strings.HasPrefix(d, "127.0.0.1") { // test mocking
-		d = "" // prevent warnings
-	}
-	f.store.Options.Domain = d
+	f.store.Options.Domain = f.cfg.GetString("COOKIE_DOMAIN")
 	// TODO: set httponly and secure for non-testing
 }
 

internal/shared/db/gormdb/gormdb.go

@@ -2,6 +2,7 @@ package gormdb
 
 import (
 	"database/sql"
+	"fmt"
 	"strings"
 
 	"github.com/golangci/golangci-api/internal/shared/config"
@@ -13,12 +14,21 @@ import (
 
 func GetDBConnString(cfg config.Config) (string, error) {
 	dbURL := cfg.GetString("DATABASE_URL")
-	if dbURL == "" {
-		return "", errors.New("no DATABASE_URL in config")
+	if dbURL != "" {
+		dbURL = strings.Replace(dbURL, "postgresql", "postgres", 1)
+		return dbURL, nil
 	}
 
-	dbURL = strings.Replace(dbURL, "postgresql", "postgres", 1)
-	return dbURL, nil
+	host := cfg.GetString("DATABASE_HOST")
+	username := cfg.GetString("DATABASE_USERNAME")
+	password := cfg.GetString("DATABASE_PASSWORD")
+	name := cfg.GetString("DATABASE_NAME")
+	if host == "" || username == "" || password == "" || name == "" {
+		return "", errors.New("no DATABASE_URL or DATABASE_{HOST,USERNAME,PASSWORD,NAME} in config")
+	}
+
+	//TODO: enable SSL, but it's not critical
+	return fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=disable", username, password, host, name), nil
 }
 
 func GetDB(cfg config.Config, log logutil.Log, connString string) (*gorm.DB, error) {
@@ -30,13 +40,17 @@ func GetDB(cfg config.Config, log logutil.Log, connString string) (*gorm.DB, err
 		}
 	}
 	adapter := strings.Split(connString, "://")[0]
+	isDebug := cfg.GetBool("DEBUG_DB", false)
+	if isDebug {
+		log.Infof("Connecting to database %s", connString)
+	}
 
 	db, err := gorm.Open(adapter, connString)
 	if err != nil {
 		return nil, errors.Wrap(err, "can't open db connection")
 	}
 
-	if cfg.GetBool("DEBUG_DB", false) {
+	if isDebug {
 		db = db.Debug()
 	}
 

internal/shared/db/migrations/runner.go

@@ -11,18 +11,18 @@ import (
 )
 
 type Runner struct {
-	distLock     *redsync.Mutex
-	log          logutil.Log
-	dbConnString string
-	projectRoot  string
+	distLock       *redsync.Mutex
+	log            logutil.Log
+	dbConnString   string
+	migrationsPath string
 }
 
-func NewRunner(distLock *redsync.Mutex, log logutil.Log, dbConnString, projectRoot string) *Runner {
+func NewRunner(distLock *redsync.Mutex, log logutil.Log, dbConnString, migrationsPath string) *Runner {
 	return &Runner{
-		distLock:     distLock,
-		log:          log,
-		dbConnString: dbConnString,
-		projectRoot:  projectRoot,
+		distLock:       distLock,
+		log:            log,
+		dbConnString:   dbConnString,
+		migrationsPath: migrationsPath,
 	}
 }
 
@@ -33,7 +33,7 @@ func (r Runner) Run() error {
 	}
 	defer r.distLock.Unlock()
 
-	migrationsDir := fmt.Sprintf("file://%s/migrations", r.projectRoot)
+	migrationsDir := fmt.Sprintf("file://%s", r.migrationsPath)
 	m, err := migrate.New(migrationsDir, r.dbConnString)
 	if err != nil {
 		return errors.Wrap(err, "can't initialize migrations")

internal/shared/db/redis/pool.go

@@ -1,6 +1,7 @@
 package redis
 
 import (
+	"errors"
 	"fmt"
 	"time"
 
@@ -9,9 +10,9 @@ import (
 )
 
 func GetPool(cfg config.Config) (*redis.Pool, error) {
-	redisURL := cfg.GetString("REDIS_URL")
-	if redisURL == "" {
-		return nil, fmt.Errorf("config REDIS_URL isn't set")
+	redisURL, err := GetURL(cfg)
+	if err != nil {
+		return nil, err
 	}
 
 	return &redis.Pool{
@@ -26,3 +27,17 @@ func GetPool(cfg config.Config) (*redis.Pool, error) {
 		},
 	}, nil
 }
+
+func GetURL(cfg config.Config) (string, error) {
+	if redisURL := cfg.GetString("REDIS_URL"); redisURL != "" {
+		return redisURL, nil
+	}
+
+	host := cfg.GetString("REDIS_HOST")
+	password := cfg.GetString("REDIS_PASSWORD")
+	if host == "" || password == "" {
+		return "", errors.New("no REDIS_URL or REDIS_{HOST,PASSWORD} in config")
+	}
+
+	return fmt.Sprintf("redis://h:%s@%s", password, host), nil
+}

pkg/api/app.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golangci/golangci-api/internal/shared/fsutil"
 	"github.com/golangci/golangci-api/pkg/api/policy"
 	"github.com/golangci/golangci-api/pkg/worker/analyze/analyzesqueue"
 	"github.com/golangci/golangci-api/pkg/worker/analyze/analyzesqueue/pullanalyzesqueue"
@@ -183,7 +182,11 @@ func (a *App) buildDeps() {
 	}
 
 	if a.cache == nil {
-		a.cache = cache.NewRedis(a.cfg.GetString("REDIS_URL") + "/1")
+		redisURL, err := redis.GetURL(a.cfg)
+		if err != nil {
+			a.log.Fatalf("Can't get redis URL: %s", err)
+		}
+		a.cache = cache.NewRedis(redisURL + "/1")
 	}
 
 	if a.authorizer == nil {
@@ -351,7 +354,7 @@ func (a *App) buildMigrationsRunner() {
 		a.log.Fatalf("Can't get DB conn string: %s", err)
 	}
 	a.migrationsRunner = migrations.NewRunner(a.distLockFactory.NewMutex("migrations"), a.trackedLog,
-		dbConnString, fsutil.GetProjectRoot())
+		dbConnString, a.cfg.GetString("MIGRATIONS_PATH"))
 }
 
 func NewApp(modifiers ...Modifier) *App {