Updated linters to handle import ordering

Author: davepgreene

.golangci.yml

@@ -1,4 +1,24 @@
 version: "2"
+formatters:
+  enable:
+    - gofmt
+    - goimports
+    - gci
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - blank
+        - dot
+        - localmodule
+      custom-order: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 linters:
   default: none
   enable:
@@ -70,10 +90,3 @@ linters:
       - third_party$
       - builtin$
       - examples$
-formatters:
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$

Makefile

@@ -7,7 +7,7 @@ GREEN  = \033[32m
 WHITE  = \033[37m
 RESET  = \033[0m
 
-GOLANG_CI_LINT_VERSION=2.2.2
+GOLANG_CI_LINT_VERSION=2.4.0
 GO_BIN=$(shell pwd)/.build
 export
 

store/awsrds/store.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/feature/rds/auth"
-
 	"github.com/davepgreene/go-db-credential-refresh/driver"
 	"github.com/davepgreene/go-db-credential-refresh/store"
 )

store/vault/credentials/agent_database.go

@@ -4,9 +4,8 @@ import (
 	"context"
 	"os"
 
-	"github.com/hashicorp/vault-client-go"
-
 	"github.com/davepgreene/go-db-credential-refresh/store"
+	"github.com/hashicorp/vault-client-go"
 )
 
 // Map handles mapping data from a file on disk to a Credentials object. This

store/vault/credentials/api_database.go

@@ -4,9 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/vault-client-go"
-
 	"github.com/davepgreene/go-db-credential-refresh/store"
+	"github.com/hashicorp/vault-client-go"
 )
 
 // APIDatabaseCredentials gets DB credentials from the Vault Database Secrets engine

store/vault/credentials/api_database_test.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/davepgreene/go-db-credential-refresh/store/vault/vaulttest"
 	"github.com/hashicorp/vault-client-go/schema"
+
+	"github.com/davepgreene/go-db-credential-refresh/store/vault/vaulttest"
 )
 
 func TestNewAPIDatabaseCredentials(t *testing.T) {

store/vault/credentials/kv.go

@@ -4,9 +4,8 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/hashicorp/vault-client-go"
-
 	"github.com/davepgreene/go-db-credential-refresh/store"
+	"github.com/hashicorp/vault-client-go"
 )
 
 // KvCredentials implements the CredentialLocation interface.

store/vault/credentials/kv_test.go

@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/davepgreene/go-db-credential-refresh/store/vault/vaulttest"
 	"github.com/hashicorp/vault-client-go"
 	"github.com/hashicorp/vault-client-go/schema"
+
+	"github.com/davepgreene/go-db-credential-refresh/store/vault/vaulttest"
 )
 
 func TestNewKvCredentials(t *testing.T) {

store/vault/credentials/types.go

@@ -3,9 +3,8 @@ package vaultcredentials
 import (
 	"context"
 
-	"github.com/hashicorp/vault-client-go"
-
 	"github.com/davepgreene/go-db-credential-refresh/store"
+	"github.com/hashicorp/vault-client-go"
 )
 
 // CredentialLocation represents a location where credentials can be retrieved from.

store/vault/credentials/utils_test.go

@@ -6,9 +6,10 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/davepgreene/go-db-credential-refresh/store/vault/vaulttest"
 	"github.com/hashicorp/vault-client-go"
 	"github.com/hashicorp/vault-client-go/schema"
+
+	"github.com/davepgreene/go-db-credential-refresh/store/vault/vaulttest"
 )
 
 func TestGetFromVaultSecretsAPI(t *testing.T) {