Skip to content

chore(ca): chore: fix testifylint issues part 2 #3262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmorel-35 wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −22
Open

chore(ca): chore: fix testifylint issues part 2 #3262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ca/external_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down Expand Up @@ -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")
}
Expand Down
16 changes: 8 additions & 8 deletions ca/testutils/cautils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
Expand All @@ -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)}
Expand Down
22 changes: 11 additions & 11 deletions ca/transport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand All @@ -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])
Expand All @@ -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())
}