Skip to content

Commit d11ed9e

Browse files
lucaslorentzlucaslorentz
authored
Merge pull request #725 from lucaslorentz/update-dependencies
Update dependencies
2 parents 11c838b + 279d925 commit d11ed9e

File tree

10 files changed

+380
-222
lines changed

10 files changed

+380
-222
lines changed

‎.github/workflows/ci-pipeline.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v4
1919
with:
20-
go-version: 1.22.8
20+
go-version: 1.24.4
2121

2222
- name: Checkout Code
2323
uses: actions/checkout@v4

‎docker/client.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/docker/docker/api/types"
77
"github.com/docker/docker/api/types/container"
88
"github.com/docker/docker/api/types/events"
9+
"github.com/docker/docker/api/types/network"
910
"github.com/docker/docker/api/types/swarm"
1011
"github.com/docker/docker/api/types/system"
1112
"github.com/docker/docker/client"
@@ -18,11 +19,11 @@ type Client interface {
1819
TaskList(ctx context.Context, options types.TaskListOptions) ([]swarm.Task, error)
1920
Info(ctx context.Context) (system.Info, error)
2021
ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error)
21-
NetworkInspect(ctx context.Context, networkID string, options types.NetworkInspectOptions) (types.NetworkResource, error)
22-
NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error)
22+
NetworkInspect(ctx context.Context, networkID string, options network.InspectOptions) (network.Inspect, error)
23+
NetworkList(ctx context.Context, options network.ListOptions) ([]network.Summary, error)
2324
ConfigList(ctx context.Context, options types.ConfigListOptions) ([]swarm.Config, error)
2425
ConfigInspectWithRaw(ctx context.Context, id string) (swarm.Config, []byte, error)
25-
Events(ctx context.Context, options types.EventsOptions) (<-chan events.Message, <-chan error)
26+
Events(ctx context.Context, options events.ListOptions) (<-chan events.Message, <-chan error)
2627
}
2728

2829
// WrapClient creates a new docker client wrapper
@@ -60,18 +61,18 @@ func (wrapper *clientWrapper) ContainerInspect(ctx context.Context, containerID
6061
return wrapper.client.ContainerInspect(ctx, containerID)
6162
}
6263

