Use goimports in place of the old golint

ns1 · May 23, 2024 · 1bfb115 · 1bfb115
1 parent 15fdbce
commit 1bfb115
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -6,6 +6,7 @@ fmt:
 test:
 	go fmt ./...
 	go vet ./...
+	goimports -w .
 	go test ./...
 
 .PHONY: all fmt test
diff --git a/mockns1/application.go b/mockns1/application.go
@@ -1,8 +1,9 @@
 package mockns1
 
 import (
-	"gopkg.in/ns1/ns1-go.v2/rest/model/pulsar"
 	"net/http"
+
+	"gopkg.in/ns1/ns1-go.v2/rest/model/pulsar"
 )
 
 // AddApplicationTestCase sets up a test case for the api.Client.application.List()

diff --git a/mockns1/version.go b/mockns1/version.go
@@ -2,8 +2,9 @@ package mockns1
 
 import (
 	"fmt"
-	"gopkg.in/ns1/ns1-go.v2/rest/model/dns"
 	"net/http"
+
+	"gopkg.in/ns1/ns1-go.v2/rest/model/dns"
 )
 
 // AddZoneListTestCase sets up a test case for the api.Client.Versions.List()

diff --git a/rest/_examples/applications.go b/rest/_examples/applications.go
@@ -2,13 +2,14 @@ package main
 
 import (
 	"fmt"
-	"gopkg.in/ns1/ns1-go.v2/rest/model/pulsar"
 	"log"
 	"net/http"
 	"os"
 	"strconv"
 	"time"
 
+	"gopkg.in/ns1/ns1-go.v2/rest/model/pulsar"
+
 	api "gopkg.in/ns1/ns1-go.v2/rest"
 )
 

diff --git a/rest/_examples/datasets.go b/rest/_examples/datasets.go
@@ -3,14 +3,15 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"gopkg.in/ns1/ns1-go.v2/rest/model/dataset"
 	"io"
 	"log"
 	"net/http"
 	"os"
 	"strings"
 	"time"
 
+	"gopkg.in/ns1/ns1-go.v2/rest/model/dataset"
+
 	api "gopkg.in/ns1/ns1-go.v2/rest"
 )
 

diff --git a/rest/dataset_test.go b/rest/dataset_test.go
@@ -1,13 +1,14 @@
 package rest_test
 
 import (
+	"net/http"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/ns1/ns1-go.v2/mockns1"
 	api "gopkg.in/ns1/ns1-go.v2/rest"
 	"gopkg.in/ns1/ns1-go.v2/rest/model/dataset"
-	"net/http"
-	"testing"
 )
 
 func TestDatasetsService(t *testing.T) {

diff --git a/rest/model/dataset/dataset_test.go b/rest/model/dataset/dataset_test.go
@@ -2,10 +2,11 @@ package dataset
 
 import (
 	"encoding/json"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 var now = time.Unix(time.Now().Unix(), 0)

diff --git a/rest/model/pulsar/application_test.go b/rest/model/pulsar/application_test.go
@@ -1,8 +1,9 @@
 package pulsar
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNewBBPulsarApplication(t *testing.T) {

diff --git a/rest/optiondef.go b/rest/optiondef.go
@@ -3,8 +3,9 @@ package rest
 import (
 	"errors"
 	"fmt"
-	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
 	"net/http"
+
+	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
 )
 
 // OptionDefService handles the 'scope group' endpoints.

diff --git a/rest/optiondef_test.go b/rest/optiondef_test.go
@@ -1,10 +1,11 @@
 package rest_test
 
 import (
-	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
 	"net/http"
 	"testing"
 
+	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
+
 	"gopkg.in/ns1/ns1-go.v2/mockns1"
 	api "gopkg.in/ns1/ns1-go.v2/rest"
 )

diff --git a/rest/reservation_test.go b/rest/reservation_test.go
@@ -1,10 +1,11 @@
 package rest_test
 
 import (
-	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
 	"net/http"
 	"testing"
 
+	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
+
 	"gopkg.in/ns1/ns1-go.v2/mockns1"
 	api "gopkg.in/ns1/ns1-go.v2/rest"
 )

diff --git a/rest/scope_test.go b/rest/scope_test.go
@@ -1,10 +1,11 @@
 package rest_test
 
 import (
-	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
 	"net/http"
 	"testing"
 
+	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
+
 	"gopkg.in/ns1/ns1-go.v2/mockns1"
 	api "gopkg.in/ns1/ns1-go.v2/rest"
 )

diff --git a/rest/scopegroup.go b/rest/scopegroup.go
@@ -3,8 +3,9 @@ package rest
 import (
 	"errors"
 	"fmt"
-	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
 	"net/http"
+
+	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
 )
 
 // ScopeGroupService handles the 'scope group' endpoints.

diff --git a/rest/scopegroup_test.go b/rest/scopegroup_test.go
@@ -1,10 +1,11 @@
 package rest_test
 
 import (
-	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
 	"net/http"
 	"testing"
 
+	"gopkg.in/ns1/ns1-go.v2/rest/model/dhcp"
+
 	"gopkg.in/ns1/ns1-go.v2/mockns1"
 	api "gopkg.in/ns1/ns1-go.v2/rest"
 )

diff --git a/rest/version.go b/rest/version.go
@@ -2,8 +2,9 @@ package rest
 
 import (
 	"fmt"
-	"gopkg.in/ns1/ns1-go.v2/rest/model/dns"
 	"net/http"
+
+	"gopkg.in/ns1/ns1-go.v2/rest/model/dns"
 )
 
 // VersionsService handles 'zones/ZONE/versions' related endpoints.

diff --git a/rest/version_test.go b/rest/version_test.go
@@ -1,12 +1,13 @@
 package rest_test
 
 import (
+	"net/http"
+	"testing"
+
 	"github.com/stretchr/testify/require"
 	"gopkg.in/ns1/ns1-go.v2/mockns1"
 	api "gopkg.in/ns1/ns1-go.v2/rest"
 	"gopkg.in/ns1/ns1-go.v2/rest/model/dns"
-	"net/http"
-	"testing"
 )
 
 func TestVersion(t *testing.T) {