From 3853513ea3a790fd26d9f8189e27f7bfdd03ad9e Mon Sep 17 00:00:00 2001 From: Paulo Dias Date: Wed, 29 Jan 2025 10:14:32 +0000 Subject: [PATCH] feat: add missing client opts and gofmt Signed-off-by: Paulo Dias --- discovery/openstack/instance.go | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/discovery/openstack/instance.go b/discovery/openstack/instance.go index ddf670d484..3492c8d3d8 100644 --- a/discovery/openstack/instance.go +++ b/discovery/openstack/instance.go @@ -74,18 +74,18 @@ func newInstanceDiscovery(provider *gophercloud.ProviderClient, opts *gopherclou } type SupportedFeatures struct { - flavorOriginalName bool // Available from 2.47 + flavorOriginalName bool // Available from 2.47 } func getSupportedFeatures(minMinor, minMajor, maxMinor, maxMajor int) SupportedFeatures { - features := SupportedFeatures{} + features := SupportedFeatures{} - // Feature: 'flavor.original_name' is supported from microversion 2.47 onwards - if maxMajor > 2 || (maxMajor == 2 && maxMinor >= 47) { - features.flavorOriginalName = true - } + // Feature: 'flavor.original_name' is supported from microversion 2.47 onwards + if maxMajor > 2 || (maxMajor == 2 && maxMinor >= 47) { + features.flavorOriginalName = true + } - return features + return features } func setClientMicroversion(sc *gophercloud.ServiceClient, microversion string) *gophercloud.ServiceClient { @@ -197,13 +197,13 @@ func (i *InstanceDiscovery) refresh(ctx context.Context) ([]*targetgroup.Group, var latestServers []servers.Server if features.flavorOriginalName { // Fetch the server list using the client with the latest microversion - allPages, err := servers.List(clientLatest, nil).AllPages(ctx) + allPages, err := servers.List(clientLatest, opts).AllPages(ctx) if err != nil { - i.logger.Warn("Failed to fetch server list with latest microversion, falling back to flavor.id:", err) + i.logger.Warn("Failed to fetch server list with latest microversion, falling back to flavor.id") } else { latestServers, err = servers.ExtractServers(allPages) if err != nil { - i.logger.Warn("Failed to extract servers with latest microversion, falling back to flavor.id:", err) + i.logger.Warn("Failed to extract servers with latest microversion, falling back to flavor.id") } } } @@ -262,7 +262,6 @@ func (i *InstanceDiscovery) refresh(ctx context.Context) ([]*targetgroup.Group, } } - imageID, ok := s.Image["id"].(string) if ok { labels[openstackLabelInstanceImage] = model.LabelValue(imageID)