Remove artificial groupings in import blocks

Fixed with: sed -i '/^import (/,/^)/ { /^\s*$/ d}' **/*.go goimports -w .
tinkerbell · Oct 19, 2020 · 47c3e87 · 47c3e87
1 parent 99a2844
commit 47c3e87
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 28 deletions.
diff --git a/cmd/tink-cli/cmd/hardware/commands.go b/cmd/tink-cli/cmd/hardware/commands.go
@@ -6,15 +6,12 @@ import (
 	"log"
 	"os"
 
-	"github.com/tinkerbell/tink/pkg"
-
-	"github.com/tinkerbell/tink/protos/hardware"
-
-	"github.com/jedib0t/go-pretty/table"
-
 	"github.com/google/uuid"
+	"github.com/jedib0t/go-pretty/table"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"github.com/tinkerbell/tink/pkg"
+	"github.com/tinkerbell/tink/protos/hardware"
 )
 
 // SubCommands holds the sub commands for template command

diff --git a/cmd/tink-cli/cmd/hardware/id.go b/cmd/tink-cli/cmd/hardware/id.go
@@ -8,10 +8,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/tinkerbell/tink/pkg"
-
 	"github.com/spf13/cobra"
 	"github.com/tinkerbell/tink/client"
+	"github.com/tinkerbell/tink/pkg"
 	"github.com/tinkerbell/tink/protos/hardware"
 )
 

diff --git a/cmd/tink-cli/cmd/hardware/push.go b/cmd/tink-cli/cmd/hardware/push.go
@@ -11,10 +11,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/tinkerbell/tink/pkg"
-
 	"github.com/spf13/cobra"
 	"github.com/tinkerbell/tink/client"
+	"github.com/tinkerbell/tink/pkg"
 	"github.com/tinkerbell/tink/protos/hardware"
 )
 

diff --git a/cmd/tink-cli/cmd/hardware/watch.go b/cmd/tink-cli/cmd/hardware/watch.go
@@ -10,10 +10,9 @@ import (
 	"log"
 	"sync"
 
-	"github.com/tinkerbell/tink/pkg"
-
 	"github.com/spf13/cobra"
 	"github.com/tinkerbell/tink/client"
+	"github.com/tinkerbell/tink/pkg"
 	"github.com/tinkerbell/tink/protos/hardware"
 )
 

diff --git a/grpc-server/tinkerbell_test.go b/grpc-server/tinkerbell_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/packethost/pkg/log"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
-
 	"github.com/tinkerbell/tink/db"
 	"github.com/tinkerbell/tink/db/mock"
 	"github.com/tinkerbell/tink/metrics"

diff --git a/http-server/http_handlers.go b/http-server/http_handlers.go
@@ -9,14 +9,12 @@ import (
 	tt "text/template"
 
 	"github.com/golang/protobuf/jsonpb" // nolint:staticcheck
-
-	"github.com/tinkerbell/tink/protos/template"
-	"github.com/tinkerbell/tink/protos/workflow"
-
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/utilities"
 	"github.com/tinkerbell/tink/pkg"
 	"github.com/tinkerbell/tink/protos/hardware"
+	"github.com/tinkerbell/tink/protos/template"
+	"github.com/tinkerbell/tink/protos/workflow"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/http-server/http_handlers_test.go b/http-server/http_handlers_test.go
@@ -4,23 +4,19 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-
-	grpcRuntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
-	"github.com/packethost/pkg/log"
-
 	"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"strings"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/test/bufconn"
-
 	"testing"
 
+	grpcRuntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/packethost/pkg/log"
 	"github.com/tinkerbell/tink/protos/hardware"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/test/bufconn"
 )
 
 const bufSize = 1024 * 1024

diff --git a/http-server/http_server.go b/http-server/http_server.go
@@ -12,13 +12,12 @@ import (
 	"runtime"
 	"time"
 
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-
 	grpcRuntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/packethost/pkg/log"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
 )
 
 var (