Begin mapping collection rules

Ensure generated type info is passed through for
ActionListExecutor testcase

Author: sbomer

src/Tests/CollectionRuleActions.UnitTests/ActionListExecutorTests.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.Http.Validation;
 using Microsoft.Diagnostics.Monitoring.TestCommon;
 using Microsoft.Diagnostics.Monitoring.TestCommon.Options;
 using Microsoft.Diagnostics.Tools.Monitor;
@@ -128,7 +129,7 @@ public Task ActionListExecutor_FirstActionFail_DeferredCompletion()
             return ActionListExecutor_FirstActionFail(waitForCompletion: false);
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/61379")]
         public Task ActionListExecutor_FirstActionFail_WaitedCompletion()
         {
             return ActionListExecutor_FirstActionFail(waitForCompletion: true);
@@ -165,6 +166,9 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>
                 Assert.Equal(string.Format(Strings.ErrorMessage_NonzeroExitCode, "1"), actionExecutionException.Message);
 
                 VerifyStartCallbackCount(waitForCompletion, callbackCount);
+            }, services =>
+            {
+                services.AddValidation();
             });
         }
 

src/Tests/CollectionRuleActions.UnitTests/CollectionRuleActions.UnitTests.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(ToolTargetFrameworks)</TargetFrameworks>
+    <InterceptorsNamespaces>$(InterceptorsNamespaces);Microsoft.AspNetCore.Http.Validation.Generated</InterceptorsNamespaces>
   </PropertyGroup>
 
   <ItemGroup>

src/Tests/CollectionRuleActions.UnitTests/TestValidatableType.cs

@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.Http.Validation;
+using Microsoft.Diagnostics.Monitoring.WebApi;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+
+namespace Microsoft.Diagnostics.Tools.Monitor
+{
+    // The Validation source generator doesn't run for libraries that don't call AddValidation,
+    // so we can't generate IValidatableInfo by using [ValidatableType] directly on types defined
+    // in ProjectReferences. This is a workaround to force the generator running in this project to
+    // generate IValidatableInfo for the referenced types. The containing class is not used otherwise.
+    [ValidatableType]
+    internal class TestValidatableTypes
+    {
+        public required CollectionRuleOptions CollectionRuleOptions { get; init; }
+
+        public required ExecuteOptions ExecuteOptions { get; init; }
+    }
+}

src/Tools/dotnet-monitor/CollectionRules/Options/ValidationHelper.cs

@@ -82,7 +82,7 @@ public static bool TryValidateObject(object options, Type type, ValidationOption
             var validateContext = new ValidateContext()
             {
                 ValidationOptions = validationOptions,
-                ValidationContext = new(options, validationContext.MemberName, null, items: null)
+                ValidationContext = validationContext
             };
             validatableTypeInfo.ValidateAsync(options, validateContext, CancellationToken.None).GetAwaiter().GetResult();
             if (validateContext.ValidationErrors is Dictionary<string, string[]> validationErrors)

src/Tools/dotnet-monitor/CommonOptionsExtensions.cs

@@ -7,6 +7,7 @@
 using Microsoft.Diagnostics.Monitoring.TestCommon;
 #endif
 using Microsoft.Diagnostics.Monitoring.WebApi;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options;
 using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;
@@ -95,6 +96,7 @@ private static void MapRootOptions(RootOptions obj, string prefix, string separa
         {
             // TODO: in Tests, it has an additional property. Weird.
             MapAuthenticationOptions(obj.Authentication, FormattableString.Invariant($"{prefix}{nameof(obj.Authentication)}"), separator, map);
+            MapCollectionRules(obj.CollectionRules, FormattableString.Invariant($"{prefix}{nameof(obj.CollectionRules)}"), separator, map);
             // GlobalCounterOptions
             MapGlobalCounterOptions(obj.GlobalCounter, FormattableString.Invariant($"{prefix}{nameof(obj.GlobalCounter)}"), separator, map);
             // InProcessFeaturesOptions
@@ -126,6 +128,49 @@ private static void MapRootOptions(RootOptions obj, string prefix, string separa
         //     }
         // }
 
+        private static void MapCollectionRules(IDictionary<string, CollectionRuleOptions>? obj, string valueName, string separator, IDictionary<string, string> map)
+        {
+            if (null != obj)
+            {
+                System.Console.WriteLine("MapCollectionRules");
+                var prefix = FormattableString.Invariant($"{valueName}{separator}"); // passed to mapdictionary.
+                foreach ((string key, CollectionRuleOptions value) in obj)
+                {
+                    string keyString = ConvertUtils.ToString(key, CultureInfo.InvariantCulture);
+                    System.Console.WriteLine($"key: {keyString}");
+                    MapCollectionRuleOptions(value, FormattableString.Invariant($"{prefix}{keyString}"), separator, map);
+                }
+            }
+        }
+
+        private static void MapCollectionRuleOptions(CollectionRuleOptions obj, string valueName, string separator, IDictionary<string, string> map)
+        {
+            string prefix = FormattableString.Invariant($"{valueName}{separator}");
+            // MapFilters(obj.Filters, FormattableString.Invariant($"{prefix}{nameof(obj.Filters)}"), separator, map);
+            // MapTrigger(obj.Trigger, FormattableString.Invariant($"{prefix}{nameof(obj.Trigger)}"), separator, map);
+            MapActions(obj.Actions, FormattableString.Invariant($"{prefix}{nameof(obj.Actions)}"), separator, map);
+            // MapLimits(obj.Limits, FormattableString.Invariant($"{prefix}{nameof(obj.Limits)}"), separator, map);
+        }
+
+        private static void MapActions(List<CollectionRuleActionOptions> obj, string valueName, string separator, IDictionary<string, string> map)
+        {
+            string prefix = FormattableString.Invariant($"{valueName}{separator}");
+            for (int index = 0; index < obj.Count; index++)
+            {
+                CollectionRuleActionOptions value = obj[index];
+                MapCollectionRuleActionOptions(value, FormattableString.Invariant($"{prefix}{index}"), separator, map);
+            }
+        }
+
+        private static void MapCollectionRuleActionOptions(CollectionRuleActionOptions obj, string valueName, string separator, IDictionary<string, string> map)
+        {
+            string prefix = FormattableString.Invariant($"{valueName}{separator}");
+            MapString(obj.Name, FormattableString.Invariant($"{prefix}{nameof(obj.Name)}"), map);
+            MapString(obj.Type, FormattableString.Invariant($"{prefix}{nameof(obj.Type)}"), map);
+            // TODO: map object Settings
+            MapBool(obj.WaitForCompletion, FormattableString.Invariant($"{prefix}{nameof(obj.WaitForCompletion)}"), map);
+        }
+
         private static void MapAuthenticationOptions(AuthenticationOptions? obj, string valueName, string separator, IDictionary<string, string> map)
         {
             if (null != obj)

src/Tools/dotnet-monitor/DataAnnotationValidateOptions.cs

@@ -35,7 +35,11 @@ public DataAnnotationValidateOptions(IServiceProvider serviceProvider)
         public ValidateOptionsResult Validate(string? name, TOptions options)
         {
             var results = new List<ValidationResult>();
-            if (!ValidationHelper.TryValidateObject(options, typeof(TOptions), _validationOptions, results))
+            var typeName = typeof(TOptions).Name;
+            var validationContext = new ValidationContext(options, typeName, _serviceProvider, items: null) {
+                MemberName = typeName
+            };
+            if (!ValidationHelper.TryValidateObject(options, typeof(TOptions), _validationOptions, validationContext, results))
             {
                 IList<string> failures = new List<string>();
                 foreach (ValidationResult result in results)