🥦 Minor fixes

- add ssl-options
- rewrite tests (remove go-convey)
- increase code coverage
- update to Helium v0.11.11
- update to pg v8.0.4
- update to viper v1.3.2
- update to zap v1.10.0
- replace mellium.im/sasl with github.com/mellium/sasl

Author: im-kulikov

.travis.yml

@@ -1,6 +1,7 @@
 language: go
 go:
   - 1.11.x
+  - 1.12.x
 env:
   - GO111MODULE=on
 install:

go.mod

@@ -1,12 +1,14 @@
 module github.com/go-helium/postgres
 
 require (
-	github.com/go-pg/pg v8.0.1+incompatible
-	github.com/im-kulikov/helium v0.10.1
+	github.com/go-pg/pg v8.0.4+incompatible
+	github.com/im-kulikov/helium v0.11.11
 	github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect
 	github.com/pkg/errors v0.8.1
-	github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa
-	github.com/spf13/viper v1.3.1
-	go.uber.org/zap v1.9.1
+	github.com/spf13/viper v1.3.2
+	github.com/stretchr/testify v1.3.0
+	go.uber.org/zap v1.10.0
 	mellium.im/sasl v0.2.1 // indirect
 )
+
+replace mellium.im/sasl v0.2.1 => github.com/mellium/sasl v0.2.1

go.sum

@@ -12,14 +12,15 @@ import (
 
 type (
 	// Config alias
-	Config = struct {
-		Addr     string
-		User     string
+	Config struct {
+		Hostname string
+		Username string
 		Password string
 		Database string
 		Debug    bool
 		PoolSize int
-		Logger   *zap.SugaredLogger
+		Logger   *zap.Logger
+		Options  map[string]string
 	}
 
 	// Hook is a simple implementation of pg.QueryHook
@@ -28,8 +29,37 @@ type (
 		Before  func(*pg.QueryEvent)
 		After   func(*pg.QueryEvent)
 	}
+
+	// Error is constant error
+	Error string
 )
 
+const (
+	// ErrPemParse when couldn't parse pem in sslrootcert
+	ErrPemParse = Error("couldn't parse pem in sslrootcert")
+	// ErrEmptyConfig when given empty options
+	ErrEmptyConfig = Error("database empty config")
+	// ErrEmptyLogger when logger not initialized
+	ErrEmptyLogger = Error("database empty logger")
+	// ErrSSLKeyHasWorldPermissions when pk permissions no u=rw (0600) or less
+	ErrSSLKeyHasWorldPermissions = Error("private key file has group or world access. Permissions should be u=rw (0600) or less")
+
+	errUnsupportedSSLMode = `unsupported sslmode %q; only "require" (default), "verify-full", "verify-ca", and "disable" supported`
+)
+
+var (
+	// Module is default connection to PostgreSQL
+	Module = module.Module{
+		{Constructor: NewDefaultConfig},
+		{Constructor: NewConnection},
+	}
+)
+
+// Error implementation
+func (e Error) Error() string {
+	return string(e)
+}
+
 // BeforeQuery callback
 func (h *Hook) BeforeQuery(e *pg.QueryEvent) {
 	h.StartAt = time.Now()
@@ -50,38 +80,37 @@ func (h Hook) AfterQuery(e *pg.QueryEvent) {
 	h.After(e)
 }
 
-var (
-	// Module is default connection to PostgreSQL
-	Module = module.Module{
-		{Constructor: NewDefaultConfig},
-		{Constructor: NewConnection},
-	}
-
-	// ErrEmptyConfig when given empty options
-	ErrEmptyConfig = errors.New("database empty config")
-	// ErrEmptyLogger when logger not initialized
-	ErrEmptyLogger = errors.New("database empty logger")
-)
-
 // NewDefaultConfig returns connection config
 func NewDefaultConfig(v *viper.Viper) (*Config, error) {
 	if !v.IsSet("postgres") {
 		return nil, ErrEmptyConfig
 	}
 
+	// v.SetDefault("postgres.hostname", "localhost")
+	v.SetDefault("postgres.options.sslmode", "disable")
+
+	// re-fetch by full key
+	options := v.GetStringMapString("postgres.options")
+	if len(options) > 0 {
+		for opt := range options {
+			options[opt] = v.GetString("postgres.options." + opt)
+		}
+	}
+
 	return &Config{
-		Addr:     v.GetString("postgres.address"),
-		User:     v.GetString("postgres.username"),
+		Hostname: v.GetString("postgres.hostname"),
+		Username: v.GetString("postgres.username"),
 		Password: v.GetString("postgres.password"),
 		Database: v.GetString("postgres.database"),
 		Debug:    v.GetBool("postgres.debug"),
 		PoolSize: v.GetInt("postgres.pool_size"),
+		Options:  options,
 	}, nil
 }
 
 // NewConnection returns database connection
-func NewConnection(opts *Config, l *zap.Logger) (db *pg.DB, err error) {
-	if opts == nil {
+func NewConnection(cfg *Config, l *zap.Logger, v *viper.Viper) (db *pg.DB, err error) {
+	if cfg == nil {
 		err = ErrEmptyConfig
 		return
 	}
@@ -91,26 +120,32 @@ func NewConnection(opts *Config, l *zap.Logger) (db *pg.DB, err error) {
 		return
 	}
 
+	opts := &pg.Options{
+		Addr:     cfg.Hostname,
+		User:     cfg.Username,
+		Password: cfg.Password,
+		Database: cfg.Database,
+		PoolSize: cfg.PoolSize,
+	}
+
 	l.Debug("Connect to PostgreSQL",
-		zap.String("address", opts.Addr),
-		zap.String("user", opts.User),
-		zap.String("password", opts.Password),
-		zap.String("database", opts.Database),
-		zap.Int("pool_size", opts.PoolSize))
-
-	db = pg.Connect(&pg.Options{
-		Addr:     opts.Addr,
-		User:     opts.User,
-		Password: opts.Password,
-		Database: opts.Database,
-		PoolSize: opts.PoolSize,
-	})
+		zap.String("hostname", cfg.Hostname),
+		zap.String("username", cfg.Username),
+		zap.String("password", cfg.Password),
+		zap.String("database", cfg.Database),
+		zap.Int("pool_size", cfg.PoolSize),
+		zap.Any("options", cfg.Options))
+
+	if opts.TLSConfig, err = ssl(cfg.Options); err != nil {
+		return nil, err
+	}
 
+	db = pg.Connect(opts)
 	if _, err = db.ExecOne("SELECT 1"); err != nil {
 		return nil, errors.Wrap(err, "can't connect to postgres")
 	}
 
-	if opts.Debug {
+	if cfg.Debug {
 		h := new(Hook)
 		h.After = func(e *pg.QueryEvent) {
 			query, qErr := e.FormattedQuery()