fix: more deprecation warnings

Author: alphanota

acceptance/reproducibility_test.go

@@ -48,7 +48,7 @@ func testReproducibility(t *testing.T, _ spec.G, it spec.S) {
 		imageName1, imageName2 string
 		layer1, layer2         string
 		mutateAndSave          func(t *testing.T, image imgutil.Image)
-		dockerClient           dockerclient.CommonAPIClient
+		dockerClient           dockerclient.APIClient
 		runnableBaseImageName  string
 	)
 

local/new.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/client"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
@@ -119,8 +118,8 @@ func processImageOption(repoName string, dockerClient DockerClient, downloadLaye
 	}, nil
 }
 
-func getInspectAndHistory(repoName string, dockerClient DockerClient) (*types.ImageInspect, []image.HistoryResponseItem, error) {
-	inspect, _, err := dockerClient.ImageInspectWithRaw(context.Background(), repoName)
+func getInspectAndHistory(repoName string, dockerClient DockerClient) (*image.InspectResponse, []image.HistoryResponseItem, error) {
+	inspect, err := dockerClient.ImageInspect(context.Background(), repoName)
 	if err != nil {
 		if client.IsErrNotFound(err) {
 			return nil, nil, nil

local/store.go

@@ -39,7 +39,7 @@ type Store struct {
 // DockerClient is subset of client.CommonAPIClient required by this package.
 type DockerClient interface {
 	ImageHistory(ctx context.Context, image string, opts ...client.ImageHistoryOption) ([]image.HistoryResponseItem, error)
-	ImageInspectWithRaw(ctx context.Context, image string) (types.ImageInspect, []byte, error)
+	ImageInspect(ctx context.Context, image string) (image.InspectResponse, error)
 	ImageLoad(ctx context.Context, input io.Reader, opts ...client.ImageLoadOption) (image.LoadResponse, error)
 	ImageRemove(ctx context.Context, image string, options image.RemoveOptions) ([]image.DeleteResponse, error)
 	ImageSave(ctx context.Context, images []string, saveOpts ...client.ImageSaveOption) (io.ReadCloser, error)
@@ -64,7 +64,7 @@ func NewStore(dockerClient DockerClient) *Store {
 // images
 
 func (s *Store) Contains(identifier string) bool {
-	_, _, err := s.dockerClient.ImageInspectWithRaw(context.Background(), identifier)
+	_, err := s.dockerClient.ImageInspect(context.Background(), identifier)
 	return err == nil
 }
 
@@ -80,10 +80,10 @@ func (s *Store) Delete(identifier string) error {
 	return err
 }
 
-func (s *Store) Save(image *Image, withName string, withAdditionalNames ...string) (string, error) {
+func (s *Store) Save(img *Image, withName string, withAdditionalNames ...string) (string, error) {
 	withName = tryNormalizing(withName)
 	var (
-		inspect types.ImageInspect
+		inspect image.InspectResponse
 		err     error
 	)
 
@@ -92,13 +92,13 @@ func (s *Store) Save(image *Image, withName string, withAdditionalNames ...strin
 	if canOmitBaseLayers {
 		// During the first save attempt some layers may be excluded.
 		// The docker daemon allows this if the given set of layers already exists in the daemon in the given order.
-		inspect, err = s.doSave(image, withName)
+		inspect, err = s.doSave(img, withName)
 	}
 	if !canOmitBaseLayers || err != nil {
-		if err = image.ensureLayers(); err != nil {
+		if err = img.ensureLayers(); err != nil {
 			return "", err
 		}
-		inspect, err = s.doSave(image, withName)
+		inspect, err = s.doSave(img, withName)
 		if err != nil {
 			saveErr := imgutil.SaveError{}
 			for _, n := range append([]string{withName}, withAdditionalNames...) {
@@ -146,7 +146,7 @@ func usesContainerdStorage(docker DockerClient) bool {
 	return false
 }
 
-func (s *Store) doSave(img v1.Image, withName string) (types.ImageInspect, error) {
+func (s *Store) doSave(img v1.Image, withName string) (image.InspectResponse, error) {
 	ctx := context.Background()
 	done := make(chan error)
 
@@ -180,21 +180,21 @@ func (s *Store) doSave(img v1.Image, withName string) (types.ImageInspect, error
 	defer tw.Close()
 
 	if err = s.addImageToTar(tw, img, withName); err != nil {
-		return types.ImageInspect{}, err
+		return image.InspectResponse{}, err
 	}
 	tw.Close()
 	pw.Close()
 	err = <-done
 	if err != nil {
-		return types.ImageInspect{}, fmt.Errorf("loading image %q. first error: %w", withName, err)
+		return image.InspectResponse{}, fmt.Errorf("loading image %q. first error: %w", withName, err)
 	}
 
-	inspect, _, err := s.dockerClient.ImageInspectWithRaw(context.Background(), withName)
+	inspect, err := s.dockerClient.ImageInspect(context.Background(), withName)
 	if err != nil {
 		if client.IsErrNotFound(err) {
-			return types.ImageInspect{}, fmt.Errorf("saving image %q: %w", withName, err)
+			return image.InspectResponse{}, fmt.Errorf("saving image %q: %w", withName, err)
 		}
-		return types.ImageInspect{}, err
+		return image.InspectResponse{}, err
 	}
 	return inspect, nil
 }