Fixed Validation Resources (#2642)

src/HotChocolate/Core/benchmark/Execution.Benchmarks/Program.cs

@@ -9,36 +9,5 @@ class Program
     {
         static void Main(string[] args) =>
             BenchmarkRunner.Run(typeof(Program).Assembly);
-
-        /*
-        static async Task Main(string[] args)
-        {
-            var bench = new DefaultExecutionPipelineBenchmark();
-
-            for (int i = 0; i < 1000; i++)
-            {
-                Console.WriteLine("starting " + i);
-                var time = Stopwatch.StartNew();
-                await bench.SchemaIntrospection();
-                Console.WriteLine("finished " + i + " " + time.Elapsed);
-            }
-
-            for (int i = 0; i < 1000; i++)
-            {
-                Console.WriteLine("starting " + i);
-                var time = Stopwatch.StartNew();
-                await bench.GetHero();
-                Console.WriteLine("finished " + i + " " + time.Elapsed);
-            }
-
-            for (int i = 0; i < 50; i++)
-            {
-                Console.WriteLine("starting " + i);
-                var time = Stopwatch.StartNew();
-                await bench.GetHeroWithFriendsFiveParallelRequests();
-                Console.WriteLine("finished " + i + " " + time.Elapsed);
-            }
-        }
-                         */
     }
 }

src/HotChocolate/Core/src/Validation/ErrorHelper.cs

@@ -590,5 +590,21 @@ internal static class ErrorHelper
                 .SetExtension("detectedComplexity", detectedComplexity)
                 .Build();
         }
+
+        public static IError MaxExecutionDepth(
+            this IDocumentValidatorContext context,
+            OperationDefinitionNode operation,
+            int allowedExecutionDepth,
+            int detectedExecutionDepth)
+        {
+            return ErrorBuilder.New()
+                .SetMessage(
+                    Resources.ErrorHelper_MaxExecutionDepth,
+                    detectedExecutionDepth, allowedExecutionDepth)
+                .AddLocation(operation)
+                .SetExtension("allowedExecutionDepth", allowedExecutionDepth)
+                .SetExtension("detectedExecutionDepth", detectedExecutionDepth)
+                .Build();
+        }
     }
 }

src/HotChocolate/Core/src/Validation/Properties/Resources.resx

@@ -206,6 +206,9 @@
   <data name="ErrorHelper_MaxOperationComplexity" xml:space="preserve">
     <value>The GraphQL document has an operation complexity of {0} which exceeds the max allowed operation complexity of {1}.</value>
   </data>
+  <data name="ErrorHelper_MaxExecutionDepth" xml:space="preserve">
+    <value>The GraphQL document has an execution depth of {0} which exceeds the max allowed execution depth of {1}.</value>
+  </data>
   <data name="HotChocolateValidationBuilderExtensions_MinimumAllowedValue" xml:space="preserve">
     <value>The minimum allowed value is 1.</value>
   </data>

src/HotChocolate/Core/src/Validation/Rules/MaxExecutionDepthVisitor.cs

