Skip to content

Revamp registry test #3076

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

Merged
merged 1 commit into from
Jun 16, 2024
Merged

Revamp registry test #3076

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
7 changes: 4 additions & 3 deletions cmd/nerdctl/compose_run_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,12 +432,13 @@ func TestComposePushAndPullWithCosignVerify(t *testing.T) {
keyPair := newCosignKeyPair(t, "cosign-key-pair")
defer keyPair.cleanup()

reg := testregistry.NewPlainHTTP(base, 5000)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 0, false)
Copy link
Member

@AkihiroSuda AkihiroSuda Jun 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why renamed?

Copy link
Contributor Author

@apostasie apostasie Jun 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Methods have been simplified / renamed:

  • there is no longer separate helpers for http vs. https (you pass a tls bool instead) - so, the previous name (NewPlainHTTP, that does not specific what type of auth it is using)
  • all helpers names now follow the same pattern:
    • NewWithTokenAuth
    • NewWithBasicAuth
    • NewWithNoAuth

Let me know if you don't like it and I can revert this one if you wish.

defer reg.Cleanup(nil)

localhostIP := "127.0.0.1"
t.Logf("localhost IP=%q", localhostIP)
testImageRefPrefix := fmt.Sprintf("%s:%d/",
localhostIP, reg.ListenPort)
localhostIP, reg.Port)
Copy link
Member

@AkihiroSuda AkihiroSuda Jun 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why renamed?

Copy link
Contributor Author

@apostasie apostasie Jun 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"ListenIP" makes sense (0.0.0.0) - as in "the address the registry process is binding to" - and also does "IP" (the exposed ip you can access it with).
"ListenPort" feels the wrong way - since this is NOT the port the registry process is actually listening on (still 5000), but instead the port you can access it with.

It seems better to me that way.

Either way, this is minor. I can reverse it if you dont like it.

Thanks @AkihiroSuda

t.Logf("testImageRefPrefix=%q", testImageRefPrefix)

var (
Expand Down
7 changes: 4 additions & 3 deletions cmd/nerdctl/container_run_verify_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ func TestRunVerifyCosign(t *testing.T) {
base := testutil.NewBase(t)
defer base.Cmd("builder", "prune").Run()
tID := testutil.Identifier(t)
reg := testregistry.NewPlainHTTP(base, 5000)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 0, false)
defer reg.Cleanup(nil)

localhostIP := "127.0.0.1"
t.Logf("localhost IP=%q", localhostIP)
testImageRef := fmt.Sprintf("%s:%d/%s",
localhostIP, reg.ListenPort, tID)
localhostIP, reg.Port, tID)
t.Logf("testImageRef=%q", testImageRef)

