fix(gcp): take the compute CUD term from the recommendation plan

providers/gcp/services/computeengine/client_test.go

@@ -81,9 +81,12 @@ func TestRootCUDUnsupportedShapesAndAmounts(t *testing.T) {
 			op := input.Content.OperationGroups[0].Operations[0]
 			fields := op.GetValue().GetStructValue().Fields
 			list := fields["resources"].GetListValue()
-			badAmount := false
+			skipRow := false
 			switch name {
 			case "root":
+				// A non-object root Value is a malformed plan: skipped like a
+				// bad amount, so the batch keeps its later valid rows.
+				skipRow = true
 				op.PathValue = &recommenderpb.Operation_Value{Value: structpb.NewNullValue()}
 			case "resources":
 				fields["resources"] = structpb.NewStringValue("bad")
@@ -98,7 +101,7 @@ func TestRootCUDUnsupportedShapesAndAmounts(t *testing.T) {
 			case "UNKNOWN", "ACCELERATOR", "LOCAL_SSD":
 				list.Values[0].GetStructValue().Fields["type"] = structpb.NewStringValue(name)
 			default:
-				badAmount = true
+				skipRow = true
 				list.Values[0].GetStructValue().Fields["amount"] = map[string]*structpb.Value{"bad amount": structpb.NewStringValue("6Gi"), "fractional": structpb.NewNumberValue(1.5), "zero": structpb.NewNumberValue(0), "overflow": structpb.NewStringValue("9223372036854775808"), "null amount": structpb.NewNullValue()}[name]
 			}
 			ctx := context.Background()
@@ -107,8 +110,8 @@ func TestRootCUDUnsupportedShapesAndAmounts(t *testing.T) {
 			service := &MockCommitmentsService{operation: &MockOperation{}}
 			client.SetCommitmentsService(service)
 			client.SetRecommenderClient(&MockRecommenderClient{iterator: &MockRecommenderIterator{recommendations: []*recommenderpb.Recommendation{input}}})
-			recs, err := client.GetRecommendations(ctx, &common.RecommendationParams{})
-			if badAmount {
+			recs, err := client.GetRecommendations(ctx, &common.RecommendationParams{ExperimentalGCPPlanTerm: true})
+			if skipRow {
 				require.NoError(t, err)
 			} else {
 				require.Error(t, err)

providers/gcp/services/computeengine/commitment_type.go

@@ -181,7 +181,7 @@ func rootPlanTerm(root *recommenderpb.Operation) (term string, found bool, err e
 	}
 	object := root.GetValue().GetStructValue()
 	if object == nil {
-		return "", false, fmt.Errorf("root Commitment value must be an object")
+		return "", false, fmt.Errorf("%w: root Commitment value must be an object", errBadPlan)
 	}
 	value, present := object.Fields["plan"]
 	if !present {

providers/gcp/services/computeengine/plan_test.go

@@ -94,6 +94,26 @@ func TestRecommendationPlanConflictKeepsGoodRecommendation(t *testing.T) {
 	assert.Empty(t, service.insertReqs, "listing must not insert")
 }
 
+// A root Commitment whose Value is not an object is a malformed plan and must be
+// skipped like any other bad plan, not abort the batch before later valid
+// recommendations are processed (issue #291).
+func TestRecommendationMalformedRootValueKeepsGoodRecommendation(t *testing.T) {
+	bad := rootCUDRecommendationWithPlan("MEMORY_OPTIMIZED_M4_6TB", "TWELVE_MONTH")
+	bad.Name = "bad-root-value"
+	bad.Content.OperationGroups[0].Operations[0].PathValue = &recommenderpb.Operation_Value{
+		Value: structpb.NewStringValue("not-an-object"),
+	}
+	good := rootCUDRecommendationWithPlan("MEMORY_OPTIMIZED_M4_6TB", "THIRTY_SIX_MONTH")
+	good.Name = "good"
+
+	client, service := planClient(t, bad, good)
+	recs, err := client.GetRecommendations(context.Background(), &common.RecommendationParams{ExperimentalGCPPlanTerm: true})
+	require.NoError(t, err, "a malformed root value must be skipped, not abort the batch")
+	require.Len(t, recs, 1)
+	assert.Equal(t, "3yr", recs[0].Term)
+	assert.Empty(t, service.insertReqs, "listing must not insert")
+}
+
 // Mutation probe: the plan-to-term mapping must not be swappable.
 func TestRootCommitmentTermMapping(t *testing.T) {
 	for plan, want := range map[string]string{"TWELVE_MONTH": "1yr", "THIRTY_SIX_MONTH": "3yr"} {