Skip to content

Commit f5bb9e0

Browse files
committed
authorization: remove github.com/stretchr/testify/require dependency
It was only used for basic assertions; replace those with stdlib Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 3cf1cfd commit f5bb9e0

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

authorization/api_test.go

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"time"
1818

1919
"github.com/docker/go-plugins-helpers/sdk"
20-
"github.com/stretchr/testify/require"
2120
)
2221

2322
type TestPlugin struct {
@@ -150,21 +149,29 @@ func TestPeerCertificateMarshalJSON(t *testing.T) {
150149
}
151150
// generate private key
152151
privatekey, err := rsa.GenerateKey(rand.Reader, 2048)
153-
require.NoError(t, err)
152+
if err != nil {
153+
t.Fatal(err)
154+
}
154155
publickey := &privatekey.PublicKey
155156

156157
// create a self-signed certificate. template = parent
157158
parent := template
158159
raw, err := x509.CreateCertificate(rand.Reader, template, parent, publickey, privatekey)
159-
require.NoError(t, err)
160+
if err != nil {
161+
t.Fatal(err)
162+
}
160163

161164
cert, err := x509.ParseCertificate(raw)
162-
require.NoError(t, err)
165+
if err != nil {
166+
t.Fatal(err)
167+
}
163168

164169
certs := []*x509.Certificate{cert}
165170
addr := "www.authz.com/auth"
166171
req, err := http.NewRequest("GET", addr, nil)
167-
require.NoError(t, err)
172+
if err != nil {
173+
t.Fatal(err)
174+
}
168175

169176
req.RequestURI = addr
170177
req.TLS = &tls.ConnectionState{}
@@ -176,15 +183,25 @@ func TestPeerCertificateMarshalJSON(t *testing.T) {
176183

177184
t.Run("Marshalling :", func(t *testing.T) {
178185
raw, err = pcObj.MarshalJSON()
179-
require.NotNil(t, raw)
180-
require.Nil(t, err)
186+
if raw == nil {
187+
t.Fatalf("Failed to marshal peer certificate")
188+
}
189+
if err != nil {
190+
t.Fatal(err)
191+
}
181192
})
182193

183194
t.Run("UnMarshalling :", func(t *testing.T) {
184195
err := pcObj.UnmarshalJSON(raw)
185-
require.Nil(t, err)
186-
require.Equal(t, "Earth", pcObj.Subject.Country[0])
187-
require.Equal(t, true, pcObj.IsCA)
196+
if err != nil {
197+
t.Fatal(err)
198+
}
199+
if expected := "Earth"; pcObj.Subject.Country[0] != expected {
200+
t.Fatalf("Expected %s, got %s\n", expected, pcObj.Subject.Country[0])
201+
}
202+
if pcObj.IsCA != true {
203+
t.Fatalf("Expected %t, got %t\n", true, pcObj.IsCA)
204+
}
188205
})
189206

190207
}

go.mod

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ require (
77
github.com/coreos/go-systemd/v22 v22.5.0
88
github.com/docker/docker v23.0.13+incompatible
99
github.com/docker/go-connections v0.5.0
10-
github.com/stretchr/testify v1.9.0
1110
)
1211

13-
require (
14-
github.com/davecgh/go-spew v1.1.1 // indirect
15-
github.com/pmezard/go-difflib v1.0.0 // indirect
16-
golang.org/x/sys v0.10.0 // indirect
17-
gopkg.in/yaml.v3 v3.0.1 // indirect
18-
)
12+
require golang.org/x/sys v0.10.0 // indirect

go.sum

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,10 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
22
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
33
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
44
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
5-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
6-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
75
github.com/docker/docker v23.0.13+incompatible h1:il+Z3USrag/LJkF5apR6APO5sVpjm82jm/wp5XvO4hQ=
86
github.com/docker/docker v23.0.13+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
97
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
108
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
119
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
12-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
13-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
14-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
15-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1610
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
1711
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
18-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
19-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
20-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
21-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)