@@ -30,7 +30,7 @@ public MaxExecutionDepthVisitor(IMaxExecutionDepthOptionsAccessor options)
             if (_options.MaxAllowedExecutionDepth.HasValue &&
                 _options.MaxAllowedExecutionDepth < context.Max)
             {
-                context.Errors.Add(context.MaxOperationComplexity(
+                context.Errors.Add(context.MaxExecutionDepth(
                     node, _options.MaxAllowedExecutionDepth.Value, context.Max));
                 return Break;
             }

src/HotChocolate/Core/test/Execution.Tests/Integration/StarWarsCodeFirst/__snapshots__/StarWarsCodeFirstTests.ExecutionDepthShouldNotLeadToEmptyObjects.snap

@@ -1,16 +1,16 @@
 {
   "errors": [
     {
-      "message": "The GraphQL document has an operation complexity of 6 which exceeds the max allowed operation complexity of 3.",
+      "message": "The GraphQL document has an execution depth of 6 which exceeds the max allowed execution depth of 3.",
       "locations": [
         {
           "line": 2,
           "column": 17
         }
       ],
       "extensions": {
-        "allowedComplexity": 3,
-        "detectedComplexity": 6
+        "allowedExecutionDepth": 3,
+        "detectedExecutionDepth": 6
       }
     }
   ]

src/HotChocolate/Core/test/Validation.Tests/DocumentValidatorTests.cs

@@ -624,8 +624,8 @@ public void MaxDepthRuleIsIncluded()
                 t =>
                 {
                     Assert.Equal(
-                        "The GraphQL document has an operation complexity of 2 " +
-                        "which exceeds the max allowed operation complexity of 1.",
+                        "The GraphQL document has an execution depth of 2 " +
+                        "which exceeds the max allowed execution depth of 1.",
                         t.Message);
                 });
         }

src/HotChocolate/Core/test/Validation.Tests/__snapshots__/DocumentValidatorTests.MaxDepthRuleIsIncluded.snap

@@ -1,6 +1,6 @@
 [
   {
-    "Message": "The GraphQL document has an operation complexity of 2 which exceeds the max allowed operation complexity of 1.",
+    "Message": "The GraphQL document has an execution depth of 2 which exceeds the max allowed execution depth of 1.",
     "Code": null,
     "Path": null,
     "Locations": [
@@ -10,8 +10,8 @@
       }
     ],
     "Extensions": {
-      "allowedComplexity": 1,
-      "detectedComplexity": 2
+      "allowedExecutionDepth": 1,
+      "detectedExecutionDepth": 2
     },
     "Exception": null
   }

src/HotChocolate/Core/test/Validation.Tests/__snapshots__/MaxDepthRuleTests.MaxDepth3_QueryWith4LevelsViaFragments_MaxDepthReached.snap

@@ -1,6 +1,6 @@
 [
   {
-    "Message": "The GraphQL document has an operation complexity of 4 which exceeds the max allowed operation complexity of 3.",
+    "Message": "The GraphQL document has an execution depth of 4 which exceeds the max allowed execution depth of 3.",
     "Code": null,
     "Path": null,
     "Locations": [
@@ -10,8 +10,8 @@
       }
     ],
     "Extensions": {
-      "allowedComplexity": 3,
-      "detectedComplexity": 4
+      "allowedExecutionDepth": 3,
+      "detectedExecutionDepth": 4
     },
     "Exception": null
   }

src/HotChocolate/Core/test/Validation.Tests/__snapshots__/MaxDepthRuleTests.MaxDepth3_QueryWith4LevelsWithInlineFragment_MaxDepthReached.snap

@@ -1,6 +1,6 @@
 [
   {
-    "Message": "The GraphQL document has an operation complexity of 4 which exceeds the max allowed operation complexity of 3.",
+    "Message": "The GraphQL document has an execution depth of 4 which exceeds the max allowed execution depth of 3.",
     "Code": null,
     "Path": null,
     "Locations": [
@@ -10,8 +10,8 @@
       }
     ],
     "Extensions": {
-      "allowedComplexity": 3,
-      "detectedComplexity": 4
+      "allowedExecutionDepth": 3,
+      "detectedExecutionDepth": 4
     },
     "Exception": null
   }

src/HotChocolate/Core/test/Validation.Tests/__snapshots__/MaxDepthRuleTests.MaxDepth3_QueryWith4Levels_MaxDepthReached.snap

@@ -1,6 +1,6 @@
 [
   {
-    "Message": "The GraphQL document has an operation complexity of 4 which exceeds the max allowed operation complexity of 3.",
+    "Message": "The GraphQL document has an execution depth of 4 which exceeds the max allowed execution depth of 3.",
     "Code": null,
     "Path": null,
     "Locations": [
@@ -10,8 +10,8 @@
       }
     ],
     "Extensions": {
-      "allowedComplexity": 3,
-      "detectedComplexity": 4
+      "allowedExecutionDepth": 3,
+      "detectedExecutionDepth": 4
     },
     "Exception": null
   }