[CI] Run goimports & audit in CI (#246)

Install & run `goimports` within CI.

.circleci/config.yml

@@ -29,6 +29,21 @@ jobs:
           command: |
             cd integration-tests
             go test -v
+      - run:
+          name: Install goimports
+          command: |
+            go get golang.org/x/tools/cmd/[email protected]
+      - swissknife/fail_if_dirty:
+          pattern: ".*.go$"
+          invert-pattern: false
+          custom-error-message: Please run 'goimports -w -local github.com/BoltApp/sleet ./' and push up again
+          print-modified-files: true
+          steps-to-run:
+            - run:
+                name: Run goimports
+                command: |
+                  cd ../
+                  goimports -w -local github.com/BoltApp/sleet ./
       - save_cache:
           key: v1-pkg-cache
           paths:

gateways/adyen/adyen.go

@@ -3,10 +3,11 @@ package adyen
 import (
 	"net/http"
 
-	"github.com/BoltApp/sleet"
-	"github.com/BoltApp/sleet/common"
 	"github.com/adyen/adyen-go-api-library/v4/src/adyen"
 	adyen_common "github.com/adyen/adyen-go-api-library/v4/src/common"
+
+	"github.com/BoltApp/sleet"
+	"github.com/BoltApp/sleet/common"
 )
 
 // AdyenClient represents the authentication fields needed to make API Requests for a given environment

gateways/adyen/environment.go

@@ -1,8 +1,9 @@
 package adyen
 
 import (
-	"github.com/BoltApp/sleet/common"
 	adyen_common "github.com/adyen/adyen-go-api-library/v4/src/common"
+
+	"github.com/BoltApp/sleet/common"
 )
 
 // Environment translates a Sleet common environment into the adyen specific environment for the library

gateways/adyen/request_builder.go

@@ -5,10 +5,11 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/BoltApp/sleet"
-	"github.com/BoltApp/sleet/common"
 	"github.com/adyen/adyen-go-api-library/v4/src/checkout"
 	"github.com/adyen/adyen-go-api-library/v4/src/payments"
+
+	"github.com/BoltApp/sleet"
+	"github.com/BoltApp/sleet/common"
 )
 
 const (
@@ -20,7 +21,7 @@ const (
 // Options
 const (
 	applePayTokenOption = "ApplePayToken"
-	shopperIPOption = "ShopperIP"
+	shopperIPOption     = "ShopperIP"
 )
 
 // Shopper Interactions
@@ -62,7 +63,7 @@ func buildAuthRequest(authRequest *sleet.AuthorizationRequest, merchantAccount s
 			Currency: authRequest.Amount.Currency,
 		},
 		// Adyen requires a reference in request so this will panic if client doesn't pass it. Assuming this is good for now
-		Reference: *authRequest.ClientTransactionReference,
+		Reference:              *authRequest.ClientTransactionReference,
 		MerchantAccount:        merchantAccount,
 		MerchantOrderReference: authRequest.MerchantOrderReference,
 
@@ -120,7 +121,7 @@ func addPaymentSpecificFields(authRequest *sleet.AuthorizationRequest, request *
 	// Add PaymentMethod field
 	if authRequest.Options[applePayTokenOption] != nil {
 		request.PaymentMethod = map[string]interface{}{
-			"type": "applepay",
+			"type":          "applepay",
 			"applePayToken": authRequest.Options[applePayTokenOption].(string),
 		}
 	} else {
@@ -273,8 +274,9 @@ func addIfNonEmpty(value string, key string, data *map[string]string) {
 }
 
 // extractAdyenStreetFormat extracts adyen street format from generic street address
-//                          returns (streetNumber, streetName) format
-//                          If address does not have leading street number, will return ("", street)
+//
+//	returns (streetNumber, streetName) format
+//	If address does not have leading street number, will return ("", street)
 func extractAdyenStreetFormat(streetAddress string) (string, string) {
 	streetExtraction := streetNumberRegex.FindStringSubmatch(streetAddress)
 	if streetExtraction == nil {

gateways/adyen/request_builder_test.go

@@ -7,10 +7,11 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/BoltApp/sleet"
 	"github.com/adyen/adyen-go-api-library/v4/src/checkout"
 	"github.com/go-test/deep"
 
+	"github.com/BoltApp/sleet"
+
 	"github.com/BoltApp/sleet/common"
 	sleet_testing "github.com/BoltApp/sleet/testing"
 )
@@ -48,11 +49,11 @@ func TestBuildAuthRequest(t *testing.T) {
 					Value:    100,
 				},
 				BillingAddress: &checkout.Address{
-					City:            *base.BillingAddress.Locality,
-					Country:         *base.BillingAddress.CountryCode,
-					PostalCode:      *base.BillingAddress.PostalCode,
-					StateOrProvince: *base.BillingAddress.RegionCode,
-					Street:          "Railroad Street",
+					City:              *base.BillingAddress.Locality,
+					Country:           *base.BillingAddress.CountryCode,
+					PostalCode:        *base.BillingAddress.PostalCode,
+					StateOrProvince:   *base.BillingAddress.RegionCode,
+					Street:            "Railroad Street",
 					HouseNumberOrName: "7683",
 				},
 				MerchantAccount: "merchant-account",
@@ -80,11 +81,11 @@ func TestBuildAuthRequest(t *testing.T) {
 					Value:    100,
 				},
 				BillingAddress: &checkout.Address{
-					City:            *baseWithAydenData.BillingAddress.Locality,
-					Country:         *baseWithAydenData.BillingAddress.CountryCode,
-					PostalCode:      *baseWithAydenData.BillingAddress.PostalCode,
-					StateOrProvince: *baseWithAydenData.BillingAddress.RegionCode,
-					Street:          "Railroad Street",
+					City:              *baseWithAydenData.BillingAddress.Locality,
+					Country:           *baseWithAydenData.BillingAddress.CountryCode,
+					PostalCode:        *baseWithAydenData.BillingAddress.PostalCode,
+					StateOrProvince:   *baseWithAydenData.BillingAddress.RegionCode,
+					Street:            "Railroad Street",
 					HouseNumberOrName: "7683",
 				},
 				MerchantAccount: "merchant-account",
@@ -102,11 +103,11 @@ func TestBuildAuthRequest(t *testing.T) {
 				StorePaymentMethod:       true,
 				ShopperReference:         "test",
 				DeliveryAddress: &checkout.Address{
-					City:            *baseWithAydenData.ShippingAddress.Locality,
-					Country:         *baseWithAydenData.ShippingAddress.CountryCode,
-					PostalCode:      *baseWithAydenData.ShippingAddress.PostalCode,
-					StateOrProvince: *baseWithAydenData.ShippingAddress.RegionCode,
-					Street:          "Railroad Street",
+					City:              *baseWithAydenData.ShippingAddress.Locality,
+					Country:           *baseWithAydenData.ShippingAddress.CountryCode,
+					PostalCode:        *baseWithAydenData.ShippingAddress.PostalCode,
+					StateOrProvince:   *baseWithAydenData.ShippingAddress.RegionCode,
+					Street:            "Railroad Street",
 					HouseNumberOrName: "7683",
 				},
 				ShopperEmail: *baseWithAydenData.BillingAddress.Email,
@@ -122,11 +123,11 @@ func TestBuildAuthRequest(t *testing.T) {
 					Value:    100,
 				},
 				BillingAddress: &checkout.Address{
-					City:            *requestWithLevel3Data.BillingAddress.Locality,
-					Country:         *requestWithLevel3Data.BillingAddress.CountryCode,
-					PostalCode:      *requestWithLevel3Data.BillingAddress.PostalCode,
-					StateOrProvince: *requestWithLevel3Data.BillingAddress.RegionCode,
-					Street:          "Railroad Street",
+					City:              *requestWithLevel3Data.BillingAddress.Locality,
+					Country:           *requestWithLevel3Data.BillingAddress.CountryCode,
+					PostalCode:        *requestWithLevel3Data.BillingAddress.PostalCode,
+					StateOrProvince:   *requestWithLevel3Data.BillingAddress.RegionCode,
+					Street:            "Railroad Street",
 					HouseNumberOrName: "7683",
 				},
 				MerchantAccount: "merchant-account",
@@ -169,11 +170,11 @@ func TestBuildAuthRequest(t *testing.T) {
 					Value:    100,
 				},
 				BillingAddress: &checkout.Address{
-					City:            *requestWithLevel3Data.BillingAddress.Locality,
-					Country:         *requestWithLevel3Data.BillingAddress.CountryCode,
-					PostalCode:      *requestWithLevel3Data.BillingAddress.PostalCode,
-					StateOrProvince: *requestWithLevel3Data.BillingAddress.RegionCode,
-					Street:          "Railroad Street",
+					City:              *requestWithLevel3Data.BillingAddress.Locality,
+					Country:           *requestWithLevel3Data.BillingAddress.CountryCode,
+					PostalCode:        *requestWithLevel3Data.BillingAddress.PostalCode,
+					StateOrProvince:   *requestWithLevel3Data.BillingAddress.RegionCode,
+					Street:            "Railroad Street",
 					HouseNumberOrName: "7683",
 				},
 				MerchantAccount: "merchant-account",
@@ -217,11 +218,11 @@ func TestBuildAuthRequest(t *testing.T) {
 					Value:    100,
 				},
 				BillingAddress: &checkout.Address{
-					City:            *requestCitiPLCC.BillingAddress.Locality,
-					Country:         *requestCitiPLCC.BillingAddress.CountryCode,
-					PostalCode:      *requestCitiPLCC.BillingAddress.PostalCode,
-					StateOrProvince: *requestCitiPLCC.BillingAddress.RegionCode,
-					Street:          "Railroad Street",
+					City:              *requestCitiPLCC.BillingAddress.Locality,
+					Country:           *requestCitiPLCC.BillingAddress.CountryCode,
+					PostalCode:        *requestCitiPLCC.BillingAddress.PostalCode,
+					StateOrProvince:   *requestCitiPLCC.BillingAddress.RegionCode,
+					Street:            "Railroad Street",
 					HouseNumberOrName: "7683",
 				},
 				MerchantAccount: "merchant-account",
@@ -249,16 +250,16 @@ func TestBuildAuthRequest(t *testing.T) {
 					Value:    100,
 				},
 				BillingAddress: &checkout.Address{
-					City:            *base.BillingAddress.Locality,
-					Country:         *base.BillingAddress.CountryCode,
-					PostalCode:      *base.BillingAddress.PostalCode,
-					StateOrProvince: *base.BillingAddress.RegionCode,
-					Street:          "Railroad Street",
+					City:              *base.BillingAddress.Locality,
+					Country:           *base.BillingAddress.CountryCode,
+					PostalCode:        *base.BillingAddress.PostalCode,
+					StateOrProvince:   *base.BillingAddress.RegionCode,
+					Street:            "Railroad Street",
 					HouseNumberOrName: "7683",
 				},
 				MerchantAccount: "merchant-account",
 				PaymentMethod: map[string]interface{}{
-					"type":        "applepay",
+					"type":          "applepay",
 					"applePayToken": "testApplePayToken",
 				},
 				ShopperInteraction:       "ContAuth",

gateways/adyen/rtau.go

@@ -1,8 +1,9 @@
 package adyen
 
 import (
-	"github.com/BoltApp/sleet"
 	"time"
+
+	"github.com/BoltApp/sleet"
 )
 
 const (

gateways/adyen/rtau_test.go

@@ -1,12 +1,15 @@
+//go:build unit
 // +build unit
 
 package adyen
 
 import (
-	"github.com/BoltApp/sleet"
-	"github.com/go-test/deep"
 	"testing"
 	"time"
+
+	"github.com/go-test/deep"
+
+	"github.com/BoltApp/sleet"
 )
 
 func TestGetRTAUStatus(t *testing.T) {

gateways/authorizenet/authorizenet_test.go

@@ -5,13 +5,15 @@ package authorizenet
 
 import (
 	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/jarcoal/httpmock"
+
 	"github.com/BoltApp/sleet"
 	"github.com/BoltApp/sleet/common"
 	sleet_t "github.com/BoltApp/sleet/testing"
-	"github.com/google/go-cmp/cmp"
-	"github.com/jarcoal/httpmock"
-	"net/http"
-	"testing"
 )
 
 func TestNewClient(t *testing.T) {

gateways/authorizenet/request_builders_test.go

@@ -5,12 +5,14 @@ package authorizenet
 
 import (
 	"encoding/json"
+	"testing"
+
+	"github.com/Pallinder/go-randomdata"
+	"github.com/go-test/deep"
+
 	"github.com/BoltApp/sleet"
 	"github.com/BoltApp/sleet/common"
 	sleet_testing "github.com/BoltApp/sleet/testing"
-	"github.com/Pallinder/go-randomdata"
-	"github.com/go-test/deep"
-	"testing"
 )
 
 func TestBuildAuthRequest(t *testing.T) {

gateways/authorizenet/translation_test.go

@@ -1,3 +1,4 @@
+//go:build unit
 // +build unit
 
 package authorizenet

gateways/braintree/braintree.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	braintree_go "github.com/BoltApp/braintree-go"
+
 	"github.com/BoltApp/sleet"
 	"github.com/BoltApp/sleet/common"
 )

gateways/braintree/environment.go

@@ -2,6 +2,7 @@ package braintree
 
 import (
 	"github.com/BoltApp/braintree-go"
+
 	"github.com/BoltApp/sleet/common"
 )
 

gateways/braintree/request_builders.go

@@ -2,7 +2,9 @@ package braintree
 
 import (
 	"fmt"
+
 	braintree_go "github.com/BoltApp/braintree-go"
+
 	"github.com/BoltApp/sleet"
 	"github.com/BoltApp/sleet/common"
 )

gateways/cardconnect/request_builder_test.go

@@ -5,8 +5,9 @@ import (
 
 	"github.com/BoltApp/sleet"
 
-	sleet_testing "github.com/BoltApp/sleet/testing"
 	"github.com/go-test/deep"
+
+	sleet_testing "github.com/BoltApp/sleet/testing"
 )
 
 var (

gateways/checkoutcom/checkoutcom.go

@@ -1,12 +1,14 @@
 package checkoutcom
 
 import (
-	"github.com/BoltApp/sleet"
-	"github.com/BoltApp/sleet/common"
-	"github.com/checkout/checkout-sdk-go"
-	"github.com/checkout/checkout-sdk-go/payments"
 	"net/http"
 	"strconv"
+
+	"github.com/checkout/checkout-sdk-go"
+	"github.com/checkout/checkout-sdk-go/payments"
+
+	"github.com/BoltApp/sleet"
+	"github.com/BoltApp/sleet/common"
 )
 
 // checkout.com documentation here: https://www.checkout.com/docs/four/payments/accept-payments, SDK here: https://github.com/checkout/checkout-sdk-go

gateways/checkoutcom/environment.go

@@ -1,7 +1,10 @@
 package checkoutcom
 
-import "github.com/BoltApp/sleet/common"
-import "github.com/checkout/checkout-sdk-go"
+import (
+	"github.com/checkout/checkout-sdk-go"
+
+	"github.com/BoltApp/sleet/common"
+)
 
 func GetEnv(env common.Environment) checkout.SupportedEnvironment {
 	if env == common.Production {