dockerfile := fmt.Sprintf(`FROM %s
Expand Down
22 changes: 15 additions & 7 deletions cmd/nerdctl/image_convert_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ func TestImageConvertNydus(t *testing.T) {
}
testutil.RequireExecutable(t, "nydus-image")
testutil.DockerIncompatible(t)

base := testutil.NewBase(t)
t.Parallel()

convertedImage := testutil.Identifier(t) + ":nydus"
base.Cmd("rmi", convertedImage).Run()
base.Cmd("pull", testutil.CommonImage).AssertOK()
Expand All @@ -48,18 +51,20 @@ func TestImageConvertNydus(t *testing.T) {
t.Skip("Nydusify check is not supported rootless mode.")
}

// skip if nydusify is not installed
// skip if nydusify and nydusd are not installed
testutil.RequireExecutable(t, "nydusify")
testutil.RequireExecutable(t, "nydusd")
Copy link
Contributor Author

@apostasie apostasie Jun 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding missing requirement


// setup local docker registry
registryPort := 15000
registry := testregistry.NewPlainHTTP(base, registryPort)
defer registry.Cleanup()
registry := testregistry.NewWithNoAuth(base, 0, false)
remoteImage := fmt.Sprintf("%s:%d/nydusd-image:test", "localhost", registry.Port)
t.Cleanup(func() {
Copy link
Contributor Author

@apostasie apostasie Jun 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cleanup is better to use than defer

base.Cmd("rmi", remoteImage).Run()
registry.Cleanup(nil)
})

remoteImage := fmt.Sprintf("%s:%d/nydusd-image:test", registry.IP.String(), registryPort)
base.Cmd("tag", convertedImage, remoteImage).AssertOK()
defer base.Cmd("rmi", remoteImage).Run()
base.Cmd("push", "--insecure-registry", remoteImage).AssertOK()
base.Cmd("push", remoteImage).AssertOK()
nydusifyCmd := testutil.Cmd{
Cmd: icmd.Command(
"nydusify",
Expand All @@ -73,5 +78,8 @@ func TestImageConvertNydus(t *testing.T) {
),
Base: base,
}

// nydus is creating temporary files - make sure we are in a proper location for that
nydusifyCmd.Cmd.Dir = base.T.TempDir()
nydusifyCmd.AssertOK()
}
6 changes: 3 additions & 3 deletions cmd/nerdctl/image_encrypt_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ func TestImageEncryptJWE(t *testing.T) {
defer keyPair.cleanup()
base := testutil.NewBase(t)
tID := testutil.Identifier(t)
reg := testregistry.NewPlainHTTP(base, 5000)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 0, false)
defer reg.Cleanup(nil)
base.Cmd("pull", testutil.CommonImage).AssertOK()
encryptImageRef := fmt.Sprintf("127.0.0.1:%d/%s:encrypted", reg.ListenPort, tID)
encryptImageRef := fmt.Sprintf("127.0.0.1:%d/%s:encrypted", reg.Port, tID)
defer base.Cmd("rmi", encryptImageRef).Run()
base.Cmd("image", "encrypt", "--recipient=jwe:"+keyPair.pub, testutil.CommonImage, encryptImageRef).AssertOK()
base.Cmd("image", "inspect", "--mode=native", "--format={{len .Index.Manifests}}", encryptImageRef).AssertOutExactly("1\n")
Expand Down
16 changes: 8 additions & 8 deletions cmd/nerdctl/image_pull_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ func TestImageVerifyWithCosign(t *testing.T) {
base := testutil.NewBase(t)
defer base.Cmd("builder", "prune").Run()
tID := testutil.Identifier(t)
reg := testregistry.NewPlainHTTP(base, 5000)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 0, false)
defer reg.Cleanup(nil)
localhostIP := "127.0.0.1"
t.Logf("localhost IP=%q", localhostIP)
testImageRef := fmt.Sprintf("%s:%d/%s",
localhostIP, reg.ListenPort, tID)
localhostIP, reg.Port, tID)
t.Logf("testImageRef=%q", testImageRef)

dockerfile := fmt.Sprintf(`FROM %s
Expand All @@ -91,8 +91,8 @@ func TestImagePullPlainHttpWithDefaultPort(t *testing.T) {
testutil.RequiresBuild(t)
base := testutil.NewBase(t)
defer base.Cmd("builder", "prune").Run()
reg := testregistry.NewPlainHTTP(base, 80)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 80, false)
defer reg.Cleanup(nil)
testImageRef := fmt.Sprintf("%s/%s:%s",
reg.IP.String(), testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
t.Logf("testImageRef=%q", testImageRef)
Expand All @@ -117,12 +117,12 @@ func TestImageVerifyWithCosignShouldFailWhenKeyIsNotCorrect(t *testing.T) {
base := testutil.NewBase(t)
defer base.Cmd("builder", "prune").Run()
tID := testutil.Identifier(t)
reg := testregistry.NewPlainHTTP(base, 5000)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 0, false)
defer reg.Cleanup(nil)
localhostIP := "127.0.0.1"
t.Logf("localhost IP=%q", localhostIP)
testImageRef := fmt.Sprintf("%s:%d/%s",
localhostIP, reg.ListenPort, tID)
localhostIP, reg.Port, tID)
t.Logf("testImageRef=%q", testImageRef)

dockerfile := fmt.Sprintf(`FROM %s
Expand Down
52 changes: 26 additions & 26 deletions cmd/nerdctl/image_push_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ import (
func TestPushPlainHTTPFails(t *testing.T) {
testutil.RequiresBuild(t)
base := testutil.NewBase(t)
reg := testregistry.NewPlainHTTP(base, 5000)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 0, false)
defer reg.Cleanup(nil)

base.Cmd("pull", testutil.CommonImage).AssertOK()
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
reg.IP.String(), reg.ListenPort, testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
reg.IP.String(), reg.Port, testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
t.Logf("testImageRef=%q", testImageRef)
base.Cmd("tag", testutil.CommonImage, testImageRef).AssertOK()

Expand All @@ -49,14 +49,14 @@ func TestPushPlainHTTPFails(t *testing.T) {
func TestPushPlainHTTPLocalhost(t *testing.T) {
testutil.RequiresBuild(t)
base := testutil.NewBase(t)
reg := testregistry.NewPlainHTTP(base, 5000)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 0, false)
defer reg.Cleanup(nil)
localhostIP := "127.0.0.1"
t.Logf("localhost IP=%q", localhostIP)

base.Cmd("pull", testutil.CommonImage).AssertOK()
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
localhostIP, reg.ListenPort, testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
localhostIP, reg.Port, testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
t.Logf("testImageRef=%q", testImageRef)
base.Cmd("tag", testutil.CommonImage, testImageRef).AssertOK()

Expand All @@ -69,12 +69,12 @@ func TestPushPlainHTTPInsecure(t *testing.T) {
testutil.DockerIncompatible(t)

base := testutil.NewBase(t)
reg := testregistry.NewPlainHTTP(base, 5000)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 0, false)
defer reg.Cleanup(nil)

base.Cmd("pull", testutil.CommonImage).AssertOK()
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
reg.IP.String(), reg.ListenPort, testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
reg.IP.String(), reg.Port, testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
t.Logf("testImageRef=%q", testImageRef)
base.Cmd("tag", testutil.CommonImage, testImageRef).AssertOK()

Expand All @@ -87,8 +87,8 @@ func TestPushPlainHttpInsecureWithDefaultPort(t *testing.T) {
testutil.DockerIncompatible(t)

base := testutil.NewBase(t)
reg := testregistry.NewPlainHTTP(base, 80)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 80, false)
defer reg.Cleanup(nil)

base.Cmd("pull", testutil.CommonImage).AssertOK()
testImageRef := fmt.Sprintf("%s/%s:%s",
Expand All @@ -105,14 +105,14 @@ func TestPushInsecureWithLogin(t *testing.T) {
testutil.DockerIncompatible(t)

base := testutil.NewBase(t)
reg := testregistry.NewHTTPS(base, "admin", "badmin")
defer reg.Cleanup()
reg := testregistry.NewWithTokenAuth(base, "admin", "badmin", 0, true)
defer reg.Cleanup(nil)

base.Cmd("--insecure-registry", "login", "-u", "admin", "-p", "badmin",
fmt.Sprintf("%s:%d", reg.IP.String(), reg.ListenPort)).AssertOK()
fmt.Sprintf("%s:%d", reg.IP.String(), reg.Port)).AssertOK()
base.Cmd("pull", testutil.CommonImage).AssertOK()
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
reg.IP.String(), reg.ListenPort, testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
reg.IP.String(), reg.Port, testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
t.Logf("testImageRef=%q", testImageRef)
base.Cmd("tag", testutil.CommonImage, testImageRef).AssertOK()

Expand All @@ -126,14 +126,14 @@ func TestPushWithHostsDir(t *testing.T) {
testutil.DockerIncompatible(t)

base := testutil.NewBase(t)
reg := testregistry.NewHTTPS(base, "admin", "badmin")
defer reg.Cleanup()
reg := testregistry.NewWithTokenAuth(base, "admin", "badmin", 0, true)
defer reg.Cleanup(nil)

base.Cmd("--hosts-dir", reg.HostsDir, "login", "-u", "admin", "-p", "badmin", fmt.Sprintf("%s:%d", reg.IP.String(), reg.ListenPort)).AssertOK()
base.Cmd("--hosts-dir", reg.HostsDir, "login", "-u", "admin", "-p", "badmin", fmt.Sprintf("%s:%d", reg.IP.String(), reg.Port)).AssertOK()

base.Cmd("pull", testutil.CommonImage).AssertOK()
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
reg.IP.String(), reg.ListenPort, testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
reg.IP.String(), reg.Port, testutil.Identifier(t), strings.Split(testutil.CommonImage, ":")[1])
t.Logf("testImageRef=%q", testImageRef)
base.Cmd("tag", testutil.CommonImage, testImageRef).AssertOK()

Expand All @@ -147,18 +147,18 @@ func TestPushNonDistributableArtifacts(t *testing.T) {
testutil.DockerIncompatible(t)

base := testutil.NewBase(t)
reg := testregistry.NewPlainHTTP(base, 5000)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 0, false)
defer reg.Cleanup(nil)

base.Cmd("pull", testutil.NonDistBlobImage).AssertOK()

testImgRef := fmt.Sprintf("%s:%d/%s:%s",
reg.IP.String(), reg.ListenPort, testutil.Identifier(t), strings.Split(testutil.NonDistBlobImage, ":")[1])
reg.IP.String(), reg.Port, testutil.Identifier(t), strings.Split(testutil.NonDistBlobImage, ":")[1])
base.Cmd("tag", testutil.NonDistBlobImage, testImgRef).AssertOK()

base.Cmd("--debug", "--insecure-registry", "push", testImgRef).AssertOK()

blobURL := fmt.Sprintf("http://%s:%d/v2/%s/blobs/%s", reg.IP.String(), reg.ListenPort, testutil.Identifier(t), testutil.NonDistBlobDigest)
blobURL := fmt.Sprintf("http://%s:%d/v2/%s/blobs/%s", reg.IP.String(), reg.Port, testutil.Identifier(t), testutil.NonDistBlobDigest)
resp, err := http.Get(blobURL)
assert.Assert(t, err, "error making http request")
if resp.Body != nil {
Expand All @@ -179,12 +179,12 @@ func TestPushSoci(t *testing.T) {
testutil.DockerIncompatible(t)
base := testutil.NewBase(t)
requiresSoci(base)
reg := testregistry.NewPlainHTTP(base, 5000)
defer reg.Cleanup()
reg := testregistry.NewWithNoAuth(base, 0, false)
defer reg.Cleanup(nil)

base.Cmd("pull", testutil.UbuntuImage).AssertOK()
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
reg.IP.String(), reg.ListenPort, testutil.Identifier(t), strings.Split(testutil.UbuntuImage, ":")[1])
reg.IP.String(), reg.Port, testutil.Identifier(t), strings.Split(testutil.UbuntuImage, ":")[1])
t.Logf("testImageRef=%q", testImageRef)
base.Cmd("tag", testutil.UbuntuImage, testImageRef).AssertOK()

Expand Down
Loading