Update samples and extensions

ankitkumarr · web-flow · commit b95e7af0d759 · 2021-02-23T16:09:21.000-08:00
diff --git a/extensions/Worker.Extensions.Abstractions/OutputBindingAttribute.cs b/extensions/Worker.Extensions.Abstractions/OutputBindingAttribute.cs
@@ -11,12 +11,5 @@ public abstract class OutputBindingAttribute : BindingAttribute
         public OutputBindingAttribute()
         {
         }
-
-        public OutputBindingAttribute(string name)
-        {
-            Name = name;
-        }
-
-        public string? Name { get; }
     }
 }
diff --git a/extensions/Worker.Extensions.CosmosDB/CosmosDBOutputAttribute.cs b/extensions/Worker.Extensions.CosmosDB/CosmosDBOutputAttribute.cs
@@ -18,17 +18,6 @@ public CosmosDBOutputAttribute(string databaseName, string collectionName)
             CollectionName = collectionName;
         }
 
-        /// <summary>
-        /// Constructs a new instance.
-        /// </summary>
-        /// <param name="databaseName">The CosmosDB database name.</param>
-        /// <param name="collectionName">The CosmosDB collection name.</param>
-        public CosmosDBOutputAttribute(string name, string databaseName, string collectionName) : base(name)
-        {
-            DatabaseName = databaseName;
-            CollectionName = collectionName;
-        }
-
         /// <summary>
         /// The name of the database to which the parameter applies.
         /// May include binding parameters.
diff --git a/extensions/Worker.Extensions.EventGrid/EventGridOutputAttribute.cs b/extensions/Worker.Extensions.EventGrid/EventGridOutputAttribute.cs
@@ -10,8 +10,7 @@ public sealed class EventGridOutputAttribute : OutputBindingAttribute
         /// <summary>
         /// Initialize a new instance of the <see cref="EventGridOutputAttribute"/>
         /// </summary>
-        /// <param name="name">The name of the output binding property to bind.</param>
-        public EventGridOutputAttribute(string name) : base(name)
+        public EventGridOutputAttribute()
         {
         }
 
diff --git a/extensions/Worker.Extensions.EventHubs/EventHubOutputAttribute.cs b/extensions/Worker.Extensions.EventHubs/EventHubOutputAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 ﻿using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
@@ -10,9 +10,8 @@ public sealed class EventHubOutputAttribute : OutputBindingAttribute
         /// <summary>
         /// Initialize a new instance of the <see cref="EventHubOutputAttribute"/>
         /// </summary>
-        /// <param name="name">The name of the output binding property to bind.</param>
         /// <param name="eventHubName">Name of the event hub </param>
-        public EventHubOutputAttribute(string name, string eventHubName) : base(name)
+        public EventHubOutputAttribute(string eventHubName)
         {
             EventHubName = eventHubName;
         }
diff --git a/extensions/Worker.Extensions.Kafka/KafkaOutputAttribute.cs b/extensions/Worker.Extensions.Kafka/KafkaOutputAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 ﻿using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
@@ -10,10 +10,9 @@ public sealed class KafkaOutputAttribute : OutputBindingAttribute
         /// <summary>
         /// Initialize a new instance of the <see cref="KafkaOutputAttribute"/>
         /// </summary>
-        /// <param name="name">The name of the output binding property to bind.</param>
         /// <param name="brokerList">Broker list</param>
         /// <param name="topic">Topic name</param>
