InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: PluginInspectWithRaw: refactor and rename to PluginInspect

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-10-21 23:14:08 +02:00
parent 2401bd1e12
commit ebc92e015a
11 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
integration/plugin/common/plugin_test.go
View File

@@ -120,7 +120,7 @@ func TestPluginInstall(t *testing.T) {
_, err = io.Copy(io.Discard, rdr)
assert.NilError(t, err)
_, _, err = apiclient.PluginInspectWithRaw(ctx, repo)
_, err = apiclient.PluginInspect(ctx, repo, client.PluginInspectOptions{})
assert.NilError(t, err)
})
@@ -163,7 +163,7 @@ func TestPluginInstall(t *testing.T) {
_, err = io.Copy(io.Discard, rdr)
assert.NilError(t, err)
_, _, err = apiclient.PluginInspectWithRaw(ctx, repo)
_, err = apiclient.PluginInspect(ctx, repo, client.PluginInspectOptions{})
assert.NilError(t, err)
})
@@ -192,7 +192,7 @@ func TestPluginInstall(t *testing.T) {
_, err = io.Copy(io.Discard, rdr)
assert.NilError(t, err)
_, _, err = apiclient.PluginInspectWithRaw(ctx, repo)
_, err = apiclient.PluginInspect(ctx, repo, client.PluginInspectOptions{})
assert.NilError(t, err)
})
t.Run("with insecure", func(t *testing.T) {
@@ -234,15 +234,15 @@ func TestPluginInstall(t *testing.T) {
repo := path.Join(regURL, name+":latest")
assert.NilError(t, plugin.CreateInRegistry(ctx, repo, nil, plugin.WithInsecureRegistry(regURL)))
apiclient := d.NewClientT(t)
rdr, err := apiclient.PluginInstall(ctx, repo, client.PluginInstallOptions{Disabled: true, RemoteRef: repo})
apiClient := d.NewClientT(t)
rdr, err := apiClient.PluginInstall(ctx, repo, client.PluginInstallOptions{Disabled: true, RemoteRef: repo})
assert.NilError(t, err)
defer rdr.Close()
_, err = io.Copy(io.Discard, rdr)
assert.NilError(t, err)
_, _, err = apiclient.PluginInspectWithRaw(ctx, repo)
_, err = apiClient.PluginInspect(ctx, repo, client.PluginInspectOptions{})
assert.NilError(t, err)
})
// TODO: test insecure registry with https

4
integration/plugin/volumes/mounts_test.go
View File

@@ -54,7 +54,7 @@ func TestPluginWithDevMounts(t *testing.T) {
assert.Check(t, err)
}()
p, _, err := c.PluginInspectWithRaw(ctx, "test")
resp, err := c.PluginInspect(ctx, "test", client.PluginInspectOptions{})
assert.NilError(t, err)
assert.Assert(t, p.Enabled)
assert.Assert(t, resp.Plugin.Enabled)
}

4
integration/service/plugin_test.go
View File

@@ -72,10 +72,10 @@ func TestServicePlugin(t *testing.T) {
t.Log("No tasks found for plugin service")
t.Fail()
}
p, _, err := d1.NewClientT(t).PluginInspectWithRaw(ctx, name)
res, err := d1.NewClientT(t).PluginInspect(ctx, name, client.PluginInspectOptions{})
assert.NilError(t, err, "Error inspecting service plugin")
found := false
for _, env := range p.Settings.Env {
for _, env := range res.Plugin.Settings.Env {
assert.Equal(t, strings.HasPrefix(env, "baz"), false, "Environment variable entry %q is invalid and should not be present", "baz")
if strings.HasPrefix(env, "foo=") {
found = true