Fix Redis sample, adding Queue example.

Fixes #8

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "azureFunctions.projectLanguage": "C#",
+    "azureFunctions.projectRuntime": "~2"
+}

samples/EventGridSample/.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "azureFunctions.projectLanguage": "C#Script",
+    "azureFunctions.projectRuntime": "~2"
+}

samples/EventGridSample/EventGridSample.csproj

@@ -4,7 +4,7 @@
     <AzureFunctionsVersion>v2</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.23" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\AzureFunctionExtensions\AzureFunctionExtensions.csproj" />

samples/EventGridSample/local.settings.json

@@ -1,10 +1,11 @@
 {
   "IsEncrypted": false,
   "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet",
     "AzureWebJobsStorage": "UseDevelopmentStorage=true",
     "AzureWebJobsDashboard": "UseDevelopmentStorage=true",
     "AzureWebJobs_ExtensionsPath": ".",
-    "eventgrid_sas": "EFgFqSaABprKP0Ww7jgf8TCY9L6lE3cVrB4+nVeloxc=",
-    "eventgrid_endpoint": "https://frbtest.westeurope-1.eventgrid.azure.net/api/events"
+    "eventgrid_sas": "",
+    "eventgrid_endpoint": "https://xxxxx.westeurope-1.eventgrid.azure.net/api/events"
   }
 }

samples/RedisSample/.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "ms-azuretools.vscode-azurefunctions",
+    "ms-vscode.csharp"
+  ]
+}

samples/RedisSample/.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Attach to C# Functions",
+      "type": "coreclr",
+      "request": "attach",
+      "processId": "${command:azureFunctions.pickProcess}"
+    }
+  ]
+}

samples/RedisSample/.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "azureFunctions.projectRuntime": "~2",
+  "azureFunctions.projectLanguage": "C#",
+  "azureFunctions.templateFilter": "Verified",
+  "azureFunctions.deploySubpath": "bin/Release/netstandard2.0/publish",
+  "azureFunctions.preDeployTask": "publish",
+  "debug.internalConsoleOptions": "neverOpen"
+}

samples/RedisSample/.vscode/tasks.json

@@ -0,0 +1,46 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "clean",
+      "command": "dotnet clean",
+      "type": "shell",
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "build",
+      "command": "dotnet build",
+      "type": "shell",
+      "dependsOn": "clean",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "clean release",
+      "command": "dotnet clean --configuration Release",
+      "type": "shell",
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish",
+      "command": "dotnet publish --configuration Release",
+      "type": "shell",
+      "dependsOn": "clean release",
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "runFunctionsHost",
+      "type": "shell",
+      "dependsOn": "build",
+      "options": {
+        "cwd": "${workspaceFolder}/bin/Debug/netstandard2.0"
+      },
+      "command": "func host start",
+      "isBackground": true,
+      "problemMatcher": "$func-watch"
+    }
+  ]
+}

samples/RedisSample/QueueTriggerWithRedisFunctions.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Threading.Tasks;
+using Fbeltrao.AzureFunctionExtensions;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Azure.WebJobs.Host;
+using Microsoft.Extensions.Logging;
+using StackExchange.Redis;
+
+namespace Fbeltrao.RedisSample
+{
+    public static class QueueTriggerWithRedisFunctions
+    {            
+        [FunctionName(nameof(MoveQueueItemToRedis))]
+        public static async Task MoveQueueItemToRedis(
+            [QueueTrigger("myqueue-items", Connection = "AzureWebJobsStorage")] string myQueueItem,
+            [RedisDatabase(Connection = "%redis_connectionstring%")] IDatabase db,
+            ILogger log)
+        {
+            await db.ListRightPushAsync("my-queue", myQueueItem);
+            log.LogInformation($"Queue trigger pushed to redis list: {myQueueItem}");
+        }
+
+
+        [FunctionName(nameof(GetRedisList))]
+        public static async Task<IActionResult> GetRedisList(
+            [HttpTrigger(AuthorizationLevel.Function, "get", Route = null)] HttpRequest req,
+            [RedisDatabase(Connection = "%redis_connectionstring%")] IDatabase db,
+            ILogger log)
+        {
+            var values = await db.ListRangeAsync("my-queue");
+            return new OkObjectResult(new { values });
+        }
+    }
+}

samples/RedisSample/RedisSample.csproj

