fix(Dsl): Fixed the ComponentDefinitionCollectionValidator to validate AuthenticationPolicyDefinitions

cdavernas · cdavernas · commit da6ee55abd96 · 2024-10-22T12:31:36.000+02:00
Signed-off-by: Charles d'Avernas &lt;charles.davernas@neuroglia.io&gt;
diff --git a/src/ServerlessWorkflow.Sdk.Builders/ServerlessWorkflow.Sdk.Builders.csproj b/src/ServerlessWorkflow.Sdk.Builders/ServerlessWorkflow.Sdk.Builders.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<NeutralLanguage>en</NeutralLanguage>
diff --git a/src/ServerlessWorkflow.Sdk.IO/ServerlessWorkflow.Sdk.IO.csproj b/src/ServerlessWorkflow.Sdk.IO/ServerlessWorkflow.Sdk.IO.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<NeutralLanguage>en</NeutralLanguage>
diff --git a/src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj b/src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha4</VersionSuffix>
+	<VersionSuffix>alpha4.1</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<NeutralLanguage>en</NeutralLanguage>
diff --git a/src/ServerlessWorkflow.Sdk/Validation/AuthenticationPolicyKeyValuePairValidator.cs b/src/ServerlessWorkflow.Sdk/Validation/AuthenticationPolicyKeyValuePairValidator.cs
@@ -0,0 +1,51 @@
+﻿// Copyright © 2024-Present The Serverless Workflow Specification Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License"),
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using FluentValidation;
+using ServerlessWorkflow.Sdk.Models;
+
+namespace ServerlessWorkflow.Sdk.Validation;
+
+/// <summary>
+/// Represents the <see cref="IValidator"/> used to validate <see cref="AuthenticationPolicyDefinition"/> key/value pairs
+/// </summary>
+public class AuthenticationPolicyKeyValuePairValidator
+    : AbstractValidator<KeyValuePair<string, AuthenticationPolicyDefinition>>
+{
+
+    /// <inheritdoc/>
+    public AuthenticationPolicyKeyValuePairValidator(IServiceProvider serviceProvider, ComponentDefinitionCollection? components)
+    {
+        this.ServiceProvider = serviceProvider;
+        this.Components = components;
+        this.RuleFor(t => t.Value)
+            .Custom((value, context) =>
+            {
+                var key = context.InstanceToValidate.Key;
+                var validator = new AuthenticationPolicyDefinitionValidator(serviceProvider, components);
+                var validationResult = validator.Validate(value);
+                foreach (var error in validationResult.Errors) context.AddFailure($"{key}.{error.PropertyName}", error.ErrorMessage);
+            });
+    }
+
+    /// <summary>
+    /// Gets the current <see cref="IServiceProvider"/>
+    /// </summary>
+    protected IServiceProvider ServiceProvider { get; }
+
+    /// <summary>
+    /// Gets the configured reusable components
+    /// </summary>
+    protected ComponentDefinitionCollection? Components { get; }
+
+}
diff --git a/src/ServerlessWorkflow.Sdk/Validation/ComponentDefinitionCollectionValidator.cs b/src/ServerlessWorkflow.Sdk/Validation/ComponentDefinitionCollectionValidator.cs
@@ -27,6 +27,8 @@ public class ComponentDefinitionCollectionValidator
     public ComponentDefinitionCollectionValidator(IServiceProvider serviceProvider)
     {
         this.ServiceProvider = serviceProvider;
+        this.RuleForEach(c => c.Authentications)
+            .SetValidator(c => new AuthenticationPolicyKeyValuePairValidator(this.ServiceProvider, c));
         this.RuleForEach(c => c.Functions)
             .SetValidator(c => new TaskKeyValuePairValidator(this.ServiceProvider, c, c.Functions));
     }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ public class ComponentDefinitionCollectionValidator`
`27`	`27`	`public ComponentDefinitionCollectionValidator(IServiceProvider serviceProvider)`
`28`	`28`	`{`
`29`	`29`	`this.ServiceProvider = serviceProvider;`
	`30`	`+ this.RuleForEach(c => c.Authentications)`
	`31`	`+ .SetValidator(c => new AuthenticationPolicyKeyValuePairValidator(this.ServiceProvider, c));`
`30`	`32`	`this.RuleForEach(c => c.Functions)`
`31`	`33`	`.SetValidator(c => new TaskKeyValuePairValidator(this.ServiceProvider, c, c.Functions));`
`32`	`34`	`}`