Skip to content

Commit 15bb28e

Browse files
apostasieapostasie
committed
Cleanup ca/ca.go and use new helper
Signed-off-by: apostasie <[email protected]>
1 parent 16d755c commit 15bb28e

File tree

6 files changed

+35
-184
lines changed

6 files changed

+35
-184
lines changed

‎pkg/containerdutil/image_store.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
Copyright The containerd Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package containerdutil
18+
19+
type ImageStore struct {
20+
}

‎pkg/testutil/nerdtest/ca/ca.go‎

Lines changed: 0 additions & 161 deletions
This file was deleted.

‎pkg/testutil/nerdtest/registry/cesanta.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131

3232
"github.com/containerd/nerdctl/mod/tigron/expect"
3333
"github.com/containerd/nerdctl/mod/tigron/test"
34+
"github.com/containerd/nerdctl/mod/tigron/utils/testca"
3435

3536
"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
36-
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest/ca"
3737
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest/platform"
3838
"github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"
3939
"github.com/containerd/nerdctl/v2/pkg/testutil/portlock"
@@ -119,7 +119,7 @@ func ensureContainerStarted(helpers test.Helpers, con string) {
119119
}
120120
}
121121

122-
func NewCesantaAuthServer(data test.Data, helpers test.Helpers, ca *ca.CA, port int, user, pass string, tls bool) *TokenAuthServer {
122+
func NewCesantaAuthServer(data test.Data, helpers test.Helpers, ca *testca.Cert, port int, user, pass string, tls bool) *TokenAuthServer {
123123
// listen on 0.0.0.0 to enable 127.0.0.1
124124
listenIP := net.ParseIP("0.0.0.0")
125125
hostIP, err := nettestutil.NonLoopbackIPv4()
@@ -165,7 +165,7 @@ func NewCesantaAuthServer(data test.Data, helpers test.Helpers, ca *ca.CA, port
165165
err = cc.Save(configFileName)
166166
assert.NilError(helpers.T(), err, fmt.Errorf("failed writing configuration: %w", err))
167167

168-
cert := ca.NewCert(hostIP.String())
168+
cert := ca.GenerateServerX509(data, helpers, hostIP.String())
169169
// FIXME: this will fail in many circumstances. Review strategy on how to acquire a free port.
170170
// We probably have better code for that already somewhere.
171171
port, err = portlock.Acquire(port)
@@ -177,13 +177,9 @@ func NewCesantaAuthServer(data test.Data, helpers test.Helpers, ca *ca.CA, port
177177
cleanup := func(data test.Data, helpers test.Helpers) {
178178
helpers.Ensure("rm", "-f", containerName)
179179
errPortRelease := portlock.Release(port)
180-
errCertClose := cert.Close()
181180
if errPortRelease != nil {
182181
helpers.T().Error(errPortRelease.Error())
183182
}
184-
if errCertClose != nil {
185-
helpers.T().Error(errCertClose.Error())
186-
}
187183
}
188184

189185
setup := func(data test.Data, helpers test.Helpers) {

‎pkg/testutil/nerdtest/registry/docker.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ import (
2525
"gotest.tools/v3/assert"
2626

2727
"github.com/containerd/nerdctl/mod/tigron/test"
28+
"github.com/containerd/nerdctl/mod/tigron/utils/testca"
2829

29-
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest/ca"
3030
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest/hoststoml"
3131
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest/platform"
3232
"github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"
3333
"github.com/containerd/nerdctl/v2/pkg/testutil/portlock"
3434
)
3535

36-
func NewDockerRegistry(data test.Data, helpers test.Helpers, currentCA *ca.CA, port int, auth Auth) *Server {
36+
func NewDockerRegistry(data test.Data, helpers test.Helpers, currentCA *testca.Cert, port int, auth Auth) *Server {
3737
// listen on 0.0.0.0 to enable 127.0.0.1
3838
listenIP := net.ParseIP("0.0.0.0")
3939
hostIP, err := nettestutil.NonLoopbackIPv4()
@@ -56,10 +56,10 @@ func NewDockerRegistry(data test.Data, helpers test.Helpers, currentCA *ca.CA, p
5656
"--name", containerName,
5757
}
5858
scheme := "http"
59-
var cert *ca.Cert
59+
var cert *testca.Cert
6060
if currentCA != nil {
6161
scheme = "https"
62-
cert = currentCA.NewCert(hostIP.String(), "127.0.0.1", "localhost", "::1")
62+
cert = currentCA.GenerateServerX509(data, helpers, hostIP.String(), "127.0.0.1", "localhost", "::1")
6363
args = append(args,
6464
"--env", "REGISTRY_HTTP_TLS_CERTIFICATE=/registry/domain.crt",
6565
"--env", "REGISTRY_HTTP_TLS_KEY=/registry/domain.key",
@@ -86,10 +86,6 @@ func NewDockerRegistry(data test.Data, helpers test.Helpers, currentCA *ca.CA, p
8686
helpers.Anyhow("rm", "-f", containerName)
8787
errPortRelease := portlock.Release(port)
8888

89-
if cert != nil {
90-
assert.NilError(helpers.T(), cert.Close(), fmt.Errorf("failed cleaning certificates: %w", err))
91-
}
92-
9389
assert.NilError(helpers.T(), errPortRelease, fmt.Errorf("failed releasing port: %w", err))
9490
}
9591

‎pkg/testutil/nerdtest/registry/kubo.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import (
2525
"gotest.tools/v3/assert"
2626

2727
"github.com/containerd/nerdctl/mod/tigron/test"
28+
"github.com/containerd/nerdctl/mod/tigron/utils/testca"
2829

29-
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest/ca"
3030
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest/platform"
3131
"github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"
3232
"github.com/containerd/nerdctl/v2/pkg/testutil/portlock"
3333
)
3434

35-
func NewKuboRegistry(data test.Data, helpers test.Helpers, t *testing.T, currentCA *ca.CA, port int, auth Auth) *Server {
35+
func NewKuboRegistry(data test.Data, helpers test.Helpers, t *testing.T, currentCA *testca.Cert, port int, auth Auth) *Server {
3636
// listen on 0.0.0.0 to enable 127.0.0.1
3737
listenIP := net.ParseIP("0.0.0.0")
3838
hostIP, err := nettestutil.NonLoopbackIPv4()

‎pkg/testutil/nerdtest/third-party.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"gotest.tools/v3/assert"
2323

2424
"github.com/containerd/nerdctl/mod/tigron/test"
25+
"github.com/containerd/nerdctl/mod/tigron/utils/testca"
2526

26-
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest/ca"
2727
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest/registry"
2828
)
2929

@@ -45,16 +45,16 @@ func KubeCtlCommand(helpers test.Helpers, args ...string) test.TestableCommand {
4545
}
4646

4747
func RegistryWithTokenAuth(data test.Data, helpers test.Helpers, user, pass string, port int, tls bool) (*registry.Server, *registry.TokenAuthServer) {
48-
rca := ca.New(data, helpers.T())
48+
rca := testca.NewX509(data, helpers)
4949
as := registry.NewCesantaAuthServer(data, helpers, rca, 0, user, pass, tls)
5050
re := registry.NewDockerRegistry(data, helpers, rca, port, as.Auth)
5151
return re, as
5252
}
5353

5454
func RegistryWithNoAuth(data test.Data, helpers test.Helpers, port int, tls bool) *registry.Server {
55-
var rca *ca.CA
55+
var rca *testca.Cert
5656
if tls {
57-
rca = ca.New(data, helpers.T())
57+
rca = testca.NewX509(data, helpers)
5858
}
5959
return registry.NewDockerRegistry(data, helpers, rca, port, &registry.NoAuth{})
6060
}
@@ -64,9 +64,9 @@ func RegistryWithBasicAuth(data test.Data, helpers test.Helpers, user, pass stri
6464
Username: user,
6565
Password: pass,
6666
}
67-
var rca *ca.CA
67+
var rca *testca.Cert
6868
if tls {
69-
rca = ca.New(data, helpers.T())
69+
rca = testca.NewX509(data, helpers)
7070
}
7171
return registry.NewDockerRegistry(data, helpers, rca, port, auth)
7272
}

0 commit comments

Comments
 (0)