feat!: add version check

Author: sdellaco

pkg/api/client.go

@@ -9,7 +9,6 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/docker/api/types/build"
 	"github.com/docker/docker/api/types/image"
-	"github.com/docker/docker/client"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/opencontainers/go-digest"
 	"github.com/silenium-dev/docker-wrapper/pkg/client/provider"
@@ -51,7 +50,7 @@ type SystemClient interface {
 }
 
 type ClientWrapper interface {
-	client.APIClient
+	DockerClient
 	ClientBase
 	ImageClient
 	ContainerClient

pkg/api/docker.go

@@ -0,0 +1,12 @@
+package api
+
+import (
+	"context"
+
+	"github.com/docker/docker/client"
+)
+
+type DockerClient interface {
+	client.APIClient
+	NewVersionError(ctx context.Context, APIrequired, feature string) error
+}

pkg/client/base.go

@@ -6,7 +6,7 @@ import (
 )
 
 func (c *Client) Close() error {
-	return c.APIClient.Close()
+	return c.DockerClient.Close()
 }
 
 func (c *Client) AuthProvider() provider.AuthProvider {

pkg/client/build.go

@@ -15,5 +15,5 @@ func (c *Client) ImageBuild(
 	maps.Copy(authConfigs, opts.AuthConfigs)
 	opts.AuthConfigs = authConfigs
 
-	return c.APIClient.ImageBuild(ctx, buildContext, opts)
+	return c.DockerClient.ImageBuild(ctx, buildContext, opts)
 }

pkg/client/client.go

@@ -8,13 +8,14 @@ import (
 
 	"github.com/docker/docker/client"
 	client2 "github.com/docker/go-sdk/client"
+	"github.com/silenium-dev/docker-wrapper/pkg/api"
 	"github.com/silenium-dev/docker-wrapper/pkg/client/provider"
 	"go.uber.org/zap"
 	"go.uber.org/zap/exp/zapslog"
 )
 
 type Client struct {
-	client.APIClient
+	api.DockerClient
 	sdkClient              *client2.Client
 	dockerOpts             []client.Opt
 	authProvider           provider.AuthProvider
@@ -43,7 +44,7 @@ func NewWithOpts(opts ...Opt) (*Client, error) {
 	if err != nil {
 		return nil, err
 	}
-	c.APIClient = cli
+	c.DockerClient = cli
 
 	result := &client2.Client{}
 	internal := (*sdkClient)(unsafe.Pointer(result))

pkg/client/image_pull.go

@@ -38,7 +38,7 @@ func (c *Client) ImagePullWithEvents(ctx context.Context, ref reference.Named, o
 		return v1.Hash{}, nil, nil, err
 	}
 
-	reader, err := c.APIClient.ImagePull(ctx, ref.String(), options)
+	reader, err := c.ImagePull(ctx, ref.String(), options)
 	if err != nil {
 		return v1.Hash{}, nil, nil, err
 	}

pkg/client/system.go

@@ -22,7 +22,7 @@ func (c *Client) SystemIsPodman(ctx context.Context) (bool, error) {
 }
 
 func (c *Client) SystemDefaultPlatform(ctx context.Context) (*v1.Platform, error) {
-	info, err := c.APIClient.Info(ctx)
+	info, err := c.Info(ctx)
 	if err != nil {
 		return nil, err
 	}