@@ -9,7 +9,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.23" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.2" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\AzureFunctionExtensions\AzureFunctionExtensions.csproj" />

samples/RedisSample/local.settings.json

@@ -1,10 +1,11 @@
 {
   "IsEncrypted": false,
   "Values": {
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet",
     "AzureWebJobsStorage": "UseDevelopmentStorage=true",
     "AzureWebJobsDashboard": "UseDevelopmentStorage=true",
     "AzureWebJobs_ExtensionsPath": ".",
-    "redis_connectionstring": "10.211.55.2:6379",
+    "redis_connectionstring": "192.168.1.124:6379",
     "redis_setvalueinredis_key": "mySample"
   }
 }

samples/SignalRSample/SignalRSample.csproj

@@ -4,7 +4,7 @@
     <AzureFunctionsVersion>v2</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.23" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.24" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\AzureFunctionExtensions\AzureFunctionExtensions.csproj" />

src/AzureFunctionExtensions/AzureFunctionExtensions.csproj

@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.1" />
     <PackageReference Include="StackExchange.Redis.StrongName.Core" Version="1.1.605" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.3.0" />
   </ItemGroup>

src/AzureFunctionExtensions/Redis/RedisConfiguration.cs

@@ -12,15 +12,7 @@ namespace Fbeltrao.AzureFunctionExtensions
     public class RedisConfiguration : IExtensionConfigProvider
     {
         private readonly IRedisDatabaseManager redisDatabaseManager;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public RedisConfiguration() : this(RedisDatabaseManager.GetInstance())
-        {
-
-        }
-
+
         /// <summary>
         /// Constructor
         /// </summary>
@@ -69,7 +61,7 @@ public void Initialize(ExtensionConfigContext context)
             // Redis output binding
             context
                 .AddBindingRule<RedisOutputAttribute>()
-                .BindToCollector<RedisOutput>(attr => new RedisOutputAsyncCollector(this, attr));
+                .BindToCollector<RedisOutput>(attr => new RedisOutputAsyncCollector(this, attr, this.redisDatabaseManager));
 
             // Redis database (input) binding
             context

src/AzureFunctionExtensions/Redis/RedisDatabaseManager.cs

@@ -15,15 +15,11 @@ public class RedisDatabaseManager : IRedisDatabaseManager
         /// <summary>
         /// Constructor
         /// </summary>
-        protected RedisDatabaseManager()
+        public RedisDatabaseManager()
         {
             connections = new System.Collections.Concurrent.ConcurrentDictionary<string, Lazy<ConnectionMultiplexer>>();
         }
 
-        static RedisDatabaseManager instance = new RedisDatabaseManager();
-        public static IRedisDatabaseManager GetInstance() => instance;
-
-
         /// <summary>
         /// Gets the redis database
         /// </summary>

src/AzureFunctionExtensions/Redis/RedisOutputAsyncCollector.cs

@@ -24,15 +24,7 @@ public class RedisOutputAsyncCollector : IAsyncCollector<RedisOutput>
         /// </summary>
         /// <param name="config"></param>
         /// <param name="attr"></param>
-        public RedisOutputAsyncCollector(RedisConfiguration config, RedisOutputAttribute attr) : this(config, attr, RedisDatabaseManager.GetInstance())
-        {
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="config"></param>
-        /// <param name="attr"></param>
+        /// <param name="redisDatabaseManager"></param>
         public RedisOutputAsyncCollector(RedisConfiguration config, RedisOutputAttribute attr, IRedisDatabaseManager redisDatabaseManager)
         {
             this.config = config;

src/AzureFunctionExtensions/Startup.cs

@@ -1,5 +1,6 @@
 using Microsoft.Azure.WebJobs;
 using Microsoft.Azure.WebJobs.Hosting;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -19,6 +20,7 @@ public void Configure(IWebJobsBuilder builder)
             builder.AddExtension<HttpCallConfiguration>();
             builder.AddExtension<RedisConfiguration>();
             builder.AddExtension<SignalRConfiguration>();
+            builder.Services.AddSingleton(typeof(IRedisDatabaseManager), typeof(RedisDatabaseManager));
         }
     }
 }

test/AzureFunctionExtensions.Test/AzureFunctionExtensions.Test.csproj

@@ -12,9 +12,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Moq" Version="4.10.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

test/AzureFunctionExtensions.Test/RedisOutputAsyncCollectorTest.cs

