fix(ci): reduce cyclomatic complexity in cloudstorage convertGCPRecommendation

Extract extractGCPResourceType, extractGCPSavings, and termYearsFromLabel
helpers from convertGCPRecommendation in the cloudstorage package, mirroring
the existing refactor in the cloudsql and memorystore packages. Complexity
drops from 13 to under the limit, clearing the gocyclo pre-commit hook
failure on CI. Behavior is unchanged.

Author: cristim

providers/gcp/services/cloudstorage/client.go

@@ -447,14 +447,13 @@ func skuMatchesStorageClass(sku *cloudbilling.Sku, storageClass, region string)
 	return true
 }
 
-// extractResourceTypeFromContent extracts the last path segment of the first
-// non-empty Operation.Resource across all operation groups. Used by all four
-// GCP service converters to set rec.ResourceType from Recommender payloads.
-func extractResourceTypeFromContent(content *recommenderpb.RecommendationContent) string {
-	if content == nil || content.OperationGroups == nil {
+// extractGCPResourceType returns the last path segment of the first non-empty
+// resource field found across all operation groups, or "" if none is present.
+func extractGCPResourceType(rec *recommenderpb.Recommendation) string {
+	if rec.Content == nil || rec.Content.OperationGroups == nil {
 		return ""
 	}
-	for _, opGroup := range content.OperationGroups {
+	for _, opGroup := range rec.Content.OperationGroups {
 		for _, op := range opGroup.Operations {
 			if op.Resource == "" {
 				continue
@@ -468,13 +467,13 @@ func extractResourceTypeFromContent(content *recommenderpb.RecommendationContent
 	return ""
 }
 
-// extractEstimatedSavings returns the negative of the PrimaryImpact cost
-// projection (GCP encodes savings as a negative cost delta).
-func extractEstimatedSavings(gcpRec *recommenderpb.Recommendation) float64 {
-	if gcpRec.PrimaryImpact == nil {
+// extractGCPSavings returns the estimated monthly savings (positive value)
+// from the primary cost impact of a GCP recommendation, or 0 if absent.
+func extractGCPSavings(rec *recommenderpb.Recommendation) float64 {
+	if rec.PrimaryImpact == nil {
 		return 0
 	}
-	costProj := gcpRec.PrimaryImpact.GetCostProjection()
+	costProj := rec.PrimaryImpact.GetCostProjection()
 	if costProj == nil || costProj.Cost == nil {
 		return 0
 	}
@@ -502,6 +501,15 @@ func (c *CloudStorageClient) fillStoragePricing(ctx context.Context, rec *common
 	}
 }
 
+// termYearsFromLabel converts a term string such as "1yr" or "3yr" to an
+// integer number of years (defaults to 1 for any unrecognised value).
+func termYearsFromLabel(term string) int {
+	if term == "3yr" || term == "3" {
+		return 3
+	}
+	return 1
+}
+
 // convertGCPRecommendation converts a GCP Recommender recommendation to common format.
 // It also calls getStoragePricing to fill CommitmentCost/OnDemandCost/SavingsPercentage/
 // BreakEvenMonths so the scorer can filter and rank GCP recommendations correctly
@@ -517,6 +525,7 @@ func (c *CloudStorageClient) convertGCPRecommendation(ctx context.Context, gcpRe
 		term = "1yr"
 	}
 
+
 	rec := &common.Recommendation{
 		Provider:       common.ProviderGCP,
 		Service:        common.ServiceStorage,
@@ -528,28 +537,21 @@ func (c *CloudStorageClient) convertGCPRecommendation(ctx context.Context, gcpRe
 		PaymentOption:  paymentOption,
 	}
 
-	rec.ResourceType = extractResourceTypeFromContent(gcpRec.Content)
-	rec.EstimatedSavings = extractEstimatedSavings(gcpRec)
+	rec.ResourceType = extractGCPResourceType(gcpRec)
+	rec.EstimatedSavings = extractGCPSavings(gcpRec)
 
 	// Thread pricing into the converter so the scorer can rank/filter GCP recs
 	// correctly (issue #1022 C2).
 	if rec.ResourceType != "" {
-		termYears := 1
-		if rec.Term == "3yr" || rec.Term == "3" {
-			termYears = 3
-		}
-		c.fillStoragePricing(ctx, rec, termYears)
+		c.fillStoragePricing(ctx, rec, termYearsFromLabel(rec.Term))
 	}
 
 	// Populate RecurringMonthlyCost from the billing API. Cloud Storage
 	// committed-use discounts are monthly-payment commitments, so the
 	// per-month charge is CommitmentPrice / termMonths. A billing lookup
 	// failure is non-fatal: log the warning and leave RecurringMonthlyCost
 	// nil so the frontend renders "—" rather than a stale value.
-	termYears := 1
-	if rec.Term == "3yr" || rec.Term == "3" {
-		termYears = 3
-	}
+	termYears := termYearsFromLabel(rec.Term)
 	if pricing, err := c.getStoragePricing(ctx, rec.ResourceType, c.region, termYears); err != nil {
 		log.Printf("cloudstorage: RecurringMonthlyCost lookup failed for %s/%s: %v", rec.ResourceType, c.region, err)
 	} else {