chore: golangci-lint fixes

Author: clementlecorre

.golangci.yml

@@ -45,7 +45,6 @@ linters:
     - nlreturn
     - prealloc
     - nilerr
-    - nolintlint
     - rowserrcheck
     # - scopelint --> exportloopref
     - exportloopref 

pg_dump.go

@@ -38,6 +38,7 @@ func NewDump(pg *Postgres) (*Dump, error) {
 	if !CommandExist(PGDumpCmd) {
 		return nil, &ErrCommandNotFound{Command: PGDumpCmd}
 	}
+
 	return &Dump{Options: pgDumpStdOpts, Postgres: pg}, nil
 }
 

pg_dump_test.go

@@ -5,15 +5,15 @@ import (
 	"runtime"
 	"testing"
 
+	. "github.com/smartystreets/goconvey/convey"
+
+	pg "github.com/habx/pg-commands"
 	"github.com/habx/pg-commands/tests/fixtures"
 	initdatabase "github.com/habx/pg-commands/tests/fixtures/scripts/init-database"
 	deps "github.com/habx/pg-commands/tests/fixtures/scripts/install-deps"
-
-	pg "github.com/habx/pg-commands"
-
-	. "github.com/smartystreets/goconvey/convey"
 )
 
+// nolint: gochecknoinits
 func init() {
 	initdatabase.Init()
 	if runtime.GOOS == "linux" {

pg_restore.go

@@ -32,6 +32,7 @@ func NewRestore(pg *Postgres) (*Restore, error) {
 	if !CommandExist(PGRestoreCmd) {
 		return nil, &ErrCommandNotFound{Command: PGRestoreCmd}
 	}
+
 	return &Restore{Options: pgDRestoreStdOpts, Postgres: pg, Schemas: []string{"public"}}, nil
 }
 

pg_restore_test.go

@@ -4,11 +4,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/habx/pg-commands/tests/fixtures"
+	. "github.com/smartystreets/goconvey/convey"
 
 	pg "github.com/habx/pg-commands"
-
-	. "github.com/smartystreets/goconvey/convey"
+	"github.com/habx/pg-commands/tests/fixtures"
 )
 
 func TestNewRestoreWrongCommand(t *testing.T) {
@@ -67,6 +66,7 @@ func TestRestore(t *testing.T) {
 				if restore.Role != "" {
 					return fmt.Sprintf("--role=%s ", restore.Role)
 				}
+
 				return ""
 			}(),
 			result.File))

tests/fixtures/postgres.go

@@ -10,7 +10,6 @@ import (
 const PostgresPort = 5432
 
 func Setup() *pg.Postgres {
-
 	pgHost := "localhost"
 	if os.Getenv("HABX_ENV") == "test" && os.Getenv("CI") == "true" {
 		pgHost = "postgres"

utils.go

@@ -29,5 +29,6 @@ func streamExecOutput(out io.ReadCloser, options ExecOptions) string {
 }
 func CommandExist(command string) bool {
 	_, err := exec.LookPath(command)
+
 	return err == nil
 }

utils_test.go

@@ -3,9 +3,9 @@ package pgcommands_test
 import (
 	"testing"
 
-	pg "github.com/habx/pg-commands"
-
 	. "github.com/smartystreets/goconvey/convey"
+
+	pg "github.com/habx/pg-commands"
 )
 
 func CommandExistTest(t *testing.T) {