mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

feat: add missing client opts and gofmt

Browse source 
Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
This commit is contained in:
Paulo Dias 2025-01-29 10:14:32 +00:00
parent c60120f54b
commit 3853513ea3
No known key found for this signature in database
GPG key ID: CE1937300CB848AA
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
discovery/openstack/instance.go
View file

@ -74,18 +74,18 @@ func newInstanceDiscovery(provider *gophercloud.ProviderClient, opts *gopherclou
} }
type SupportedFeatures struct { type SupportedFeatures struct {
flavorOriginalName bool // Available from 2.47 flavorOriginalName bool // Available from 2.47
} }
func getSupportedFeatures(minMinor, minMajor, maxMinor, maxMajor int) SupportedFeatures { func getSupportedFeatures(minMinor, minMajor, maxMinor, maxMajor int) SupportedFeatures {
features := SupportedFeatures{} features := SupportedFeatures{}
// Feature: 'flavor.original_name' is supported from microversion 2.47 onwards // Feature: 'flavor.original_name' is supported from microversion 2.47 onwards
if maxMajor > 2 || (maxMajor == 2 && maxMinor >= 47) { if maxMajor > 2 || (maxMajor == 2 && maxMinor >= 47) {
features.flavorOriginalName = true features.flavorOriginalName = true
} }
return features return features
} }
func setClientMicroversion(sc *gophercloud.ServiceClient, microversion string) *gophercloud.ServiceClient { 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 var latestServers []servers.Server
if features.flavorOriginalName { if features.flavorOriginalName {
// Fetch the server list using the client with the latest microversion // 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 { 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 { } else {
latestServers, err = servers.ExtractServers(allPages) latestServers, err = servers.ExtractServers(allPages)
if err != nil { 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) imageID, ok := s.Image["id"].(string)
if ok { if ok {
labels[openstackLabelInstanceImage] = model.LabelValue(imageID) labels[openstackLabelInstanceImage] = model.LabelValue(imageID)