@@ -15,7 +15,8 @@ public class RedisOutputAsyncCollectorTest
         [Fact]
         public async Task SetKeyValue_ConnectionInConfig_KeyInAttribute_OperationInAttribute_SetsValue()
         {
-            var config = new RedisConfiguration()
+            var connectionManager = new Mock<IRedisDatabaseManager>();
+            var config = new RedisConfiguration(connectionManager.Object)
             {
                 Connection = "localhost:3679",                
             };
@@ -28,7 +29,7 @@ public async Task SetKeyValue_ConnectionInConfig_KeyInAttribute_OperationInAttri
 
             var redisDatabase = new RedisDatabaseMock();
 
-            var connectionManager = new Mock<IRedisDatabaseManager>();
+
             connectionManager.Setup(x => x.GetDatabase("localhost:3679", -1))
                 .Returns(redisDatabase);
 
@@ -49,7 +50,8 @@ await target.AddAsync(new RedisOutput()
         [Fact]
         public async Task IncrementValue_ConnectionInConfig_KeyInAttribute_OperationInAttribute_WithoutIncrementValue_IncrementsOne()
         {
-            var config = new RedisConfiguration()
+            var connectionManager = new Mock<IRedisDatabaseManager>();
+            var config = new RedisConfiguration(connectionManager.Object)
             {
                 Connection = "localhost:3679",
             };
@@ -62,7 +64,7 @@ public async Task IncrementValue_ConnectionInConfig_KeyInAttribute_OperationInAt
 
             var redisDatabase = new RedisDatabaseMock();
 
-            var connectionManager = new Mock<IRedisDatabaseManager>();
+
             connectionManager.Setup(x => x.GetDatabase("localhost:3679", -1))
                 .Returns(redisDatabase);
 
@@ -82,7 +84,8 @@ await target.AddAsync(new RedisOutput()
         [Fact]
         public async Task IncrementValue_ConnectionInConfig_KeyInAttribute_OperationInAttribute_By10_Increments10()
         {
-            var config = new RedisConfiguration()
+            var connectionManager = new Mock<IRedisDatabaseManager>();
+            var config = new RedisConfiguration(connectionManager.Object)
             {
                 Connection = "localhost:3679",
             };
@@ -95,7 +98,7 @@ public async Task IncrementValue_ConnectionInConfig_KeyInAttribute_OperationInAt
 
             var redisDatabase = new RedisDatabaseMock();
 
-            var connectionManager = new Mock<IRedisDatabaseManager>();
+
             connectionManager.Setup(x => x.GetDatabase("localhost:3679", -1))
                 .Returns(redisDatabase);
 
@@ -117,7 +120,8 @@ await target.AddAsync(new RedisOutput()
         [Fact]
         public async Task ListRightPush_ConnectionInConfig_KeyInAttribute_OperationInAttribute_AddsItemToEndOfList()
         {
-            var config = new RedisConfiguration()
+            var connectionManager = new Mock<IRedisDatabaseManager>();
+            var config = new RedisConfiguration(connectionManager.Object)
             {
                 Connection = "localhost:3679",
             };
@@ -130,7 +134,6 @@ public async Task ListRightPush_ConnectionInConfig_KeyInAttribute_OperationInAtt
 
             var redisDatabase = new RedisDatabaseMock();
 
-            var connectionManager = new Mock<IRedisDatabaseManager>();
             connectionManager.Setup(x => x.GetDatabase("localhost:3679", -1))
                 .Returns(redisDatabase);
 
@@ -159,7 +162,8 @@ await target.AddAsync(new RedisOutput()
         [Fact]
         public async Task ListLeftPush_ConnectionInConfig_KeyInAttribute_OperationInAttribute_AddsItemToStartOfList()
         {
-            var config = new RedisConfiguration()
+            var connectionManager = new Mock<IRedisDatabaseManager>();
+            var config = new RedisConfiguration(connectionManager.Object)
             {
                 Connection = "localhost:3679",
             };
@@ -172,7 +176,6 @@ public async Task ListLeftPush_ConnectionInConfig_KeyInAttribute_OperationInAttr
 
             var redisDatabase = new RedisDatabaseMock();
 
-            var connectionManager = new Mock<IRedisDatabaseManager>();
             connectionManager.Setup(x => x.GetDatabase("localhost:3679", -1))
                 .Returns(redisDatabase);