[Samples] Updated the exception handling middleware sample to handle …

…multiple output binding case (#1071) * Update exception handling middleware sample to handle multiple output binding case * Update SDK package to latest stable * Add line break
Azure · Sep 28, 2022 · acffe91 · acffe91
1 parent 04ccbd8
commit acffe91
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 5 deletions.
diff --git a/samples/CustomMiddleware/CustomMiddleware.csproj b/samples/CustomMiddleware/CustomMiddleware.csproj
@@ -13,9 +13,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.8.0-preview1" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.9.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.5.0-preview1" OutputItemType="Analyzer" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.7.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">

diff --git a/samples/CustomMiddleware/ExceptionHandlingMiddleware.cs b/samples/CustomMiddleware/ExceptionHandlingMiddleware.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker;
@@ -44,10 +45,28 @@ public async Task Invoke(FunctionContext context, FunctionExecutionDelegate next
                     // https://github.com/Azure/azure-functions-dotnet-worker/issues/776
                     await newHttpResponse.WriteAsJsonAsync(new { FooStatus = "Invocation failed!" }, newHttpResponse.StatusCode);
 
-                    // Update invocation result.
-                    context.GetInvocationResult().Value = newHttpResponse;
+                    var invocationResult = context.GetInvocationResult();
+
+                    var httpOutputBindingFromMultipleOutputBindings = GetHttpOutputBindingFromMultipleOutputBinding(context);
+                    if (httpOutputBindingFromMultipleOutputBindings is not null)
+                    {
+                        httpOutputBindingFromMultipleOutputBindings.Value = newHttpResponse;
+                    }
+                    else
+                    {
+                        invocationResult.Value = newHttpResponse;
+                    }
                 }
             }
         }
+
+        private OutputBindingData<HttpResponseData> GetHttpOutputBindingFromMultipleOutputBinding(FunctionContext context)
+        {
+            // The output binding entry name will be "$return" only when the function return type is HttpResponseData
+            var httpOutputBinding = context.GetOutputBindings<HttpResponseData>()
+                .FirstOrDefault(b => b.BindingType == "http" && b.Name != "$return");
+
+            return httpOutputBinding;
+        }
     }
 }
diff --git a/samples/CustomMiddleware/HttpFunction.cs b/samples/CustomMiddleware/HttpFunction.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using System;
 using System.Net;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
@@ -10,10 +11,15 @@ namespace CustomMiddleware
 {
     public class HttpFunction
     {
-        [Function("HttpFunction")]
+        [Function(nameof(HttpFunction))]
         public static HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req,
             FunctionContext context)
         {
+            if (req.Url.Query.Contains("throw-exception"))
+            {
+                throw new Exception("App code failed");
+            }
+
             var logger = context.GetLogger<HttpFunction>();
 
             // Get the item set by the middleware

diff --git a/samples/CustomMiddleware/HttpTriggerWithMultipleOutputBindings.cs b/samples/CustomMiddleware/HttpTriggerWithMultipleOutputBindings.cs
@@ -0,0 +1,39 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Net;
+using Microsoft.Azure.Functions.Worker;
+using Microsoft.Azure.Functions.Worker.Http;
+
+namespace CustomMiddleware
+{
+    public static class HttpTriggerWithMultipleOutputBindings
+    {
+        [Function(nameof(HttpTriggerWithMultipleOutputBindings))]
+        public static MyOutputType Run([HttpTrigger(AuthorizationLevel.Anonymous, "get")] HttpRequestData req)
+        {
+            if (req.Url.Query.Contains("throw-exception"))
+            {
+                throw new Exception("App code failed");
+            }
+
+            var response = req.CreateResponse(HttpStatusCode.OK);
+            response.WriteString("Success!");
+
+            return new MyOutputType()
+            {
+                Name = "Azure Functions",
+                HttpResponse = response
+            };
+        }
+    }
+
+    public class MyOutputType
+    {
+        [QueueOutput("functionstesting2", Connection = "AzureWebJobsStorage")]
+        public string Name { get; set; }
+
+        public HttpResponseData HttpResponse { get; set; }
+    }
+}