fix lint issues

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

Dockerfile

@@ -104,8 +104,17 @@ ARG DEBIAN_FRONTEND
 RUN apt-get install -y --no-install-recommends libgcc-10-dev libc6-dev
 RUN --mount=type=bind,target=. \
     --mount=type=cache,target=/root/.cache \
-    --mount=from=golangci-lint,source=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint \
-    golangci-lint run ./... && cd swarmd && golangci-lint run ./...
+    --mount=from=golangci-lint,source=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint <<EOT
+  set -e
+  config=$(pwd)/.golangci.yml
+  for dir in . swarmd; do
+    (
+      set -x
+      cd $dir
+      golangci-lint run --config "$config" ./...
+    )
+  done
+EOT
 
 FROM gobase AS fmt-proto
 RUN --mount=type=bind,target=. \

ca/config.go

@@ -9,7 +9,6 @@ import (
 	"math/big"
 	"math/rand"
 	"path/filepath"
-	"slices"
 	"strings"
 	"sync"
 	"time"
@@ -661,7 +660,7 @@ func NewServerTLSConfig(certs []tls.Certificate, rootCAPool *x509.CertPool) (*tl
 		RootCAs:                  rootCAPool,
 		ClientCAs:                rootCAPool,
 		PreferServerCipherSuites: true,
-		CipherSuites:             slices.Clone(strongTLSCiphers),
+		CipherSuites:             append([]uint16(nil), strongTLSCiphers...),
 		MinVersion:               tls.VersionTLS12,
 		NextProtos:               alpnProtoStr,
 	}, nil
@@ -678,7 +677,7 @@ func NewClientTLSConfig(certs []tls.Certificate, rootCAPool *x509.CertPool, serv
 		ServerName:   serverName,
 		Certificates: certs,
 		RootCAs:      rootCAPool,
-		CipherSuites: slices.Clone(strongTLSCiphers),
+		CipherSuites: append([]uint16(nil), strongTLSCiphers...),
 		MinVersion:   tls.VersionTLS12,
 	}, nil
 }

manager/deks.go

@@ -81,8 +81,8 @@ func (r RaftDEKData) UnmarshalHeaders(headers map[string]string, kekData ca.KEKD
 func (r RaftDEKData) MarshalHeaders(kekData ca.KEKData) (map[string]string, error) {
 	headers := make(map[string]string)
 	for headerKey, contents := range map[string][]byte{
-		pemHeaderRaftDEK:        r.CurrentDEK,
-		pemHeaderRaftPendingDEK: r.PendingDEK,
+		pemHeaderRaftDEK:        r.EncryptionKeys.CurrentDEK,
+		pemHeaderRaftPendingDEK: r.EncryptionKeys.PendingDEK,
 	} {
 		if contents != nil {
 			dekStr, err := encodePEMHeaderValue(contents, kekData.KEK, r.FIPS)

manager/state/raft/testutils/testutils.go

@@ -9,9 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"google.golang.org/grpc"
-
 	"code.cloudfoundry.org/clock/fakeclock"
+	"github.com/docker/go-events"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/ca"
 	cautils "github.com/moby/swarmkit/v2/ca/testutils"
@@ -25,6 +24,7 @@ import (
 	"github.com/stretchr/testify/require"
 	etcdraft "go.etcd.io/etcd/raft/v3"
 	"go.etcd.io/etcd/raft/v3/raftpb"
+	"google.golang.org/grpc"
 )
 
 // TestNode represents a raft test node
@@ -46,6 +46,38 @@ func (n *TestNode) Leader() uint64 {
 	return id
 }
 
+func (n *TestNode) Status() etcdraft.Status {
+	return n.Node.Status()
+}
+
+func (n *TestNode) Run(ctx context.Context) {
+	n.Node.Run(ctx)
+}
+
+func (n *TestNode) Done() <-chan struct{} {
+	return n.Node.Done()
+}
+
+func (n *TestNode) ProposeValue(ctx context.Context, actions []api.StoreAction, cb func()) error {
+	return n.Node.ProposeValue(ctx, actions, cb)
+}
+
+func (n *TestNode) MemoryStore() *store.MemoryStore {
+	return n.Node.MemoryStore()
+}
+
+func (n *TestNode) ReadyForProposals() bool {
+	return n.Node.ReadyForProposals()
+}
+
+func (n *TestNode) GetMemberlist() map[uint64]*api.RaftMember {
+	return n.Node.GetMemberlist()
+}
+
+func (n *TestNode) SubscribeLeadership() (q chan events.Event, cancel func()) {
+	return n.Node.SubscribeLeadership()
+}
+
 // AdvanceTicks advances the raft state machine fake clock
 func AdvanceTicks(clockSource *fakeclock.FakeClock, ticks int) {
 	// A FakeClock timer won't fire multiple times if time is advanced
@@ -66,7 +98,7 @@ func WaitForCluster(t *testing.T, clockSource *fakeclock.FakeClock, nodes map[ui
 				prev = new(etcdraft.Status)
 				*prev = n.Status()
 				for _, n2 := range nodes {
-					if n2.Config.ID == prev.Lead {
+					if n2.Node.Config.ID == prev.Lead {
 						leadNode = n2
 						continue nodeLoop
 					}
@@ -76,7 +108,7 @@ func WaitForCluster(t *testing.T, clockSource *fakeclock.FakeClock, nodes map[ui
 			cur := n.Status()
 
 			for _, n2 := range nodes {
-				if n2.Config.ID == cur.Lead {
+				if n2.Node.Config.ID == cur.Lead {
 					if cur.Lead != prev.Lead || cur.Term != prev.Term || cur.Applied != prev.Applied {
 						return errors.New("state does not match on all nodes")
 					}
@@ -496,7 +528,7 @@ func CleanupNonRunningNode(node *TestNode) {
 // belonging to the same cluster
 func Leader(nodes map[uint64]*TestNode) *TestNode {
 	for _, n := range nodes {
-		if n.Config.ID == n.Leader() {
+		if n.Node.Config.ID == n.Leader() {
 			return n
 		}
 	}