chore: proper error checks

Author: Noroth

v2/pkg/engine/datasource/grpc_datasource/execution_plan_composite_test.go

@@ -608,16 +608,16 @@ func TestCompositeTypeExecutionPlan(t *testing.T) {
 				mapping:      testMapping(),
 			})
 
-			rpcPlanVisitor.PlanOperation(&queryDoc, &schemaDoc)
+			plan, err := rpcPlanVisitor.PlanOperation(&queryDoc, &schemaDoc)
 
-			if report.HasErrors() {
+			if err != nil {
 				require.NotEmpty(t, tt.expectedError)
-				require.Contains(t, report.Error(), tt.expectedError)
+				require.Contains(t, err.Error(), tt.expectedError)
 				return
 			}
 
 			require.Empty(t, tt.expectedError)
-			diff := cmp.Diff(tt.expectedPlan, rpcPlanVisitor.plan)
+			diff := cmp.Diff(tt.expectedPlan, plan)
 			if diff != "" {
 				t.Fatalf("execution plan mismatch: %s", diff)
 			}
@@ -873,16 +873,16 @@ func TestMutationUnionExecutionPlan(t *testing.T) {
 				mapping:      testMapping(),
 			})
 
-			rpcPlanVisitor.PlanOperation(&queryDoc, &schemaDoc)
+			plan, err := rpcPlanVisitor.PlanOperation(&queryDoc, &schemaDoc)
 
-			if report.HasErrors() {
+			if err != nil {
 				require.NotEmpty(t, tt.expectedError)
-				require.Contains(t, report.Error(), tt.expectedError)
+				require.Contains(t, err.Error(), tt.expectedError)
 				return
 			}
 
 			require.Empty(t, tt.expectedError)
-			diff := cmp.Diff(tt.expectedPlan, rpcPlanVisitor.plan)
+			diff := cmp.Diff(tt.expectedPlan, plan)
 			if diff != "" {
 				t.Fatalf("execution plan mismatch: %s", diff)
 			}

v2/pkg/engine/datasource/grpc_datasource/execution_plan_test.go

@@ -34,16 +34,16 @@ func runTest(t *testing.T, testCase testCase) {
 		mapping:      testMapping(),
 	})
 
-	rpcPlanVisitor.PlanOperation(&queryDoc, &schemaDoc)
+	plan, err := rpcPlanVisitor.PlanOperation(&queryDoc, &schemaDoc)
 
-	if report.HasErrors() {
-		require.NotEmpty(t, testCase.expectedError, "expected error to be empty, got: %s", report.Error())
-		require.Contains(t, report.Error(), testCase.expectedError, "expected error to contain: %s, got: %s", testCase.expectedError, report.Error())
+	if err != nil {
+		require.NotEmpty(t, testCase.expectedError, "expected error to be empty, got: %s", err.Error())
+		require.Contains(t, err.Error(), testCase.expectedError, "expected error to contain: %s, got: %s", testCase.expectedError, err.Error())
 		return
 	}
 
 	require.Empty(t, testCase.expectedError)
-	diff := cmp.Diff(testCase.expectedPlan, rpcPlanVisitor.plan)
+	diff := cmp.Diff(testCase.expectedPlan, plan)
 	if diff != "" {
 		t.Fatalf("execution plan mismatch: %s", diff)
 	}