Merge pull request #3056 from thaJeztah/gofmt

gofmt files

Author: dperny

agent/exec/controller_test.go

@@ -7,9 +7,9 @@ import (
 	"runtime"
 	"testing"
 
+	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/log"
-	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/stretchr/testify/assert"
 )
 

agent/exec/dockerapi/adapter.go

@@ -11,10 +11,10 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
 	engineapi "github.com/docker/docker/client"
+	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/log"
-	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/time/rate"

agent/exec/dockerapi/container.go

@@ -17,12 +17,12 @@ import (
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
+	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/api/genericresource"
 	"github.com/moby/swarmkit/v2/api/naming"
 	"github.com/moby/swarmkit/v2/template"
-	gogotypes "github.com/gogo/protobuf/types"
 )
 
 const (

agent/exec/dockerapi/container_test.go

@@ -9,8 +9,8 @@ import (
 	enginemount "github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/strslice"
 	"github.com/docker/go-units"
-	"github.com/moby/swarmkit/v2/api"
 	gogotypes "github.com/gogo/protobuf/types"
+	"github.com/moby/swarmkit/v2/api"
 )
 
 func TestVolumesAndBinds(t *testing.T) {

agent/exec/dockerapi/controller.go

@@ -15,10 +15,10 @@ import (
 	"github.com/docker/docker/api/types/events"
 	engineapi "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
+	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/log"
-	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
 	"golang.org/x/time/rate"
 )

agent/exec/dockerapi/controller_integration_test.go

@@ -30,7 +30,6 @@ func init() {
 // Run with something like this:
 //
 //	go test -run TestControllerFlowIntegration -test.docker.addr unix:///var/run/docker.sock
-//
 func TestControllerFlowIntegration(t *testing.T) {
 	if dockerTestAddr == "" {
 		t.Skip("specify docker address to run integration")

agent/exec/dockerapi/controller_test.go

@@ -16,11 +16,11 @@ import (
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/network"
+	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/identity"
 	"github.com/moby/swarmkit/v2/log"
-	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/stretchr/testify/assert"
 )
 

agent/storage.go

@@ -1,17 +1,17 @@
 package agent
 
 import (
-	"github.com/moby/swarmkit/v2/api"
 	"github.com/gogo/protobuf/proto"
+	"github.com/moby/swarmkit/v2/api"
 	bolt "go.etcd.io/bbolt"
 )
 
 // Layout:
 //
-//  bucket(v1.tasks.<id>) ->
-//			data (task protobuf)
-//			status (task status protobuf)
-//			assigned (key present)
+//	bucket(v1.tasks.<id>) ->
+//		data (task protobuf)
+//		status (task status protobuf)
+//		assigned (key present)
 var (
 	bucketKeyStorageVersion = []byte("v1")
 	bucketKeyTasks          = []byte("tasks")

agent/worker_test.go

@@ -44,11 +44,11 @@ func TestWorkerAssign(t *testing.T) {
 
 	pg := &testutils.FakePluginGetter{
 		Plugins: map[string]*testutils.FakeCompatPlugin{
-			"plugin-1": &testutils.FakeCompatPlugin{
+			"plugin-1": {
 				PluginName: "plugin-1",
 				PluginAddr: &net.UnixAddr{},
 			},
-			"plugin-2": &testutils.FakeCompatPlugin{
+			"plugin-2": {
 				PluginName: "plugin-2",
 				PluginAddr: &net.UnixAddr{},
 			},
@@ -270,7 +270,7 @@ func TestWorkerWait(t *testing.T) {
 
 	pg := &testutils.FakePluginGetter{
 		Plugins: map[string]*testutils.FakeCompatPlugin{
-			"plugin-1": &testutils.FakeCompatPlugin{
+			"plugin-1": {
 				PluginName: "plugin-1",
 				PluginAddr: &net.UnixAddr{},
 			},
@@ -418,11 +418,11 @@ func TestWorkerUpdate(t *testing.T) {
 
 	pg := &testutils.FakePluginGetter{
 		Plugins: map[string]*testutils.FakeCompatPlugin{
-			"plugin-1": &testutils.FakeCompatPlugin{
+			"plugin-1": {
 				PluginName: "plugin-1",
 				PluginAddr: &net.UnixAddr{},
 			},
-			"plugin-2": &testutils.FakeCompatPlugin{
+			"plugin-2": {
 				PluginName: "plugin-2",
 				PluginAddr: &net.UnixAddr{},
 			},

api/defaults/service.go

@@ -3,9 +3,9 @@ package defaults
 import (
 	"time"
 
+	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/api/deepcopy"
-	gogotypes "github.com/gogo/protobuf/types"
 )
 
 // Service is a ServiceSpec object with all fields filled in using default