Fix type deprecations in latest Moby release

ChrisWiegman · Feb 23, 2025 · 0eb54f3 · 0eb54f3
1 parent 96cce82
commit 0eb54f3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/internal/docker/container.go b/internal/docker/container.go
@@ -12,7 +12,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/mount"
@@ -115,10 +114,10 @@ func (d *Client) ContainerExec(containerName string, rootUser bool, command []st
 }
 
 // ContainerGetMounts Returns a slice containing all the mounts to the given container.
-func (d *Client) ContainerGetMounts(containerName string) []types.MountPoint {
+func (d *Client) ContainerGetMounts(containerName string) []container.MountPoint {
 	containerID, isRunning := d.containerIsRunning(containerName)
 	if !isRunning {
-		return []types.MountPoint{}
+		return []container.MountPoint{}
 	}
 
 	results, _ := d.apiClient.ContainerInspect(context.Background(), containerID)
@@ -145,7 +144,7 @@ func (d *Client) containerIsRunning(containerName string) (id string, isRunning
 }
 
 // ContainerList Lists all running containers for a given site or all sites if no site is specified.
-func (d *Client) ContainerList(site string) ([]types.Container, error) {
+func (d *Client) ContainerList(site string) ([]container.Summary, error) {
 	f := filters.NewArgs()
 
 	if site == "" {

diff --git a/internal/docker/docker_test.go b/internal/docker/docker_test.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/ChrisWiegman/kana/internal/docker/mocks"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/stretchr/testify/assert"
 )
@@ -38,9 +37,9 @@ func TestEnsureDockerIsAvailable(t *testing.T) {
 		apiClient := new(mocks.APIClient)
 
 		if test.exitStatus == 0 {
-			apiClient.On("ContainerList", context.Background(), container.ListOptions{}).Return([]types.Container{}, test.dockerOutput).Once()
+			apiClient.On("ContainerList", context.Background(), container.ListOptions{}).Return([]container.Summary{}, test.dockerOutput).Once()
 		} else {
-			apiClient.On("ContainerList", context.Background(), container.ListOptions{}).Return([]types.Container{}, fmt.Errorf(""))
+			apiClient.On("ContainerList", context.Background(), container.ListOptions{}).Return([]container.Summary{}, fmt.Errorf(""))
 		}
 
 		execCommand = mocks.MockExecCommand

diff --git a/internal/docker/types.go b/internal/docker/types.go
@@ -33,10 +33,10 @@ type ContainerAPIClient interface {
 		containerName string) (container.CreateResponse, error)
 	ContainerAttach(ctx context.Context, container string, options container.AttachOptions) (types.HijackedResponse, error)
 	ContainerExecAttach(ctx context.Context, execID string, config container.ExecAttachOptions) (types.HijackedResponse, error)
-	ContainerExecCreate(ctx context.Context, container string, config container.ExecOptions) (types.IDResponse, error)
+	ContainerExecCreate(ctx context.Context, container string, config container.ExecOptions) (container.CommitResponse, error)
 	ContainerExecInspect(ctx context.Context, execID string) (container.ExecInspect, error)
-	ContainerInspect(ctx context.Context, container string) (types.ContainerJSON, error)
-	ContainerList(ctx context.Context, options container.ListOptions) ([]types.Container, error)
+	ContainerInspect(ctx context.Context, container string) (container.InspectResponse, error)
+	ContainerList(ctx context.Context, options container.ListOptions) ([]container.Summary, error)
 	ContainerLogs(ctx context.Context, container string, options container.LogsOptions) (io.ReadCloser, error)
 	ContainerRemove(ctx context.Context, container string, options container.RemoveOptions) error
 	ContainerStart(ctx context.Context, container string, options container.StartOptions) error

diff --git a/internal/site/database.go b/internal/site/database.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ChrisWiegman/kana/internal/docker"
 	"github.com/ChrisWiegman/kana/internal/helpers"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/mount"
 )
 
@@ -218,7 +218,7 @@ func (s *Site) getDatabaseDirectory() (databaseDirectory string, err error) {
 // getDatabasePort returns the public port for the database attached to the current site.
 func (s *Site) getDatabasePort() string {
 	containers, _ := s.dockerClient.ContainerList(s.settings.Get("name"))
-	var databasePort types.Port
+	var databasePort container.Port
 
 	for i := range containers {
 		if containers[i].Image == fmt.Sprintf("%s:%s", s.settings.Get("database"), s.settings.Get("databaseVersion")) {