From a77a0ce6a2c0b225a726aa3a46cf40b8fb0204ee Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Mon, 27 Jul 2026 19:30:11 +0200 Subject: [PATCH] chore(ca): chore: fix testifylint issues part 2 #### Description chore: fix testifylint issues in ca Signed-off-by: Matthieu MOREL --- ca/external_test.go | 5 ++--- ca/testutils/cautils.go | 16 ++++++++-------- ca/transport_test.go | 22 +++++++++++----------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/ca/external_test.go b/ca/external_test.go index c797a98925..734cbd449f 100644 --- a/ca/external_test.go +++ b/ca/external_test.go @@ -135,7 +135,7 @@ func TestExternalCASignRequestTimesOut(t *testing.T) { select { case err = <-signDone: - require.Contains(t, err.Error(), context.DeadlineExceeded.Error()) + require.ErrorIs(t, err, context.DeadlineExceeded) case <-time.After(3 * time.Second): require.FailNow(t, "call to external CA signing should have timed out after 1 second - it's been 3") } @@ -198,8 +198,7 @@ func TestExternalCASignRequestSizeLimit(t *testing.T) { select { case err = <-signDone: - require.Error(t, err) - require.Contains(t, err.Error(), "unable to parse JSON response") + require.ErrorContains(t, err, "unable to parse JSON response") case <-time.After(2 * time.Second): require.FailNow(t, "call to external CA signing should have failed by now") } diff --git a/ca/testutils/cautils.go b/ca/testutils/cautils.go index 9bd491f03d..1dc9007289 100644 --- a/ca/testutils/cautils.go +++ b/ca/testutils/cautils.go @@ -217,22 +217,22 @@ func newTestCA(t *testing.T, tempBaseDir string, apiRootCA api.RootCA, krwGenera managerConfig, qClose1, err := genSecurityConfig(s, rootCA, krw, ca.ManagerRole, organization, "", External) if t != nil { - assert.NoError(t, err) + require.NoError(t, err) } managerDiffOrgConfig, qClose2, err := genSecurityConfig(s, rootCA, krw, ca.ManagerRole, "swarm-test-org-2", "", External) if t != nil { - assert.NoError(t, err) + require.NoError(t, err) } workerConfig, qClose3, err := genSecurityConfig(s, rootCA, krw, ca.WorkerRole, organization, "", External) if t != nil { - assert.NoError(t, err) + require.NoError(t, err) } l, err := net.Listen("tcp", "127.0.0.1:0") if t != nil { - assert.NoError(t, err) + require.NoError(t, err) } baseOpts := []grpc.DialOption{grpc.WithTimeout(10 * time.Second)} @@ -243,22 +243,22 @@ func newTestCA(t *testing.T, tempBaseDir string, apiRootCA api.RootCA, krwGenera conn1, err := grpc.Dial(l.Addr().String(), insecureClientOpts...) if t != nil { - assert.NoError(t, err) + require.NoError(t, err) } conn2, err := grpc.Dial(l.Addr().String(), clientOpts...) if t != nil { - assert.NoError(t, err) + require.NoError(t, err) } conn3, err := grpc.Dial(l.Addr().String(), managerOpts...) if t != nil { - assert.NoError(t, err) + require.NoError(t, err) } conn4, err := grpc.Dial(l.Addr().String(), managerDiffOrgOpts...) if t != nil { - assert.NoError(t, err) + require.NoError(t, err) } serverOpts := []grpc.ServerOption{grpc.Creds(managerConfig.ServerTLSCreds)} diff --git a/ca/transport_test.go b/ca/transport_test.go index 7d963ae39d..72aa90581b 100644 --- a/ca/transport_test.go +++ b/ca/transport_test.go @@ -17,12 +17,12 @@ func TestNewMutableTLS(t *testing.T) { require.NoError(t, err) cert, _, err := rootCA.IssueAndSaveNewCertificates(krw, "CN", ManagerRole, "org") - assert.NoError(t, err) + require.NoError(t, err) tlsConfig, err := NewServerTLSConfig([]tls.Certificate{*cert}, rootCA.Pool) - assert.NoError(t, err) + require.NoError(t, err) creds, err := NewMutableTLS(tlsConfig) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, ManagerRole, creds.Role()) assert.Equal(t, "CN", creds.NodeID()) } @@ -36,10 +36,10 @@ func TestGetAndValidateCertificateSubject(t *testing.T) { require.NoError(t, err) cert, _, err := rootCA.IssueAndSaveNewCertificates(krw, "CN", ManagerRole, "org") - assert.NoError(t, err) + require.NoError(t, err) name, err := GetAndValidateCertificateSubject([]tls.Certificate{*cert}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "CN", name.CommonName) assert.Len(t, name.OrganizationalUnit, 1) assert.Equal(t, ManagerRole, name.OrganizationalUnit[0]) @@ -55,23 +55,23 @@ func TestLoadNewTLSConfig(t *testing.T) { // Create two different certs and two different TLS configs cert1, _, err := rootCA.IssueAndSaveNewCertificates(krw, "CN1", ManagerRole, "org") - assert.NoError(t, err) + require.NoError(t, err) cert2, _, err := rootCA.IssueAndSaveNewCertificates(krw, "CN2", WorkerRole, "org") - assert.NoError(t, err) + require.NoError(t, err) tlsConfig1, err := NewServerTLSConfig([]tls.Certificate{*cert1}, rootCA.Pool) - assert.NoError(t, err) + require.NoError(t, err) tlsConfig2, err := NewServerTLSConfig([]tls.Certificate{*cert2}, rootCA.Pool) - assert.NoError(t, err) + require.NoError(t, err) // Load the first TLS config into a MutableTLS creds, err := NewMutableTLS(tlsConfig1) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, ManagerRole, creds.Role()) assert.Equal(t, "CN1", creds.NodeID()) // Load the new Config and assert it changed err = creds.loadNewTLSConfig(tlsConfig2) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, WorkerRole, creds.Role()) assert.Equal(t, "CN2", creds.NodeID()) }