Fixes for templates and validation exception

Mark-RSK · Dec 4, 2018 · c2b2e10 · c2b2e10
1 parent 0e6a2e3
commit c2b2e10
Show file tree

Hide file tree

Showing 18 changed files with 105 additions and 16 deletions.
diff --git a/FunctionMonkey.sln b/FunctionMonkey.sln
@@ -71,6 +71,7 @@ Global
 		{4ECCEA2B-AC04-42F9-882E-E615641D3418}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4ECCEA2B-AC04-42F9-882E-E615641D3418}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C24578CA-39E0-4D82-9C31-AB58D0EC6941}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C24578CA-39E0-4D82-9C31-AB58D0EC6941}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C24578CA-39E0-4D82-9C31-AB58D0EC6941}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C24578CA-39E0-4D82-9C31-AB58D0EC6941}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DCFF70AD-24C9-451D-9A9E-CBD70B87B4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -83,17 +84,17 @@ Global
 		{A9F41F67-7491-4F56-A20F-A07C65CEE94F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9F41F67-7491-4F56-A20F-A07C65CEE94F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{488F92CA-6DEC-4E33-A517-167CF6BD02E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{488F92CA-6DEC-4E33-A517-167CF6BD02E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{488F92CA-6DEC-4E33-A517-167CF6BD02E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{488F92CA-6DEC-4E33-A517-167CF6BD02E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{488F92CA-6DEC-4E33-A517-167CF6BD02E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB465B8B-B8DB-47A8-8403-B269FD984B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB465B8B-B8DB-47A8-8403-B269FD984B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB465B8B-B8DB-47A8-8403-B269FD984B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB465B8B-B8DB-47A8-8403-B269FD984B6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB465B8B-B8DB-47A8-8403-B269FD984B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9AA9A741-775E-4E68-B838-3FE2F4BC8EA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AA9A741-775E-4E68-B838-3FE2F4BC8EA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9AA9A741-775E-4E68-B838-3FE2F4BC8EA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9AA9A741-775E-4E68-B838-3FE2F4BC8EA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9AA9A741-775E-4E68-B838-3FE2F4BC8EA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33204395-FEAB-4E41-B6D7-B358397A82B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{33204395-FEAB-4E41-B6D7-B358397A82B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33204395-FEAB-4E41-B6D7-B358397A82B8}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.csproj b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>    
-    <Version>0.18.5-beta000</Version>
+    <Version>0.18.6-beta000</Version>
     <AssemblyName>FunctionMonkey.Compiler</AssemblyName>
     <PackageId>FunctionMonkey.Compiler</PackageId>
   </PropertyGroup>
@@ -358,8 +358,8 @@
     <IntermediatePackDir>$(MSBuildProjectDirectory)/bin/$(Configuration)/publish/</IntermediatePackDir>
     <PublishDir>$(IntermediatePackDir)$(TargetFramework)/</PublishDir>
     <NuspecProperties>publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir)))</NuspecProperties>
-    <AssemblyVersion>0.18.3.0</AssemblyVersion>
-    <FileVersion>0.18.5.0</FileVersion>
+    <AssemblyVersion>0.18.6.0</AssemblyVersion>
+    <FileVersion>0.18.6.0</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>FunctionMonkey.Compiler</id>
-    <version>0.18.5-beta000</version>
+    <version>0.18.6-beta000</version>
     <authors>James Randall</authors>
     <description>Generates Azure Functions from command registrations</description>
     <license type="expression">MIT</license>

diff --git a/Source/FunctionMonkey.Compiler/Implementation/AssemblyCompiler.cs b/Source/FunctionMonkey.Compiler/Implementation/AssemblyCompiler.cs
@@ -1,12 +1,10 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Versioning;
-using System.Security.Claims;
 using System.Text;
 using FunctionMonkey.Commanding.Abstractions;
 using FunctionMonkey.Compiler.HandlebarsHelpers;

diff --git a/Source/FunctionMonkey.Compiler/Templates/eventhubqueue.csharp.handlebars b/Source/FunctionMonkey.Compiler/Templates/eventhubqueue.csharp.handlebars
@@ -45,7 +45,7 @@ namespace {{Namespace}}
             var validationResult = validator.Validate(command);
             if (!validationResult.IsValid)
             {
-                throw new FunctionMonkey.Abstractions.Validation.ValidationException("{{Name}}", validationResult, messageId);
+                throw new FunctionMonkey.Commanding.Abstractions.Validation.ValidationException("{{Name}}", validationResult);
             }
             {{/if}}
 

diff --git a/Source/FunctionMonkey.Compiler/Templates/servicebusqueue.csharp.handlebars b/Source/FunctionMonkey.Compiler/Templates/servicebusqueue.csharp.handlebars
@@ -45,7 +45,7 @@ namespace {{Namespace}}
             var validationResult = validator.Validate(command);
             if (!validationResult.IsValid)
             {
-                throw new FunctionMonkey.Abstractions.Validation.ValidationException("{{Name}}", validationResult, messageId);
+                throw new FunctionMonkey.Commanding.Abstractions.Validation.ValidationException("{{Name}}", validationResult, messageId);
             }
             {{/if}}
 

diff --git a/Source/FunctionMonkey.Compiler/Templates/servicebussubscription.csharp.handlebars b/Source/FunctionMonkey.Compiler/Templates/servicebussubscription.csharp.handlebars
@@ -45,7 +45,7 @@ namespace {{Namespace}}
             var validationResult = validator.Validate(command);
             if (!validationResult.IsValid)
             {
-                throw new FunctionMonkey.Abstractions.Validation.ValidationException("{{Name}}", validationResult, messageId);
+                throw new FunctionMonkey.Commanding.Abstractions.Validation.ValidationException("{{Name}}", validationResult, messageId);
             }
             {{/if}}
 

diff --git a/Source/FunctionMonkey.Compiler/Templates/storageblob.csharp.handlebars b/Source/FunctionMonkey.Compiler/Templates/storageblob.csharp.handlebars
@@ -53,7 +53,7 @@ namespace {{Namespace}}
             var validationResult = validator.Validate(command);
             if (!validationResult.IsValid)
             {
-                throw new FunctionMonkey.Abstractions.Validation.ValidationException("{{Name}}", validationResult, messageId);
+                throw new FunctionMonkey.Commanding.Abstractions.Validation.ValidationException("{{Name}}", validationResult, name);
             }
             {{/if}}
 

diff --git a/Source/FunctionMonkey.Compiler/Templates/storagequeue.csharp.handlebars b/Source/FunctionMonkey.Compiler/Templates/storagequeue.csharp.handlebars
@@ -48,7 +48,7 @@ namespace {{Namespace}}
             var validationResult = validator.Validate(command);
             if (!validationResult.IsValid)
             {
-                throw new FunctionMonkey.Abstractions.Validation.ValidationException("{{Name}}", validationResult, messageId);
+                throw new FunctionMonkey.Commanding.Abstractions.Validation.ValidationException("{{Name}}", validationResult, id);
             }
             {{/if}}
 

diff --git a/Source/FunctionMonkey.Compiler/Templates/timer.csharp.handlebars b/Source/FunctionMonkey.Compiler/Templates/timer.csharp.handlebars
@@ -29,7 +29,7 @@ namespace {{Namespace}}
             var validationResult = validator.Validate(command);
             if (!validationResult.IsValid)
             {
-                throw new FunctionMonkey.Abstractions.Validation.ValidationException("{{Name}}", validationResult, messageId);
+                throw new FunctionMonkey.Commanding.Abstractions.Validation.ValidationException("{{Name}}", validationResult);
             }
             {{/if}}
 

diff --git a/Tests/FunctionMonkey.Tests.Integration/Commands/SimpleCosmosChangeFeedCommand.cs b/Tests/FunctionMonkey.Tests.Integration/Commands/SimpleCosmosChangeFeedCommand.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using AzureFromTheTrenches.Commanding.Abstractions;
+
+namespace FunctionMonkey.Tests.Integration.Commands
+{
+    public class SimpleCosmosChangeFeedCommand : ICommand
+    {
+        public string Value { get; set; }
+    }
+}
diff --git a/Tests/FunctionMonkey.Tests.Integration/Commands/SimpleServiceBusQueueCommand.cs b/Tests/FunctionMonkey.Tests.Integration/Commands/SimpleServiceBusQueueCommand.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using AzureFromTheTrenches.Commanding.Abstractions;
+
+namespace FunctionMonkey.Tests.Integration.Commands
+{
+    public class SimpleServiceBusQueueCommand : ICommand
+    {
+        public string SomeValue { get; set; }
+    }
+}
diff --git a/Tests/FunctionMonkey.Tests.Integration/Commands/SimpleServiceBusTopicCommand.cs b/Tests/FunctionMonkey.Tests.Integration/Commands/SimpleServiceBusTopicCommand.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using AzureFromTheTrenches.Commanding.Abstractions;
+
+namespace FunctionMonkey.Tests.Integration.Commands
+{
+    public class SimpleServiceBusTopicCommand : ICommand
+    {
+    }
+}
diff --git a/Tests/FunctionMonkey.Tests.Integration/FunctionAppConfiguration.cs b/Tests/FunctionMonkey.Tests.Integration/FunctionAppConfiguration.cs
@@ -1,6 +1,10 @@
-using FunctionMonkey.Abstractions;
+using FluentValidation;
+using FunctionMonkey.Abstractions;
 using FunctionMonkey.Abstractions.Builders;
+using FunctionMonkey.FluentValidation;
 using FunctionMonkey.Tests.Integration.Commands;
+using FunctionMonkey.Tests.Integration.Validators;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace FunctionMonkey.Tests.Integration
 {
@@ -11,8 +15,14 @@ public void Build(IFunctionHostBuilder builder)
             builder
                 .Setup((serviceCollection, commandRegistry) =>
                 {
+                    serviceCollection
+                        .AddTransient<IValidator<BlobCommand>, BlobCommandValidator>()
+                        .AddTransient<IValidator<SimpleHttpRouteCommand>, SimpleHttpRouteCommandValidator>()
+                        .AddTransient<IValidator<StorageQueueCommand>, StorageQueueCommandValidator>()
+                    ;
                     commandRegistry.Discover<FunctionAppConfiguration>();
                 })
+                .AddFluentValidation()
                 .OutputAuthoredSource(@"c:\wip\outputsource")
                 .Functions(functions => functions
                     .HttpRoute("someroute", route => route
@@ -22,6 +32,13 @@ public void Build(IFunctionHostBuilder builder)
                         .BlobFunction<BlobCommand>("blobcommandcontainer/{name}") // TODO: We need to have the compiler insert parameters on the function for everything surrounded in {} - e.g. {name} needs a string parameter of name
                         .BlobFunction<StreamBlobCommand>("streamblobcommandcontainer/{name}")
                     )
+                    .CosmosDb("cosmosConnection", cosmos => cosmos
+                        .ChangeFeedFunction<SimpleCosmosChangeFeedCommand>("cosmosCollection", "cosmosDatabase")
+                    )
+                    .ServiceBus("serviceBuConnection", serviceBus => serviceBus
+                        .QueueFunction<SimpleServiceBusQueueCommand>("myQueue")
+                        .SubscriptionFunction<SimpleServiceBusTopicCommand>("myTopic", "mySubscription")
+                    )
                 );
         }
     }

diff --git a/Tests/FunctionMonkey.Tests.Integration/FunctionMonkey.Tests.Integration.csproj b/Tests/FunctionMonkey.Tests.Integration/FunctionMonkey.Tests.Integration.csproj
@@ -9,6 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Source\FunctionMonkey.Abstractions\FunctionMonkey.Abstractions.csproj" />
     <ProjectReference Include="..\..\Source\FunctionMonkey.Commanding.Abstractions\FunctionMonkey.Commanding.Abstractions.csproj" />
+    <ProjectReference Include="..\..\Source\FunctionMonkey.FluentValidation\FunctionMonkey.FluentValidation.csproj" />
     <ProjectReference Include="..\..\Source\FunctionMonkey\FunctionMonkey.csproj" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Tests/FunctionMonkey.Tests.Integration/Validators/BlobCommandValidator.cs b/Tests/FunctionMonkey.Tests.Integration/Validators/BlobCommandValidator.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using FluentValidation;
+using FunctionMonkey.Tests.Integration.Commands;
+
+namespace FunctionMonkey.Tests.Integration.Validators
+{
+    class BlobCommandValidator : AbstractValidator<BlobCommand>
+    {
+    }
+}
diff --git a/Tests/FunctionMonkey.Tests.Integration/Validators/SimpleHttpRouteCommandValidator.cs b/Tests/FunctionMonkey.Tests.Integration/Validators/SimpleHttpRouteCommandValidator.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using FluentValidation;
+using FunctionMonkey.Tests.Integration.Commands;
+
+namespace FunctionMonkey.Tests.Integration.Validators
+{
+    public class SimpleHttpRouteCommandValidator : AbstractValidator<SimpleHttpRouteCommand>
+    {
+
+    }
+}
diff --git a/Tests/FunctionMonkey.Tests.Integration/Validators/StorageQueueCommandValidator.cs b/Tests/FunctionMonkey.Tests.Integration/Validators/StorageQueueCommandValidator.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using FluentValidation;
+using FunctionMonkey.Tests.Integration.Commands;
+
+namespace FunctionMonkey.Tests.Integration.Validators
+{
+    class StorageQueueCommandValidator : AbstractValidator<StorageQueueCommand>
+    {
+    }
+}