-        public KafkaOutputAttribute(string name, string brokerList, string topic) : base(name)
+        public KafkaOutputAttribute(string brokerList, string topic)
         {
             BrokerList = brokerList;
             Topic = topic;
diff --git a/extensions/Worker.Extensions.RabbitMQ/RabbitMQOutputAttribute.cs b/extensions/Worker.Extensions.RabbitMQ/RabbitMQOutputAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 ﻿using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
@@ -10,8 +10,7 @@ public sealed class RabbitMQOutputAttribute : OutputBindingAttribute
         /// <summary>
         /// Initializes a new instance of the <see cref="RabbitMQOutputAttribute"/> class.
         /// </summary>
-        /// <param name="name">The name of the output binding property to bind.</param>
-        public RabbitMQOutputAttribute(string name) : base(name)
+        public RabbitMQOutputAttribute()
         {
         }
 
diff --git a/extensions/Worker.Extensions.ServiceBus/ServiceBusOutputAttribute.cs b/extensions/Worker.Extensions.ServiceBus/ServiceBusOutputAttribute.cs
@@ -10,9 +10,8 @@ public sealed class ServiceBusOutputAttribute : OutputBindingAttribute
         /// <summary>
         /// Initializes a new instance of the <see cref="ServiceBusOutputAttribute"/> class.
         /// </summary>
-        /// <param name="name">The name of the output binding property to bind.</param>
         /// <param name="queueOrTopicName">The name of the queue or topic to bind to.</param>
-        public ServiceBusOutputAttribute(string name, string queueOrTopicName) : base(name)
+        public ServiceBusOutputAttribute(string queueOrTopicName)
         {
             QueueOrTopicName = queueOrTopicName;
             EntityType = EntityType.Queue;
@@ -23,7 +22,7 @@ public ServiceBusOutputAttribute(string name, string queueOrTopicName) : base(na
         /// </summary>
         /// <param name="queueOrTopicName">The name of the queue or topic to bind to.</param>
         /// <param name="queueOrTopicName">The type of the entity to bind to.</param>
-        public ServiceBusOutputAttribute(string name, string queueOrTopicName, EntityType entityType) : base(name)
+        public ServiceBusOutputAttribute(string queueOrTopicName, EntityType entityType)
         {
             QueueOrTopicName = queueOrTopicName;
             EntityType = entityType;
diff --git a/extensions/Worker.Extensions.SignalRService/SignalROutputAttribute.cs b/extensions/Worker.Extensions.SignalRService/SignalROutputAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 ﻿using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
@@ -7,7 +7,7 @@ namespace Microsoft.Azure.Functions.Worker.Extensions.SignalRService
 {
     public sealed class SignalROutputAttribute : OutputBindingAttribute
     {
-        public SignalROutputAttribute(string name) : base(name)
+        public SignalROutputAttribute()
         {
         }
 
diff --git a/extensions/Worker.Extensions.Storage/Tables/TableOutputAttribute.cs b/extensions/Worker.Extensions.Storage/Tables/TableOutputAttribute.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 ﻿using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
@@ -12,29 +12,26 @@ public sealed class TableOutputAttribute : OutputBindingAttribute
         private readonly string? _rowKey;
 
         /// <summary>Initializes a new instance of the <see cref="TableOutputAttribute"/> class.</summary>
-        /// <param name="name">The name of the output binding property to bind.</param>
         /// <param name="tableName">The name of the table to which to bind.</param>
-        public TableOutputAttribute(string name, string tableName) : base(name)
+        public TableOutputAttribute(string tableName)
         {
             _tableName = tableName;
         }
 
         /// <summary>Initializes a new instance of the <see cref="TableOutputAttribute"/> class.</summary>
-        /// <param name="name">The name of the output binding property to bind.</param>
         /// <param name="tableName">The name of the table containing the entity.</param>
         /// <param name="partitionKey">The partition key of the entity.</param>
-        public TableOutputAttribute(string name, string tableName, string partitionKey) : base(name)
+        public TableOutputAttribute(string tableName, string partitionKey)
         {
             _tableName = tableName;
             _partitionKey = partitionKey;
         }
 
         /// <summary>Initializes a new instance of the <see cref="TableAttribute"/> class.</summary>
-        /// <param name="name">The name of the output binding property to bind.</param>
         /// <param name="tableName">The name of the table containing the entity.</param>
         /// <param name="partitionKey">The partition key of the entity.</param>
         /// <param name="rowKey">The row key of the entity.</param>
-        public TableOutputAttribute(string name, string tableName, string partitionKey, string rowKey) : base(name)
+        public TableOutputAttribute(string tableName, string partitionKey, string rowKey)
         {
             _tableName = tableName;
             _partitionKey = partitionKey;
diff --git a/samples/SampleApp/Blob/BlobFunction.cs b/samples/SampleApp/Blob/BlobFunction.cs
@@ -11,10 +11,10 @@ namespace SampleApp
     public static class BlobFunction
     {
         [Function("BlobFunction")]
-        [BlobOutput("test-samples-output/{name}-output.txt", Connection = "AzureWebJobsStorage")]
+        [BlobOutput("test-samples-output/{name}-output.txt")]
         public static string Run(
-            [BlobTrigger("test-samples-trigger/{name}", Connection = "AzureWebJobsStorage")] string myTriggerItem,
-            [BlobInput("test-samples-input/sample1.txt", Connection = "AzureWebJobsStorage")] string myBlob,
+            [BlobTrigger("test-samples-trigger/{name}")] string myTriggerItem,
+            [BlobInput("test-samples-input/sample1.txt")] string myBlob,
             FunctionContext context)
         {
             var logger = context.GetLogger("BlobFunction");
diff --git a/samples/SampleApp/CosmosDB/CosmosDBFunction.cs b/samples/SampleApp/CosmosDB/CosmosDBFunction.cs
@@ -13,8 +13,8 @@ namespace SampleApp
     public static class CosmosDBFunction
     {
         [Function("CosmosDBFunction")]
-        [CosmosDBOutput("output", "%CosmosDb%", "%CosmosCollOut%", ConnectionStringSetting = "CosmosConnection", CreateIfNotExists = true)]
-        public static void Run(
+        [CosmosDBOutput("%CosmosDb%", "%CosmosCollOut%", ConnectionStringSetting = "CosmosConnection", CreateIfNotExists = true)]
+        public static object Run(
             [CosmosDBTrigger("%CosmosDb%", "%CosmosCollIn%", ConnectionStringSetting = "CosmosConnection",
                 LeaseCollectionName = "leases", CreateLeaseCollectionIfNotExists = true)] IReadOnlyList<MyDocument> input,
             FunctionContext context)
@@ -29,8 +29,10 @@ public static void Run(
                 }
 
                 // Cosmos Output
-                context.OutputBindings["output"] = input.Select(p => new { id = p.Id });
+                return input.Select(p => new { id = p.Id });
             }
+
+            return null;
         }
     }
 
diff --git a/samples/SampleApp/DependencyInjection/DependencyInjectionFunction.cs b/samples/SampleApp/DependencyInjection/DependencyInjectionFunction.cs
@@ -7,7 +7,6 @@
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Azure.Functions.Worker.Extensions.Http;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.Azure.Functions.Worker.Pipeline;
 using Microsoft.Extensions.Logging;
 
 namespace SampleApp
diff --git a/samples/SampleApp/EventGrid/EventGridFunction.cs b/samples/SampleApp/EventGrid/EventGridFunction.cs
@@ -12,8 +12,8 @@ namespace SampleApp
     public static class EventGridFunction
     {
         [Function("EventGridFunction")]
-        [EventGridOutput("output", TopicEndpointUri = "MyEventGridTopicUriSetting", TopicKeySetting = "MyEventGridTopicKeySetting")]
-        public static void Run([EventGridTrigger] MyEventType input, FunctionContext context)
+        [EventGridOutput(TopicEndpointUri = "MyEventGridTopicUriSetting", TopicKeySetting = "MyEventGridTopicKeySetting")]
+        public static MyEventType Run([EventGridTrigger] MyEventType input, FunctionContext context)
         {
             var logger = context.GetLogger("EventGridFunction");
 
@@ -29,7 +29,7 @@ public static void Run([EventGridTrigger] MyEventType input, FunctionContext con
                 }
             };
 
-            context.OutputBindings["output"] = outputEvent;
+            return outputEvent;
         }
     }
 
diff --git a/samples/SampleApp/EventHubs/EventHubsFunction.cs b/samples/SampleApp/EventHubs/EventHubsFunction.cs
@@ -12,16 +12,16 @@ namespace SampleApp
     public static class EventHubsFunction
     {
         [Function("EventHubsFunction")]
-        [EventHubOutput("myOutput", "dest", Connection = "EventHubConnectionAppSetting")]
-        public static void Run([EventHubTrigger("src", Connection = "EventHubConnectionAppSetting")] string input,
+        [EventHubOutput("dest", Connection = "EventHubConnectionAppSetting")]
+        public static string Run([EventHubTrigger("src", Connection = "EventHubConnectionAppSetting")] string input,
             FunctionContext context)
         {
             var logger = context.GetLogger("EventHubsFunction");
 
             logger.LogInformation(input);
 
             var message = $"Output message created at {DateTime.Now}";
-            context.OutputBindings["myOutput"] = message;
+            return message;
         }
     }
 }
diff --git a/samples/SampleApp/Kafka/KafkaFunction.cs b/samples/SampleApp/Kafka/KafkaFunction.cs
@@ -12,8 +12,8 @@ namespace SampleApp
     public static class KafkaFunction
     {
         [Function("KafkaFunction")]
-        [KafkaOutput("myOutput", "LocalBroker", "stringTopicTenPartitions")]
-        public static void Run([KafkaTrigger("LocalBroker", "stringTopicTenPartitions",
+        [KafkaOutput("LocalBroker", "stringTopicTenPartitions")]
+        public static string Run([KafkaTrigger("LocalBroker", "stringTopicTenPartitions",
             ConsumerGroup = "$Default", AuthenticationMode = BrokerAuthenticationMode.Plain)] string input,
             FunctionContext context)
         {
@@ -22,7 +22,7 @@ public static void Run([KafkaTrigger("LocalBroker", "stringTopicTenPartitions",
             logger.LogInformation(input);
 
             var message = $"Output message created at {DateTime.Now}";
-            context.OutputBindings["myOutput"] = message;
+            return message;
         }
     }
 }
diff --git a/samples/SampleApp/MultiOutput/MultiOutput.cs b/samples/SampleApp/MultiOutput/MultiOutput.cs
@@ -0,0 +1,45 @@
+﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net;
+using Microsoft.Azure.Functions.Worker;
+using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
+using Microsoft.Azure.Functions.Worker.Extensions.Http;
+using Microsoft.Azure.Functions.Worker.Extensions.Storage;
+using Microsoft.Azure.Functions.Worker.Http;
+
+namespace SampleApp
+{
+    /// <summary>
+    /// This class specifies output bindings in the properties of <see cref="MyOutputType"/>.
+    /// <see cref="MyOutputType"/> defines a Queue output binding, and an Http Response property.
+    /// By default, a property of type <see cref="HttpResponseData"/> in the return type of the function
+    /// is treated as an Http output binding. This property can be used to provide a response to the Http trigger.
+    /// </summary>
+    public static class MultiOutput
+    {
+        [Function("MultiOutput")]
+        public static MyOutputType Run([HttpTrigger(AuthorizationLevel.Anonymous, "get")] HttpRequestData req,
+            FunctionContext context)
+        {
+            var response = req.CreateResponse(HttpStatusCode.OK);
+            response.WriteString("Success!");
+
+            string myQueueOutput = "some output";
+
+            return new MyOutputType()
+            {
+                Name = myQueueOutput,
+                HttpReponse = response
+            };
+        }
+    }
+
+    public class MyOutputType
+    {
+        [QueueOutput("myQueue")]
+        public string Name { get; set; }
+
+        public HttpResponseData HttpReponse { get; set; }
+    }
+}
diff --git a/samples/SampleApp/Queue/QueueFunction.cs b/samples/SampleApp/Queue/QueueFunction.cs
@@ -11,8 +11,8 @@ namespace SampleApp
     public static class QueueFunction
     {
         [Function("QueueFunction")]
-        [QueueOutput("functionstesting2", Connection = "AzureWebJobsStorage")]
-        public static string Run([QueueTrigger("functionstesting2", Connection = "AzureWebJobsStorage")] Book myQueueItem,
+        [QueueOutput("functionstesting2")]
+        public static string Run([QueueTrigger("functionstesting2")] Book myQueueItem,
             FunctionContext context)
         {
             var logger = context.GetLogger("QueueFunction");
diff --git a/samples/SampleApp/RabbitMQ/RabbitMQFunction.cs b/samples/SampleApp/RabbitMQ/RabbitMQFunction.cs
@@ -12,16 +12,16 @@ namespace SampleApp
     public static class RabbitMQFunction
     {
         [Function("RabbitMQFunction")]
-        [RabbitMQOutput("rabbitOutput", QueueName = "destinationQueue", ConnectionStringSetting = "rabbitMQConnectionAppSetting")]
-        public static void Run([RabbitMQTrigger("queue", ConnectionStringSetting = "rabbitMQConnectionAppSetting")] string item,
+        [RabbitMQOutput(QueueName = "destinationQueue", ConnectionStringSetting = "rabbitMQConnectionAppSetting")]
+        public static string Run([RabbitMQTrigger("queue", ConnectionStringSetting = "rabbitMQConnectionAppSetting")] string item,
             FunctionContext context)
         {
             var logger = context.GetLogger("RabbitMQFunction");
 
             logger.LogInformation(item);
 
             var message = $"Output message created at {DateTime.Now}";
-            context.OutputBindings["rabbitOutput"] = message;
+            return message;
         }
     }
 }
diff --git a/samples/SampleApp/ServiceBus/ServiceBusFunction.cs b/samples/SampleApp/ServiceBus/ServiceBusFunction.cs
@@ -12,16 +12,16 @@ namespace SampleApp
     public static class ServiceBusFunction
     {
         [Function("ServiceBusFunction")]
-        [ServiceBusOutput("output", "outputQueue", Connection = "ServiceBusConnection")]
-        public static void Run([ServiceBusTrigger("queue", Connection = "ServiceBusConnection")] string item,
+        [ServiceBusOutput("outputQueue", Connection = "ServiceBusConnection")]
+        public static string Run([ServiceBusTrigger("queue", Connection = "ServiceBusConnection")] string item,
             FunctionContext context)
         {
             var logger = context.GetLogger("ServiceBusFunction");
 
             logger.LogInformation(item);
 
             var message = $"Output message created at {DateTime.Now}";
-            context.OutputBindings["output"] = message;
+            return message;
         }
     }
 }
diff --git a/samples/SampleApp/SignalR/SignalRFunction.cs b/samples/SampleApp/SignalR/SignalRFunction.cs
@@ -12,8 +12,8 @@ namespace SampleApp
     public static class SignalRFunction
     {
         [Function("SignalRFunction")]
-        [SignalROutput("output", HubName = "chat", ConnectionStringSetting = "SignalRConnectionString")]
-        public static void Run([SignalRTrigger("SignalRTest", "messages", "SendMessage", parameterNames: new string[] { "message" },
+        [SignalROutput(HubName = "chat", ConnectionStringSetting = "SignalRConnectionString")]
+        public static MyMessage Run([SignalRTrigger("SignalRTest", "messages", "SendMessage", parameterNames: new string[] { "message" },
             ConnectionStringSetting = "SignalRConnectionString")] string item,
             [SignalRConnectionInfoInput(HubName = "chat")] MyConnectionInfo connectionInfo,
             FunctionContext context)
@@ -24,7 +24,8 @@ public static class SignalRFunction
             logger.LogInformation($"Connection URL = {connectionInfo.Url}");
 
             var message = $"Output message created at {DateTime.Now}";
-            context.OutputBindings["output"] = new MyMessage()
+
+            return new MyMessage()
             {
                 Target = "newMessage",
                 Arguments = new[] { message }
diff --git a/samples/SampleApp/Table/TableFunction.cs b/samples/SampleApp/Table/TableFunction.cs

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,5 @@ public abstract class OutputBindingAttribute : BindingAttribute`
`11`	`11`	`public OutputBindingAttribute()`
`12`	`12`	`{`
`13`	`13`	`}`
`14`		`-`
`15`		`- public OutputBindingAttribute(string name)`
`16`		`- {`
`17`		`- Name = name;`
`18`		`- }`
`19`		`-`
`20`		`- public string? Name { get; }`
`21`	`14`	`}`
`22`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,7 @@ public sealed class EventGridOutputAttribute : OutputBindingAttribute`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Initialize a new instance of the <see cref="EventGridOutputAttribute"/>`
`12`	`12`	`/// </summary>`
`13`		`- /// <param name="name">The name of the output binding property to bind.</param>`
`14`		`- public EventGridOutputAttribute(string name) : base(name)`
	`13`	`+ public EventGridOutputAttribute()`
`15`	`14`	`{`
`16`	`15`	`}`
`17`	`16`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) .NET Foundation. All rights reserved.`
	`1`	`+// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;`
`@@ -10,8 +10,7 @@ public sealed class RabbitMQOutputAttribute : OutputBindingAttribute`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Initializes a new instance of the <see cref="RabbitMQOutputAttribute"/> class.`
`12`	`12`	`/// </summary>`
`13`		`- /// <param name="name">The name of the output binding property to bind.</param>`
`14`		`- public RabbitMQOutputAttribute(string name) : base(name)`
	`13`	`+ public RabbitMQOutputAttribute()`
`15`	`14`	`{`
`16`	`15`	`}`
`17`	`16`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@ namespace SampleApp`
`11`	`11`	`public static class BlobFunction`
`12`	`12`	`{`
`13`	`13`	`[Function("BlobFunction")]`
`14`		`- [BlobOutput("test-samples-output/{name}-output.txt", Connection = "AzureWebJobsStorage")]`
	`14`	`+ [BlobOutput("test-samples-output/{name}-output.txt")]`
`15`	`15`	`public static string Run(`
`16`		`- [BlobTrigger("test-samples-trigger/{name}", Connection = "AzureWebJobsStorage")] string myTriggerItem,`
`17`		`- [BlobInput("test-samples-input/sample1.txt", Connection = "AzureWebJobsStorage")] string myBlob,`
	`16`	`+ [BlobTrigger("test-samples-trigger/{name}")] string myTriggerItem,`
	`17`	`+ [BlobInput("test-samples-input/sample1.txt")] string myBlob,`
`18`	`18`	`FunctionContext context)`
`19`	`19`	`{`
`20`	`20`	`var logger = context.GetLogger("BlobFunction");`