scrape: fix error collector

sapcc · Dec 5, 2024 · a5e846c · a5e846c
1 parent 95e45d5
commit a5e846c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/internal/plugins/capacity_liquid.go b/internal/plugins/capacity_liquid.go
@@ -95,17 +95,17 @@ func (p *liquidCapacityPlugin) Scrape(ctx context.Context, backchannel core.Capa
 			p.LiquidServiceType, p.LiquidServiceInfo.Version, resp.InfoVersion)
 	}
 	resourceNames := SortMapKeys(p.LiquidServiceInfo.Resources)
+	var errs []error
 	for _, resourceName := range resourceNames {
-		errs := []error{}
 		perAZ := resp.Resources[liquid.ResourceName(resourceName)].PerAZ
 		toplogy := p.LiquidServiceInfo.Resources[liquid.ResourceName(resourceName)].Topology
 		err := MatchLiquidReportToTopology(perAZ, toplogy)
 		if err != nil {
 			errs = append(errs, fmt.Errorf("service: %s, resource: %s: %w", p.ServiceType, resourceName, err))
 		}
-		if len(errs) > 0 {
-			return nil, nil, errors.Join(errs...)
-		}
+	}
+	if len(errs) > 0 {
+		return nil, nil, errors.Join(errs...)
 	}
 
 	resultInService := make(map[liquid.ResourceName]core.PerAZ[core.CapacityData], len(p.LiquidServiceInfo.Resources))

diff --git a/internal/plugins/liquid.go b/internal/plugins/liquid.go
@@ -124,17 +124,17 @@ func (p *liquidQuotaPlugin) Scrape(ctx context.Context, project core.KeystonePro
 			p.LiquidServiceType, p.LiquidServiceInfo.Version, resp.InfoVersion)
 	}
 	resourceNames := SortMapKeys(p.LiquidServiceInfo.Resources)
+	var errs []error
 	for _, resourceName := range resourceNames {
-		errs := []error{}
 		perAZ := resp.Resources[liquid.ResourceName(resourceName)].PerAZ
 		toplogy := p.LiquidServiceInfo.Resources[liquid.ResourceName(resourceName)].Topology
 		err := MatchLiquidReportToTopology(perAZ, toplogy)
 		if err != nil {
 			errs = append(errs, fmt.Errorf("service: %s, resource: %s: %w", p.ServiceType, resourceName, err))
 		}
-		if len(errs) > 0 {
-			return nil, nil, errors.Join(errs...)
-		}
+	}
+	if len(errs) > 0 {
+		return nil, nil, errors.Join(errs...)
 	}
 
 	result = make(map[liquid.ResourceName]core.ResourceData, len(p.LiquidServiceInfo.Resources))

diff --git a/internal/test/plugins/quota_generic.go b/internal/test/plugins/quota_generic.go
@@ -171,7 +171,7 @@ func (p *GenericQuotaPlugin) Scrape(ctx context.Context, project core.KeystonePr
 	}
 
 	if len(p.ReportedAZs) > 0 {
-		errs := []error{}
+		var errs []error
 		resourceNames := plugins.SortMapKeys(p.LiquidServiceInfo.Resources)
 		for _, resourceName := range resourceNames {
 			toplogy := p.LiquidServiceInfo.Resources[liquid.ResourceName(resourceName)].Topology