From d6f9ba6310cc87bd94e5a7d1ce03fcb473787121 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 23 Jun 2025 16:15:58 +0100 Subject: [PATCH] [BUILD] Docker SD: Fix up deprecated types Signed-off-by: Bryan Boreham --- discovery/moby/nodes.go | 6 +++--- discovery/moby/services.go | 5 ++--- discovery/moby/tasks.go | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/discovery/moby/nodes.go b/discovery/moby/nodes.go index b5be844eda..a11afeee25 100644 --- a/discovery/moby/nodes.go +++ b/discovery/moby/nodes.go @@ -19,7 +19,7 @@ import ( "net" "strconv" - "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/swarm" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/targetgroup" @@ -48,7 +48,7 @@ func (d *Discovery) refreshNodes(ctx context.Context) ([]*targetgroup.Group, err Source: "DockerSwarm", } - nodes, err := d.client.NodeList(ctx, types.NodeListOptions{Filters: d.filters}) + nodes, err := d.client.NodeList(ctx, swarm.NodeListOptions{Filters: d.filters}) if err != nil { return nil, fmt.Errorf("error while listing swarm nodes: %w", err) } @@ -85,7 +85,7 @@ func (d *Discovery) refreshNodes(ctx context.Context) ([]*targetgroup.Group, err } func (d *Discovery) getNodesLabels(ctx context.Context) (map[string]map[string]string, error) { - nodes, err := d.client.NodeList(ctx, types.NodeListOptions{}) + nodes, err := d.client.NodeList(ctx, swarm.NodeListOptions{}) if err != nil { return nil, fmt.Errorf("error while listing swarm nodes: %w", err) } diff --git a/discovery/moby/services.go b/discovery/moby/services.go index c61b499259..0698c01e6a 100644 --- a/discovery/moby/services.go +++ b/discovery/moby/services.go @@ -19,7 +19,6 @@ import ( "net" "strconv" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/prometheus/common/model" @@ -46,7 +45,7 @@ func (d *Discovery) refreshServices(ctx context.Context) ([]*targetgroup.Group, Source: "DockerSwarm", } - services, err := d.client.ServiceList(ctx, types.ServiceListOptions{Filters: d.filters}) + services, err := d.client.ServiceList(ctx, swarm.ServiceListOptions{Filters: d.filters}) if err != nil { return nil, fmt.Errorf("error while listing swarm services: %w", err) } @@ -127,7 +126,7 @@ func (d *Discovery) refreshServices(ctx context.Context) ([]*targetgroup.Group, } func (d *Discovery) getServicesLabelsAndPorts(ctx context.Context) (map[string]map[string]string, map[string][]swarm.PortConfig, error) { - services, err := d.client.ServiceList(ctx, types.ServiceListOptions{}) + services, err := d.client.ServiceList(ctx, swarm.ServiceListOptions{}) if err != nil { return nil, nil, err } diff --git a/discovery/moby/tasks.go b/discovery/moby/tasks.go index 38b9d33de2..46e8a06d01 100644 --- a/discovery/moby/tasks.go +++ b/discovery/moby/tasks.go @@ -19,7 +19,6 @@ import ( "net" "strconv" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/prometheus/common/model" @@ -43,7 +42,7 @@ func (d *Discovery) refreshTasks(ctx context.Context) ([]*targetgroup.Group, err Source: "DockerSwarm", } - tasks, err := d.client.TaskList(ctx, types.TaskListOptions{Filters: d.filters}) + tasks, err := d.client.TaskList(ctx, swarm.TaskListOptions{Filters: d.filters}) if err != nil { return nil, fmt.Errorf("error while listing swarm services: %w", err) }