feat: add context for client interface

Author: d1nfinite

runtime/client.go

@@ -1,9 +1,12 @@
 package runtime
 
-import "github.com/chaitin/veinmind-common-go/pkg/auth"
+import (
+	"context"
+	"github.com/chaitin/veinmind-common-go/pkg/auth"
+)
 
 type Client interface {
-	Pull(repo string) (string, error)
-	Remove(id string) error
-	Auth(config auth.AuthConfig) error
+	Pull(ctx context.Context, repo string) (string, error)
+	Remove(ctx context.Context, id string) error
+	Auth(ctx context.Context, config auth.AuthConfig) error
 }

runtime/containerd.go

@@ -16,6 +16,7 @@ const (
 )
 
 type ContainerdClient struct {
+	ctx    context.Context
 	client *containerd.Client
 }
 
@@ -31,16 +32,16 @@ func NewContainerdClient() (Client, error) {
 	return c, nil
 }
 
-func (c *ContainerdClient) Auth(config auth.AuthConfig) error {
+func (c *ContainerdClient) Auth(ctx context.Context, config auth.AuthConfig) error {
 	return nil
 }
 
-func (c *ContainerdClient) Pull(repo string) (string, error) {
+func (c *ContainerdClient) Pull(ctx context.Context, repo string) (string, error) {
 	if named, err := reference.ParseDockerRef(repo); err == nil {
 		repo = named.String()
 	}
 
-	image, err := c.client.Pull(context.Background(), repo, containerd.WithPullUnpack)
+	image, err := c.client.Pull(ctx, repo, containerd.WithPullUnpack)
 	if err != nil {
 		return "", err
 	}
@@ -49,15 +50,15 @@ func (c *ContainerdClient) Pull(repo string) (string, error) {
 	return imageID, nil
 }
 
-func (c *ContainerdClient) Remove(repo string) error {
+func (c *ContainerdClient) Remove(ctx context.Context, repo string) error {
 	if named, err := reference.ParseDockerRef(repo); err == nil {
 		repo = named.String()
 	}
 
 	var (
-		ctx        = namespaces.WithNamespace(context.Background(), ns)
 		imageStore = c.client.ImageService()
 	)
+	ctx = namespaces.WithNamespace(ctx, ns)
 
 	var opts []images.DeleteOpt
 	opts = append(opts, images.SynchronousDelete())

runtime/containerd_test.go

@@ -1,6 +1,7 @@
 package runtime
 
 import (
+	"context"
 	"fmt"
 	"testing"
 )
@@ -11,7 +12,7 @@ func TestContainerdClient_Pull(t *testing.T) {
 		t.Error(err)
 	}
 
-	repo, err := c.Pull("ubuntu:latest")
+	repo, err := c.Pull(context.Background(), "ubuntu:latest")
 	if err != nil {
 		t.Error(err)
 	}

runtime/docker.go

@@ -136,15 +136,15 @@ func NewDockerClient(opts ...Option) (Client, error) {
 	return c, nil
 }
 
-func (client *DockerClient) Auth(config commonAuth.AuthConfig) error {
+func (client *DockerClient) Auth(ctx context.Context, config commonAuth.AuthConfig) error {
 	for _, auth := range config.Auths {
 		client.auth[auth.Registry] = auth
 	}
 
 	return nil
 }
 
-func (client *DockerClient) Pull(repo string) (string, error) {
+func (client *DockerClient) Pull(ctx context.Context, repo string) (string, error) {
 	c, err := dockercli.NewClientWithOpts(dockercli.FromEnv, dockercli.WithAPIVersionNegotiation(), dockercli.WithHost(client.host))
 	if err != nil {
 		return "", err
@@ -168,12 +168,12 @@ func (client *DockerClient) Pull(repo string) (string, error) {
 
 	var closer io.ReadCloser
 	if token == "" {
-		closer, err = c.ImagePull(client.ctx, repo, dockertypes.ImagePullOptions{})
+		closer, err = c.ImagePull(ctx, repo, dockertypes.ImagePullOptions{})
 		if err != nil {
 			return "", err
 		}
 	} else {
-		closer, err = c.ImagePull(client.ctx, repo, dockertypes.ImagePullOptions{
+		closer, err = c.ImagePull(ctx, repo, dockertypes.ImagePullOptions{
 			RegistryAuth: token,
 		})
 		if err != nil {
@@ -189,13 +189,13 @@ func (client *DockerClient) Pull(repo string) (string, error) {
 	return named.String(), nil
 }
 
-func (client *DockerClient) Remove(id string) error {
+func (client *DockerClient) Remove(ctx context.Context, id string) error {
 	c, err := dockercli.NewClientWithOpts(dockercli.FromEnv, dockercli.WithAPIVersionNegotiation(), dockercli.WithHost(client.host))
 	if err != nil {
 		return err
 	}
 
-	_, err = c.ImageRemove(client.ctx, id, dockertypes.ImageRemoveOptions{
+	_, err = c.ImageRemove(ctx, id, dockertypes.ImageRemoveOptions{
 		Force:         true,
 		PruneChildren: true,
 	})

runtime/docker_test.go

@@ -1,6 +1,7 @@
 package runtime
 
 import (
+	"context"
 	"fmt"
 	"testing"
 )
@@ -11,7 +12,7 @@ func TestDockerClient_Pull(t *testing.T) {
 		t.Error(err)
 	}
 
-	repo, err := d.Pull("ubuntu:latest")
+	repo, err := d.Pull(context.Background(), "ubuntu:latest")
 	if err != nil {
 		t.Error(err)
 	}

runtime/option.go

@@ -1,6 +1,7 @@
 package runtime
 
 import (
+	"context"
 	"github.com/chaitin/veinmind-common-go/pkg/auth"
 	"github.com/pkg/errors"
 )
@@ -19,7 +20,7 @@ func WithAuthFromPath(path string) Option {
 			return nil, err
 		}
 
-		err = c.Auth(*authConfig)
+		err = c.Auth(context.Background(), *authConfig)
 		if err != nil {
 			return nil, err
 		}
@@ -31,7 +32,7 @@ func WithAuthFromPath(path string) Option {
 // WithAuth init client authInfo with an entity directly
 func WithAuth(authConfig auth.AuthConfig) Option {
 	return func(c Client) (Client, error) {
-		err := c.Auth(authConfig)
+		err := c.Auth(context.Background(), authConfig)
 		if err != nil {
 			return nil, err
 		}