63-
func (wrapper *clientWrapper) NetworkInspect(ctx context.Context, networkID string, options types.NetworkInspectOptions) (types.NetworkResource, error) {
64+
func (wrapper *clientWrapper) NetworkInspect(ctx context.Context, networkID string, options network.InspectOptions) (network.Inspect, error) {
6465
return wrapper.client.NetworkInspect(ctx, networkID, options)
6566
}
6667

67-
func (wrapper *clientWrapper) NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error) {
68+
func (wrapper *clientWrapper) NetworkList(ctx context.Context, options network.ListOptions) ([]network.Summary, error) {
6869
return wrapper.client.NetworkList(ctx, options)
6970
}
7071

7172
func (wrapper *clientWrapper) ConfigInspectWithRaw(ctx context.Context, id string) (swarm.Config, []byte, error) {
7273
return wrapper.client.ConfigInspectWithRaw(ctx, id)
7374
}
7475

75-
func (wrapper *clientWrapper) Events(ctx context.Context, options types.EventsOptions) (<-chan events.Message, <-chan error) {
76+
func (wrapper *clientWrapper) Events(ctx context.Context, options events.ListOptions) (<-chan events.Message, <-chan error) {
7677
return wrapper.client.Events(ctx, options)
7778
}

‎docker/client_mock.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/docker/docker/api/types"
77
"github.com/docker/docker/api/types/container"
88
"github.com/docker/docker/api/types/events"
9+
"github.com/docker/docker/api/types/network"
910
"github.com/docker/docker/api/types/swarm"
1011
"github.com/docker/docker/api/types/system"
1112
)
@@ -16,10 +17,10 @@ type ClientMock struct {
1617
ServicesData []swarm.Service
1718
ConfigsData []swarm.Config
1819
TasksData []swarm.Task
19-
NetworksData []types.NetworkResource
20+
NetworksData []network.Summary
2021
InfoData system.Info
2122
ContainerInspectData map[string]types.ContainerJSON
22-
NetworkInspectData map[string]types.NetworkResource
23+
NetworkInspectData map[string]network.Inspect
2324
EventsChannel chan events.Message
2425
ErrorsChannel chan error
2526
}
@@ -55,7 +56,7 @@ func (mock *ClientMock) ConfigList(ctx context.Context, options types.ConfigList
5556
}
5657

5758
// NetworkList list all networks
58-
func (mock *ClientMock) NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error) {
59+
func (mock *ClientMock) NetworkList(ctx context.Context, options network.ListOptions) ([]network.Summary, error) {
5960
return mock.NetworksData, nil
6061
}
6162

@@ -70,7 +71,7 @@ func (mock *ClientMock) ContainerInspect(ctx context.Context, containerID string
7071
}
7172

7273
// NetworkInspect returns information about a specific network
73-
func (mock *ClientMock) NetworkInspect(ctx context.Context, networkID string, options types.NetworkInspectOptions) (types.NetworkResource, error) {
74+
func (mock *ClientMock) NetworkInspect(ctx context.Context, networkID string, options network.InspectOptions) (network.Inspect, error) {
7475
return mock.NetworkInspectData[networkID], nil
7576
}
7677

@@ -85,6 +86,6 @@ func (mock *ClientMock) ConfigInspectWithRaw(ctx context.Context, id string) (sw
8586
}
8687

8788
// Events listen for events in docker
88-
func (mock *ClientMock) Events(ctx context.Context, options types.EventsOptions) (<-chan events.Message, <-chan error) {
89+
func (mock *ClientMock) Events(ctx context.Context, options events.ListOptions) (<-chan events.Message, <-chan error) {
8990
return mock.EventsChannel, mock.ErrorsChannel
9091
}

‎generator/containers_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func TestContainers_DifferentNetwork(t *testing.T) {
103103

104104
func TestContainers_ManualIngressNetworks(t *testing.T) {
105105
dockerClient := createBasicDockerClientMock()
106-
dockerClient.NetworksData = []types.NetworkResource{
106+
dockerClient.NetworksData = []network.Summary{
107107
{
108108
ID: "other-network-id",
109109
Name: "other-network-name",
@@ -140,7 +140,7 @@ func TestContainers_ManualIngressNetworks(t *testing.T) {
140140

141141
func TestContainers_OverrideIngressNetworks(t *testing.T) {
142142
dockerClient := createBasicDockerClientMock()
143-
dockerClient.NetworksData = []types.NetworkResource{
143+
dockerClient.NetworksData = []network.Summary{
144144
{
145145
ID: "other-network-id",
146146
Name: "other-network-name",

‎generator/generator.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
"github.com/docker/docker/api/types"
1414
"github.com/docker/docker/api/types/container"
15+
"github.com/docker/docker/api/types/network"
1516
"github.com/docker/docker/api/types/swarm"
1617
"github.com/lucaslorentz/caddy-docker-proxy/v2/caddyfile"
1718
"github.com/lucaslorentz/caddy-docker-proxy/v2/config"
@@ -237,7 +238,7 @@ func (g *CaddyfileGenerator) getIngressNetworks(logger *zap.Logger) (map[string]
237238

238239
for _, dockerClient := range g.dockerClients {
239240
if len(g.options.IngressNetworks) > 0 {
240-
networks, err := dockerClient.NetworkList(context.Background(), types.NetworkListOptions{})
241+
networks, err := dockerClient.NetworkList(context.Background(), network.ListOptions{})
241242
if err != nil {
242243
return nil, err
243244
}
@@ -263,8 +264,8 @@ func (g *CaddyfileGenerator) getIngressNetworks(logger *zap.Logger) (map[string]
263264
return nil, err
264265
}
265266

266-
for _, network := range container.NetworkSettings.Networks {
267-
networkInfo, err := dockerClient.NetworkInspect(context.Background(), network.NetworkID, types.NetworkInspectOptions{})
267+
for _, networkEndpoint := range container.NetworkSettings.Networks {
268+
networkInfo, err := dockerClient.NetworkInspect(context.Background(), networkEndpoint.NetworkID, network.InspectOptions{})
268269
if err != nil {
269270
return nil, err
270271
}

‎generator/generator_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func createBasicDockerClientMock() *docker.ClientMock {
165165
ServicesData: []swarm.Service{},
166166
ConfigsData: []swarm.Config{},
167167
TasksData: []swarm.Task{},
168-
NetworksData: []types.NetworkResource{},
168+
NetworksData: []network.Summary{},
169169
InfoData: system.Info{
170170
Swarm: swarm.Info{
171171
LocalNodeState: swarm.LocalNodeStateActive,
@@ -182,7 +182,7 @@ func createBasicDockerClientMock() *docker.ClientMock {
182182
},
183183
},
184184
},
185-
NetworkInspectData: map[string]types.NetworkResource{
185+
NetworkInspectData: map[string]network.Summary{
186186
caddyNetworkID: {
187187
Ingress: false,
188188
ID: caddyNetworkID,

‎generator/services_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package generator
33
import (
44
"testing"
55

6-
"github.com/docker/docker/api/types"
6+
"github.com/docker/docker/api/types/network"
77
"github.com/docker/docker/api/types/swarm"
88
"github.com/docker/docker/api/types/system"
99
"github.com/lucaslorentz/caddy-docker-proxy/v2/config"
@@ -100,7 +100,7 @@ func TestServices_DifferentNetwork(t *testing.T) {
100100

101101
func TestServices_ManualIngressNetwork(t *testing.T) {
102102
dockerClient := createBasicDockerClientMock()
103-
dockerClient.NetworksData = []types.NetworkResource{
103+
dockerClient.NetworksData = []network.Summary{
104104
{
105105
ID: "other-network-id",
106106
Name: "other-network-name",
@@ -349,7 +349,7 @@ func TestServiceTasks_ManualIngressNetwork(t *testing.T) {
349349
},
350350
},
351351
}
352-
dockerClient.NetworksData = []types.NetworkResource{
352+
dockerClient.NetworksData = []network.Summary{
353353
{
354354
ID: "other-network-id",
355355
Name: "other-network-name",
@@ -407,7 +407,7 @@ func TestServiceTasks_OverrideIngressNetwork(t *testing.T) {
407407
},
408408
},
409409
}
410-
dockerClient.NetworksData = []types.NetworkResource{
410+
dockerClient.NetworksData = []network.Summary{
411411
{
412412
ID: "other-network-id",
413413
Name: "other-network-name",

0 commit comments

Comments
 (0)