don't use deprecated stuff

Signed-off-by: Jason Hall <[email protected]>

Author: imjasonh

pkg/v1/daemon/options.go

@@ -98,7 +98,7 @@ func WithContext(ctx context.Context) Option {
 type Client interface {
 	NegotiateAPIVersion(ctx context.Context)
 	ImageSave(context.Context, []string) (io.ReadCloser, error)
-	ImageLoad(context.Context, io.Reader, bool) (types.ImageLoadResponse, error)
+	ImageLoad(context.Context, io.Reader, bool) (api.LoadResponse, error)
 	ImageTag(context.Context, string, string) error
 	ImageInspectWithRaw(context.Context, string) (types.ImageInspect, []byte, error)
 	ImageHistory(context.Context, string) ([]api.HistoryResponseItem, error)

pkg/v1/daemon/write_test.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/api/types"
+	api "github.com/docker/docker/api/types/image"
 
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/empty"
@@ -37,16 +37,16 @@ func (r *errReader) Read(_ []byte) (int, error) {
 	return 0, r.err
 }
 
-func (m *MockClient) ImageLoad(ctx context.Context, r io.Reader, _ bool) (types.ImageLoadResponse, error) {
+func (m *MockClient) ImageLoad(ctx context.Context, r io.Reader, _ bool) (api.LoadResponse, error) {
 	if !m.negotiated {
-		return types.ImageLoadResponse{}, errors.New("you forgot to call NegotiateAPIVersion before calling ImageLoad")
+		return api.LoadResponse{}, errors.New("you forgot to call NegotiateAPIVersion before calling ImageLoad")
 	}
 	if m.wantCtx != nil && m.wantCtx != ctx {
-		return types.ImageLoadResponse{}, fmt.Errorf("ImageLoad: wrong context")
+		return api.LoadResponse{}, fmt.Errorf("ImageLoad: wrong context")
 	}
 
 	_, _ = io.Copy(io.Discard, r)
-	return types.ImageLoadResponse{
+	return api.LoadResponse{
 		Body: m.loadBody,
 	}, m.loadErr
 }