Port code to new API.

Signed-off-by: Marcin Owsiany <porridge@redhat.com>
kudobuilder · Nov 29, 2023 · e7e5965 · e7e5965
1 parent d3eac9a
commit e7e5965
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/pkg/test/harness.go b/pkg/test/harness.go
@@ -193,7 +193,7 @@ func (h *Harness) addNodeCaches(dockerClient testutils.DockerClient, kindCfg *ki
 	}
 
 	for index := range kindCfg.Nodes {
-		volume, err := dockerClient.VolumeCreate(context.TODO(), volumetypes.VolumeCreateBody{
+		volume, err := dockerClient.VolumeCreate(context.TODO(), volumetypes.CreateOptions{
 			Driver: "local",
 			Name:   fmt.Sprintf("%s-%d", h.TestSuite.KINDContext, index),
 		})

diff --git a/pkg/test/harness_test.go b/pkg/test/harness_test.go
@@ -6,7 +6,6 @@ import (
 	"io"
 	"testing"
 
-	dockertypes "github.com/docker/docker/api/types"
 	volumetypes "github.com/docker/docker/api/types/volume"
 	"github.com/stretchr/testify/assert"
 	kindConfig "sigs.k8s.io/kind/pkg/apis/config/v1alpha4"
@@ -42,9 +41,9 @@ func newDockerMock() *dockerMock {
 	}
 }
 
-func (d *dockerMock) VolumeCreate(_ context.Context, body volumetypes.VolumeCreateBody) (dockertypes.Volume, error) {
-	return dockertypes.Volume{
-		Mountpoint: fmt.Sprintf("/var/lib/docker/data/%s", body.Name),
+func (d *dockerMock) VolumeCreate(_ context.Context, options volumetypes.CreateOptions) (volumetypes.Volume, error) {
+	return volumetypes.Volume{
+		Mountpoint: fmt.Sprintf("/var/lib/docker/data/%s", options.Name),
 	}, nil
 }
 

diff --git a/pkg/test/utils/docker.go b/pkg/test/utils/docker.go
@@ -4,13 +4,12 @@ import (
 	"context"
 	"io"
 
-	dockertypes "github.com/docker/docker/api/types"
 	volumetypes "github.com/docker/docker/api/types/volume"
 )
 
 // DockerClient is a wrapper interface for the Docker library to support unit testing.
 type DockerClient interface {
 	NegotiateAPIVersion(context.Context)
-	VolumeCreate(context.Context, volumetypes.VolumeCreateBody) (dockertypes.Volume, error)
+	VolumeCreate(context.Context, volumetypes.CreateOptions) (volumetypes.Volume, error)
 	ImageSave(context.Context, []string) (io.ReadCloser, error)
 }