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

all: Replace deprecated ImageInspectWithRaw usage

Browse Source 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski
2025-02-03 14:54:57 +01:00
parent 3d37537f75
commit a096045678
18 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration-cli/docker_api_build_test.go
View File

@@ -320,7 +320,7 @@ func (s *DockerAPISuite) TestBuildOnBuildCache(c *testing.T) {
// check parentID is correct
// Parent is graphdriver-only
if !testEnv.UsingSnapshotter() {
image, _, err := client.ImageInspectWithRaw(ctx, childID)
image, err := client.ImageInspect(ctx, childID)
assert.NilError(c, err)
assert.Check(c, is.Equal(parentID, image.Parent))

2
integration-cli/docker_api_inspect_test.go
View File

@@ -76,7 +76,7 @@ func (s *DockerAPISuite) TestInspectAPIImageResponse(c *testing.T) {
assert.NilError(c, err)
defer apiClient.Close()
imageJSON, _, err := apiClient.ImageInspectWithRaw(testutil.GetContext(c), "busybox")
imageJSON, err := apiClient.ImageInspect(testutil.GetContext(c), "busybox")
assert.NilError(c, err)
assert.Check(c, len(imageJSON.RepoTags) == 2)

4
integration/build/build_squash_test.go
View File

@@ -65,7 +65,7 @@ func TestBuildSquashParent(t *testing.T) {
resp.Body.Close()
assert.NilError(t, err)
inspect, _, err := client.ImageInspectWithRaw(ctx, name)
inspect, err := client.ImageInspect(ctx, name)
assert.NilError(t, err)
origID := inspect.ID
@@ -114,7 +114,7 @@ func TestBuildSquashParent(t *testing.T) {
testHistory, err := client.ImageHistory(ctx, name, image.HistoryOptions{})
assert.NilError(t, err)
inspect, _, err = client.ImageInspectWithRaw(ctx, name)
inspect, err = client.ImageInspect(ctx, name)
assert.NilError(t, err)
assert.Check(t, is.Len(testHistory, len(origHistory)+1))
assert.Check(t, is.Len(inspect.RootFS.Layers, 2))

10
integration/build/build_test.go
View File

@@ -181,7 +181,7 @@ func TestBuildMultiStageCopy(t *testing.T) {
assert.NilError(t, err)
// verify the image was successfully built
_, _, err = apiclient.ImageInspectWithRaw(ctx, imgName)
_, err = apiclient.ImageInspect(ctx, imgName)
if err != nil {
t.Log(out)
}
@@ -222,7 +222,7 @@ func TestBuildMultiStageParentConfig(t *testing.T) {
assert.Check(t, resp.Body.Close())
assert.NilError(t, err)
img, _, err := apiclient.ImageInspectWithRaw(ctx, imgName)
img, err := apiclient.ImageInspect(ctx, imgName)
assert.NilError(t, err)
expected := "/foo/sub2"
@@ -271,7 +271,7 @@ func TestBuildLabelWithTargets(t *testing.T) {
assert.Check(t, resp.Body.Close())
assert.NilError(t, err)
img, _, err := apiclient.ImageInspectWithRaw(ctx, imgName)
img, err := apiclient.ImageInspect(ctx, imgName)
assert.NilError(t, err)
testLabels["label-a"] = "inline-a"
@@ -298,7 +298,7 @@ func TestBuildLabelWithTargets(t *testing.T) {
assert.Check(t, resp.Body.Close())
assert.NilError(t, err)
img, _, err = apiclient.ImageInspectWithRaw(ctx, imgName)
img, err = apiclient.ImageInspect(ctx, imgName)
assert.NilError(t, err)
testLabels["label-b"] = "inline-b"
@@ -380,7 +380,7 @@ RUN cat somefile`
assert.NilError(t, err)
assert.Assert(t, is.Equal(3, len(imageIDs)))
img, _, err := apiclient.ImageInspectWithRaw(ctx, imageIDs[2])
img, err := apiclient.ImageInspect(ctx, imageIDs[2])
assert.NilError(t, err)
assert.Check(t, is.Contains(img.Config.Env, "bar=baz"))
}

4
integration/container/create_test.go
View File

@@ -75,7 +75,7 @@ func TestCreateByImageID(t *testing.T) {
ctx := setupTest(t)
apiClient := testEnv.APIClient()
img, _, err := apiClient.ImageInspectWithRaw(ctx, "busybox")
img, err := apiClient.ImageInspect(ctx, "busybox")
assert.NilError(t, err)
imgIDWithAlgorithm := img.ID
@@ -547,7 +547,7 @@ func TestCreateDifferentPlatform(t *testing.T) {
ctx := setupTest(t)
apiClient := testEnv.APIClient()
img, _, err := apiClient.ImageInspectWithRaw(ctx, "busybox:latest")
img, err := apiClient.ImageInspect(ctx, "busybox:latest")
assert.NilError(t, err)
assert.Assert(t, img.Architecture != "")

2
integration/container/inspect_test.go
View File

@@ -122,7 +122,7 @@ func TestInspectImageManifestPlatform(t *testing.T) {
ctr := container.Create(ctx, t, apiClient, container.WithImage(tc.image))
defer apiClient.ContainerRemove(ctx, ctr, containertypes.RemoveOptions{Force: true})
img, _, err := apiClient.ImageInspectWithRaw(ctx, tc.image)
img, err := apiClient.ImageInspect(ctx, tc.image)
assert.NilError(t, err)
hostPlatform := platforms.Platform{

4
integration/image/commit_test.go
View File

@@ -29,7 +29,7 @@ func TestCommitInheritsEnv(t *testing.T) {
})
assert.NilError(t, err)
image1, _, err := client.ImageInspectWithRaw(ctx, commitResp1.ID)
image1, err := client.ImageInspect(ctx, commitResp1.ID)
assert.NilError(t, err)
expectedEnv1 := []string{"PATH=/bin"}
@@ -43,7 +43,7 @@ func TestCommitInheritsEnv(t *testing.T) {
})
assert.NilError(t, err)
image2, _, err := client.ImageInspectWithRaw(ctx, commitResp2.ID)
image2, err := client.ImageInspect(ctx, commitResp2.ID)
assert.NilError(t, err)
expectedEnv2 := []string{"PATH=/usr/bin:/bin"}
assert.Check(t, is.DeepEqual(expectedEnv2, image2.Config.Env))

2
integration/image/import_test.go
View File

@@ -114,7 +114,7 @@ func TestImportWithCustomPlatform(t *testing.T) {
imagetypes.ImportOptions{Platform: tc.platform})
assert.NilError(t, err)
inspect, _, err := client.ImageInspectWithRaw(ctx, reference)
inspect, err := client.ImageInspect(ctx, reference)
assert.NilError(t, err)
assert.Equal(t, inspect.Os, tc.expected.OS)
assert.Equal(t, inspect.Architecture, tc.expected.Architecture)

17
integration/image/inspect_test.go
View File

@@ -1,10 +1,12 @@
package image
import (
"bytes"
"encoding/json"
"testing"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/client"
"github.com/docker/docker/internal/testutils/specialimage"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
@@ -16,11 +18,12 @@ func TestImageInspectEmptyTagsAndDigests(t *testing.T) {
skip.If(t, testEnv.DaemonInfo.OSType == "windows", "build-empty-images is not called on Windows")
ctx := setupTest(t)
client := testEnv.APIClient()
apiClient := testEnv.APIClient()
danglingID := specialimage.Load(ctx, t, client, specialimage.Dangling)
danglingID := specialimage.Load(ctx, t, apiClient, specialimage.Dangling)
inspect, raw, err := client.ImageInspectWithRaw(ctx, danglingID)
var raw bytes.Buffer
inspect, err := apiClient.ImageInspect(ctx, danglingID, client.ImageInspectWithRawResponse(&raw))
assert.NilError(t, err)
// Must be a zero length array, not null.
@@ -28,7 +31,7 @@ func TestImageInspectEmptyTagsAndDigests(t *testing.T) {
assert.Check(t, is.Len(inspect.RepoDigests, 0))
var rawJson map[string]interface{}
err = json.Unmarshal(raw, &rawJson)
err = json.Unmarshal(raw.Bytes(), &rawJson)
assert.NilError(t, err)
// Check if the raw json is also an array, not null.
@@ -42,7 +45,7 @@ func TestImageInspectUniqueRepoDigests(t *testing.T) {
client := testEnv.APIClient()
before, _, err := client.ImageInspectWithRaw(ctx, "busybox")
before, err := client.ImageInspect(ctx, "busybox")
assert.NilError(t, err)
for _, tag := range []string{"master", "newest"} {
@@ -54,7 +57,7 @@ func TestImageInspectUniqueRepoDigests(t *testing.T) {
}()
}
after, _, err := client.ImageInspectWithRaw(ctx, "busybox")
after, err := client.ImageInspect(ctx, "busybox")
assert.NilError(t, err)
assert.Check(t, is.Len(after.RepoDigests, len(before.RepoDigests)))
@@ -65,7 +68,7 @@ func TestImageInspectDescriptor(t *testing.T) {
client := testEnv.APIClient()
inspect, _, err := client.ImageInspectWithRaw(ctx, "busybox")
inspect, err := client.ImageInspect(ctx, "busybox")
assert.NilError(t, err)
if !testEnv.UsingSnapshotter() {

4
integration/image/list_test.go
View File

@@ -81,11 +81,11 @@ func TestImagesFilterUntil(t *testing.T) {
imgs[i] = id.ID
}
olderImage, _, err := client.ImageInspectWithRaw(ctx, imgs[2])
olderImage, err := client.ImageInspect(ctx, imgs[2])
assert.NilError(t, err)
olderUntil := olderImage.Created
laterImage, _, err := client.ImageInspectWithRaw(ctx, imgs[3])
laterImage, err := client.ImageInspect(ctx, imgs[3])
assert.NilError(t, err)
laterUntil := laterImage.Created

14
integration/image/prune_test.go
View File

@@ -33,7 +33,7 @@ func TestPruneDontDeleteUsedDangling(t *testing.T) {
danglingID := specialimage.Load(ctx, t, client, specialimage.Dangling)
_, _, err := client.ImageInspectWithRaw(ctx, danglingID)
_, err := client.ImageInspect(ctx, danglingID)
assert.NilError(t, err, "Test dangling image doesn't exist")
container.Create(ctx, t, client,
@@ -49,7 +49,7 @@ func TestPruneDontDeleteUsedDangling(t *testing.T) {
}
}
_, _, err = client.ImageInspectWithRaw(ctx, danglingID)
_, err = client.ImageInspect(ctx, danglingID)
assert.NilError(t, err, "Test dangling image should still exist")
}
@@ -68,7 +68,7 @@ func TestPruneLexographicalOrder(t *testing.T) {
d.LoadBusybox(ctx, t)
inspect, _, err := apiClient.ImageInspectWithRaw(ctx, "busybox:latest")
inspect, err := apiClient.ImageInspect(ctx, "busybox:latest")
assert.NilError(t, err)
id := inspect.ID
@@ -117,7 +117,7 @@ func TestPruneDontDeleteUsedImage(t *testing.T) {
check: func(t *testing.T, apiClient *client.Client, pruned image.PruneReport) {
assert.Check(t, is.Len(pruned.ImagesDeleted, 0))
_, _, err := apiClient.ImageInspectWithRaw(ctx, "busybox:latest")
_, err := apiClient.ImageInspect(ctx, "busybox:latest")
assert.NilError(t, err, "Busybox image should still exist")
},
},
@@ -134,10 +134,10 @@ func TestPruneDontDeleteUsedImage(t *testing.T) {
assert.Check(t, is.Equal(pruned.ImagesDeleted[0].Untagged, "busybox:a"))
}
_, _, err := apiClient.ImageInspectWithRaw(ctx, "busybox:a")
_, err := apiClient.ImageInspect(ctx, "busybox:a")
assert.Check(t, err != nil, "Busybox:a image should be deleted")
_, _, err = apiClient.ImageInspectWithRaw(ctx, "busybox:latest")
_, err = apiClient.ImageInspect(ctx, "busybox:latest")
assert.Check(t, err == nil, "Busybox:latest image should still exist")
},
},
@@ -206,7 +206,7 @@ func TestPruneDontDeleteUsedImage(t *testing.T) {
assert.NilError(t, err, "prepare failed")
}
inspect, _, err := apiClient.ImageInspectWithRaw(ctx, "busybox:latest")
inspect, err := apiClient.ImageInspect(ctx, "busybox:latest")
assert.NilError(t, err)
image := tc.imageID(t, inspect)

4
integration/image/pull_test.go
View File

@@ -209,7 +209,7 @@ func TestImagePullKeepOldAsDangling(t *testing.T) {
apiClient := d.NewClientT(t)
inspect1, _, err := apiClient.ImageInspectWithRaw(ctx, "busybox:latest")
inspect1, err := apiClient.ImageInspect(ctx, "busybox:latest")
assert.NilError(t, err)
prevID := inspect1.ID
@@ -231,6 +231,6 @@ func TestImagePullKeepOldAsDangling(t *testing.T) {
t.Log(b.String())
_, _, err = apiClient.ImageInspectWithRaw(ctx, prevID)
_, err = apiClient.ImageInspect(ctx, prevID)
assert.NilError(t, err)
}

14
integration/image/remove_test.go
View File

@@ -29,7 +29,7 @@ func TestRemoveImageOrphaning(t *testing.T) {
assert.NilError(t, err)
// verifies that reference now points to first image
resp, _, err := client.ImageInspectWithRaw(ctx, imgName)
resp, err := client.ImageInspect(ctx, imgName)
assert.NilError(t, err)
assert.Check(t, is.Equal(resp.ID, commitResp1.ID))
@@ -42,7 +42,7 @@ func TestRemoveImageOrphaning(t *testing.T) {
assert.NilError(t, err)
// verifies that reference now points to second image
resp, _, err = client.ImageInspectWithRaw(ctx, imgName)
resp, err = client.ImageInspect(ctx, imgName)
assert.NilError(t, err)
assert.Check(t, is.Equal(resp.ID, commitResp2.ID))
@@ -51,12 +51,12 @@ func TestRemoveImageOrphaning(t *testing.T) {
assert.NilError(t, err)
// check if the first image is still there
resp, _, err = client.ImageInspectWithRaw(ctx, commitResp1.ID)
resp, err = client.ImageInspect(ctx, commitResp1.ID)
assert.NilError(t, err)
assert.Check(t, is.Equal(resp.ID, commitResp1.ID))
// check if the second image has been deleted
_, _, err = client.ImageInspectWithRaw(ctx, commitResp2.ID)
_, err = client.ImageInspect(ctx, commitResp2.ID)
assert.Check(t, is.ErrorContains(err, "No such image:"))
}
@@ -69,7 +69,7 @@ func TestRemoveByDigest(t *testing.T) {
err := client.ImageTag(ctx, "busybox", "test-remove-by-digest:latest")
assert.NilError(t, err)
inspect, _, err := client.ImageInspectWithRaw(ctx, "test-remove-by-digest")
inspect, err := client.ImageInspect(ctx, "test-remove-by-digest")
assert.NilError(t, err)
id := ""
@@ -85,9 +85,9 @@ func TestRemoveByDigest(t *testing.T) {
_, err = client.ImageRemove(ctx, id, image.RemoveOptions{})
assert.NilError(t, err)
inspect, _, err = client.ImageInspectWithRaw(ctx, "busybox")
inspect, err = client.ImageInspect(ctx, "busybox")
assert.Check(t, err, "busybox image got deleted")
inspect, _, err = client.ImageInspectWithRaw(ctx, "test-remove-by-digest")
inspect, err = client.ImageInspect(ctx, "test-remove-by-digest")
assert.Check(t, is.ErrorType(err, errdefs.IsNotFound))
}

2
integration/image/remove_unix_test.go
View File

@@ -76,7 +76,7 @@ func TestRemoveImageGarbageCollector(t *testing.T) {
_, err = io.Copy(io.Discard, resp.Body)
resp.Body.Close()
assert.NilError(t, err)
img, _, err := client.ImageInspectWithRaw(ctx, imgName)
img, err := client.ImageInspect(ctx, imgName)
assert.NilError(t, err)
// Mark latest image layer to immutable

10
integration/image/save_test.go
View File

@@ -62,7 +62,7 @@ func TestSaveCheckTimes(t *testing.T) {
client := testEnv.APIClient()
const repoName = "busybox:latest"
img, _, err := client.ImageInspectWithRaw(ctx, repoName)
img, err := client.ImageInspect(ctx, repoName)
assert.NilError(t, err)
rdr, err := client.ImageSave(ctx, []string{repoName}, image.SaveOptions{})
@@ -99,7 +99,7 @@ func TestSaveOCI(t *testing.T) {
client := testEnv.APIClient()
const busybox = "busybox:latest"
inspectBusybox, _, err := client.ImageInspectWithRaw(ctx, busybox)
inspectBusybox, err := client.ImageInspect(ctx, busybox)
assert.NilError(t, err)
type testCase struct {
@@ -136,7 +136,7 @@ func TestSaveOCI(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.image, func(t *testing.T) {
// Get information about the original image.
inspect, _, err := client.ImageInspectWithRaw(ctx, tc.image)
inspect, err := client.ImageInspect(ctx, tc.image)
assert.NilError(t, err)
rdr, err := client.ImageSave(ctx, []string{tc.image}, image.SaveOptions{})
@@ -221,7 +221,7 @@ func TestSavePlatform(t *testing.T) {
client := testEnv.APIClient()
const repoName = "busybox:latest"
_, _, err := client.ImageInspectWithRaw(ctx, repoName)
_, err := client.ImageInspect(ctx, repoName)
assert.NilError(t, err)
_, err = client.ImageSave(ctx, []string{repoName}, image.SaveOptions{
@@ -253,7 +253,7 @@ func TestSaveRepoWithMultipleImages(t *testing.T) {
return res.ID
}
busyboxImg, _, err := client.ImageInspectWithRaw(ctx, "busybox:latest")
busyboxImg, err := client.ImageInspect(ctx, "busybox:latest")
assert.NilError(t, err)
const repoName = "foobar-save-multi-images-test"

6
integration/image/tag_test.go
View File

@@ -19,7 +19,7 @@ func TestTagUnprefixedRepoByNameOrName(t *testing.T) {
assert.NilError(t, err)
// By ID
insp, _, err := client.ImageInspectWithRaw(ctx, "busybox")
insp, err := client.ImageInspect(ctx, "busybox")
assert.NilError(t, err)
err = client.ImageTag(ctx, insp.ID, "testfoobarbaz")
assert.NilError(t, err)
@@ -78,7 +78,7 @@ func TestTagOfficialNames(t *testing.T) {
assert.NilError(t, err)
// ensure we don't have multiple tag names.
insp, _, err := client.ImageInspectWithRaw(ctx, "busybox")
insp, err := client.ImageInspect(ctx, "busybox")
assert.NilError(t, err)
// TODO(vvoland): Not sure what's actually being tested here. Is is still doing anything useful?
assert.Assert(t, !is.Contains(insp.RepoTags, name)().Success())
@@ -100,6 +100,6 @@ func TestTagMatchesDigest(t *testing.T) {
assert.Check(t, is.ErrorContains(err, "refusing to create a tag with a digest reference"))
// check that no new image matches the digest
_, _, err = client.ImageInspectWithRaw(ctx, digest)
_, err = client.ImageInspect(ctx, digest)
assert.Check(t, is.ErrorContains(err, fmt.Sprintf("No such image: %s", digest)))
}

8
integration/volume/mount_test.go
View File

@@ -195,7 +195,7 @@ func TestRunMountImage(t *testing.T) {
// Test image mounted is in use logic
if tc.name == "image_remove" {
img, _, _ := apiClient.ImageInspectWithRaw(ctx, testImage)
img, _ := apiClient.ImageInspect(ctx, testImage)
imgId := strings.Split(img.ID, ":")[1]
_, removeErr := apiClient.ImageRemove(ctx, testImage, image.RemoveOptions{})
assert.ErrorContains(t, removeErr, fmt.Sprintf(`container %s is using its referenced image %s`, id[:12], imgId[:12]))
@@ -298,7 +298,7 @@ func setupTestVolume(t *testing.T, client client.APIClient) string {
return volumeName
}
func setupTestImage(t *testing.T, ctx context.Context, client client.APIClient, test string, snapshotter bool) string {
func setupTestImage(t *testing.T, ctx context.Context, apiClient client.APIClient, test string, snapshotter bool) string {
imgName := "test-image"
if test == "image_tag" {
@@ -334,7 +334,7 @@ func setupTestImage(t *testing.T, ctx context.Context, client client.APIClient,
)
defer source.Close()
resp, err := client.ImageBuild(ctx,
resp, err := apiClient.ImageBuild(ctx,
source.AsTarReader(t),
types.ImageBuildOptions{
Remove: false,
@@ -348,7 +348,7 @@ func setupTestImage(t *testing.T, ctx context.Context, client client.APIClient,
assert.Check(t, resp.Body.Close())
assert.NilError(t, err)
_, _, err = client.ImageInspectWithRaw(ctx, imgName)
_, err = apiClient.ImageInspect(ctx, imgName)
if err != nil {
t.Log(out)
}

2
testutil/fixtures/load/frozen.go
View File

@@ -85,7 +85,7 @@ func FrozenImagesLinux(ctx context.Context, client client.APIClient, images ...s
func imageExists(ctx context.Context, client client.APIClient, name string) bool {
ctx, span := otel.Tracer("").Start(ctx, "check image exists: "+name)
defer span.End()
_, _, err := client.ImageInspectWithRaw(ctx, name)
_, err := client.ImageInspect(ctx, name)
if err != nil {
span.RecordError(err)
}