Merge pull request #1121 from cornelk/fix_import_grouping

chore: fix import grouping, code formatting and enable goimports linter

.changelog/1121.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+deps: fix import grouping, code formatting and enable goimports linter
+```

.golintci.yaml

@@ -32,6 +32,7 @@ linters:
     - exportloopref  # prevent scope issues with pointers in loops.
     - goconst        # use constants where values are repeated.
     - reassign       # checks that package variables are not reassigned.
+    - goimports      # checks import grouping and code formatting.
 
 output:
   format: colored-line-number

cmd/flarectl/firewall.go

@@ -2,13 +2,12 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
 	"os"
 	"strconv"
 
-	"errors"
-
 	"github.com/cloudflare/cloudflare-go"
 	"github.com/urfave/cli/v2"
 )

cmd/flarectl/misc.go

@@ -3,12 +3,11 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"strings"
 
-	"errors"
-
 	cloudflare "github.com/cloudflare/cloudflare-go"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v2"
@@ -46,7 +45,7 @@ func initializeAPI(c *cli.Context) error {
 	}
 
 	if c.IsSet("account-id") {
-		cloudflare.UsingAccount(c.String("account-id"))(api) //nolint
+		cloudflare.UsingAccount(c.String("account-id"))(api) // nolint
 	}
 
 	return nil
@@ -93,7 +92,7 @@ func writeTable(c *cli.Context, data [][]string, cols ...string) {
 func checkFlags(c *cli.Context, flags ...string) error {
 	for _, flag := range flags {
 		if c.String(flag) == "" {
-			cli.ShowSubcommandHelp(c) //nolint
+			cli.ShowSubcommandHelp(c) // nolint
 			err := fmt.Errorf("error: the required flag %q was empty or not provided", flag)
 			fmt.Fprintln(os.Stderr, err)
 			return err

convert_types.go

@@ -22,26 +22,26 @@ import (
 // AnyPtr is a helper routine that allocates a new interface value
 // to store v and returns a pointer to it.
 //
-// 	// Usage: var _ *Type = AnyPtr(Type(value) | value).(*Type)
+// Usage: var _ *Type = AnyPtr(Type(value) | value).(*Type)
 //
-// 	var _ *bool = AnyPtr(true).(*bool)
-// 	var _ *byte = AnyPtr(byte(1)).(*byte)
-// 	var _ *complex64 = AnyPtr(complex64(1.1)).(*complex64)
-// 	var _ *complex128 = AnyPtr(complex128(1.1)).(*complex128)
-// 	var _ *float32 = AnyPtr(float32(1.1)).(*float32)
-// 	var _ *float64 = AnyPtr(float64(1.1)).(*float64)
-// 	var _ *int = AnyPtr(int(1)).(*int)
-// 	var _ *int8 = AnyPtr(int8(8)).(*int8)
-// 	var _ *int16 = AnyPtr(int16(16)).(*int16)
-// 	var _ *int32 = AnyPtr(int32(32)).(*int32)
-// 	var _ *int64 = AnyPtr(int64(64)).(*int64)
-// 	var _ *rune = AnyPtr(rune(1)).(*rune)
-// 	var _ *string = AnyPtr("ptr").(*string)
-// 	var _ *uint = AnyPtr(uint(1)).(*uint)
-// 	var _ *uint8 = AnyPtr(uint8(8)).(*uint8)
-// 	var _ *uint16 = AnyPtr(uint16(16)).(*uint16)
-// 	var _ *uint32 = AnyPtr(uint32(32)).(*uint32)
-// 	var _ *uint64 = AnyPtr(uint64(64)).(*uint64)
+//  var _ *bool = AnyPtr(true).(*bool)
+//  var _ *byte = AnyPtr(byte(1)).(*byte)
+//  var _ *complex64 = AnyPtr(complex64(1.1)).(*complex64)
+//  var _ *complex128 = AnyPtr(complex128(1.1)).(*complex128)
+//  var _ *float32 = AnyPtr(float32(1.1)).(*float32)
+//  var _ *float64 = AnyPtr(float64(1.1)).(*float64)
+//  var _ *int = AnyPtr(int(1)).(*int)
+//  var _ *int8 = AnyPtr(int8(8)).(*int8)
+//  var _ *int16 = AnyPtr(int16(16)).(*int16)
+//  var _ *int32 = AnyPtr(int32(32)).(*int32)
+//  var _ *int64 = AnyPtr(int64(64)).(*int64)
+//  var _ *rune = AnyPtr(rune(1)).(*rune)
+//  var _ *string = AnyPtr("ptr").(*string)
+//  var _ *uint = AnyPtr(uint(1)).(*uint)
+//  var _ *uint8 = AnyPtr(uint8(8)).(*uint8)
+//  var _ *uint16 = AnyPtr(uint16(16)).(*uint16)
+//  var _ *uint32 = AnyPtr(uint32(32)).(*uint32)
+//  var _ *uint64 = AnyPtr(uint64(64)).(*uint64)
 func AnyPtr(v interface{}) interface{} {
 	r := reflect.New(reflect.TypeOf(v))
 	reflect.ValueOf(r.Interface()).Elem().Set(reflect.ValueOf(v))

custom_hostname.go

@@ -3,13 +3,12 @@ package cloudflare
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
 	"strconv"
 	"time"
-
-	"errors"
 )
 
 // CustomHostnameStatus is the enumeration of valid state values in the CustomHostnameSSL.
@@ -38,14 +37,14 @@ type CustomHostnameSSLSettings struct {
 	EarlyHints    string   `json:"early_hints,omitempty"`
 }
 
-//CustomHostnameOwnershipVerification represents ownership verification status of a given custom hostname.
+// CustomHostnameOwnershipVerification represents ownership verification status of a given custom hostname.
 type CustomHostnameOwnershipVerification struct {
 	Type  string `json:"type,omitempty"`
 	Name  string `json:"name,omitempty"`
 	Value string `json:"value,omitempty"`
 }
 
-//SSLValidationError represents errors that occurred during SSL validation.
+// SSLValidationError represents errors that occurred during SSL validation.
 type SSLValidationError struct {
 	Message string `json:"message,omitempty"`
 }

errors.go

@@ -1,11 +1,10 @@
 package cloudflare
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"strings"
-
-	"errors"
 )
 
 const (

filter.go

@@ -3,11 +3,10 @@ package cloudflare
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
-
-	"errors"
 )
 
 var ErrNotEnoughFilterIDsProvided = errors.New("at least one filter ID must be provided.")

images.go

@@ -4,13 +4,12 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"mime/multipart"
 	"net/http"
 	"time"
-
-	"errors"
 )
 
 // Image represents a Cloudflare Image.

intelligence_asn_test.go

@@ -3,9 +3,10 @@ package cloudflare
 import (
 	"context"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 const testASNNumber = "13335"

intelligence_domain_test.go

@@ -3,9 +3,10 @@ package cloudflare
 import (
 	"context"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestIntelligence_DomainDetails(t *testing.T) {

intelligence_ip_test.go

@@ -3,9 +3,10 @@ package cloudflare
 import (
 	"context"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestIntelligence_GetIPOverview(t *testing.T) {

intelligence_phishing_test.go

@@ -3,9 +3,10 @@ package cloudflare
 import (
 	"context"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestIntelligence_PhishingScan(t *testing.T) {

intelligence_whois_test.go

@@ -3,9 +3,10 @@ package cloudflare
 import (
 	"context"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestIntelligence_WHOIS(t *testing.T) {

ip_list.go

@@ -3,11 +3,10 @@ package cloudflare
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
-
-	"errors"
 )
 
 // The definitions in this file are deprecated and should be removed after

list.go

@@ -3,11 +3,10 @@ package cloudflare
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
-
-	"errors"
 )
 
 const (

logpush.go

@@ -3,11 +3,10 @@ package cloudflare
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
-
-	"errors"
 )
 
 // LogpushJob describes a Logpush job.

magic_firewall_rulesets.go

@@ -3,11 +3,10 @@ package cloudflare
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
-
-	"errors"
 )
 
 const (

magic_transit_gre_tunnel.go

@@ -3,11 +3,10 @@ package cloudflare
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
-
-	"errors"
 )
 
 // Magic Transit GRE Tunnel Error messages.

magic_transit_ipsec_tunnel.go

@@ -3,11 +3,10 @@ package cloudflare
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
-
-	"errors"
 )
 
 // Magic Transit IPsec Tunnel Error messages.

magic_transit_static_routes.go

@@ -3,11 +3,10 @@ package cloudflare
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
-
-	"errors"
 )
 
 // Magic Transit Static Routes Error messages.

miscategorization_test.go

@@ -3,9 +3,10 @@ package cloudflare
 import (
 	"context"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCreateMiscategorization(t *testing.T) {

origin_ca.go

@@ -3,13 +3,12 @@ package cloudflare
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
 	"time"
-
-	"errors"
 )
 
 // OriginCACertificate represents a Cloudflare-issued certificate.