gofmt with go 1.19

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

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")

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

ca/certificates.go

@@ -39,11 +39,11 @@ import (
 
 const (
 	// Security Strength Equivalence
-	//-----------------------------------
-	//| ECC  |  DH/DSA/RSA  |
-	//| 256  |     3072     |
-	//| 384  |     7680     |
-	//-----------------------------------
+	//
+	// | ECC      | DH/DSA/RSA    |
+	// |----------|---------------|
+	// | 256      | 3072          |
+	// | 384      | 7680          |
 
 	// RootKeySize is the default size of the root CA key
 	// It would be ideal for the root key to use P-384, but in P-384 is not optimized in go yet :(
@@ -134,25 +134,24 @@ type x509UnknownAuthError struct {
 //
 // Requirements:
 //
-// - [signing CA key] must be the private key for [signing CA cert], and either both or none must be provided
-//
-// - [intermediate CA1] must have the same public key and subject as [signing CA cert], because otherwise when
-//   appended to a leaf certificate, the intermediates will not form a chain (because [intermediate CA1] won't because
-//   the signer of the leaf certificate)
-// - [intermediate CA1] must be signed by [intermediate CA2], which must be signed by [intermediate CA3]
-//
-// - When we issue a certificate, the intermediates will be appended so that the certificate looks like:
-//   [leaf signed by signing CA cert][intermediate CA1][intermediate CA2][intermediate CA3]
-// - [leaf signed by signing CA cert][intermediate CA1][intermediate CA2][intermediate CA3] is guaranteed to form a
-//   valid chain from [leaf signed by signing CA cert] to one of the root certs ([signing CA cert], [CA cert1], [CA cert2])
-//   using zero or more of the intermediate certs ([intermediate CA1][intermediate CA2][intermediate CA3]) as intermediates
+//   - [signing CA key] must be the private key for [signing CA cert], and either both or none must be provided
+//   - [intermediate CA1] must have the same public key and subject as [signing CA cert], because otherwise when
+//     appended to a leaf certificate, the intermediates will not form a chain (because [intermediate CA1] won't because
+//     the signer of the leaf certificate)
+//   - [intermediate CA1] must be signed by [intermediate CA2], which must be signed by [intermediate CA3]
+//   - When we issue a certificate, the intermediates will be appended so that the certificate looks like:
+//     [leaf signed by signing CA cert][intermediate CA1][intermediate CA2][intermediate CA3]
+//   - [leaf signed by signing CA cert][intermediate CA1][intermediate CA2][intermediate CA3] is guaranteed to form a
+//     valid chain from [leaf signed by signing CA cert] to one of the root certs ([signing CA cert], [CA cert1], [CA cert2])
+//     using zero or more of the intermediate certs ([intermediate CA1][intermediate CA2][intermediate CA3]) as intermediates
 //
 // Example 1:  Simple root rotation
+//
 // - Initial state:
-// 	 - RootCA.Cert:          [Root CA1 self-signed]
-// 	 - RootCA.Intermediates: []
-// 	 - RootCA.signer.Cert:   [Root CA1 self-signed]
-// 	 - Issued TLS cert:      [leaf signed by Root CA1]
+//   - RootCA.Cert:          [Root CA1 self-signed]
+//   - RootCA.Intermediates: []
+//   - RootCA.signer.Cert:   [Root CA1 self-signed]
+//   - Issued TLS cert:      [leaf signed by Root CA1]
 //
 // - Intermediate state (during root rotation):
 //   - RootCA.Cert:          [Root CA1 self-signed]
@@ -165,7 +164,6 @@ type x509UnknownAuthError struct {
 //   - RootCA.Intermediates: []
 //   - RootCA.signer.Cert:   [Root CA2 self-signed]
 //   - Issued TLS cert:      [leaf signed by Root CA2]
-//
 type RootCA struct {
 	// Certs contains a bundle of self-signed, PEM encoded certificates for the Root CA to be used
 	// as the root of trust.