Queue storage extension support for QueueMessage & BinaryData

DotNetWorker.sln

@@ -70,7 +70,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Worker.Extensions.Kafka", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sdk.Analyzers", "sdk\Sdk.Analyzers\Sdk.Analyzers.csproj", "{055D602D-D2B3-416B-AC59-1972D832032A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sdk.Analyzers.Tests", "test\Sdk.Analyzers.Tests\Sdk.Analyzers.Tests\Sdk.Analyzers.Tests.csproj", "{A75EA1E1-2801-460C-87C0-DE6A82D30851}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sdk.Analyzers.Tests", "test\Sdk.Analyzers.Tests\Sdk.Analyzers.Tests.csproj", "{A75EA1E1-2801-460C-87C0-DE6A82D30851}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{083592CA-7DAB-44CE-8979-44FAFA46AEC3}"
 EndProject
@@ -119,6 +119,8 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Worker.Extensions.Shared", "extensions\Worker.Extensions.Shared\Worker.Extensions.Shared.csproj", "{277D77B9-8915-41E3-8763-0B66328ADDDA}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkerBindingSamples", "samples\WorkerBindingSamples\WorkerBindingSamples.csproj", "{901DA3C3-3ABA-4859-89D3-63343ED2A0AC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkerExtensionTests", "test\WorkerExtensionTests\WorkerExtensionTests.csproj", "{17BDCE12-6964-4B87-B2AC-68CE270A3E9A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -293,6 +295,10 @@ Global
 		{901DA3C3-3ABA-4859-89D3-63343ED2A0AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{901DA3C3-3ABA-4859-89D3-63343ED2A0AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{901DA3C3-3ABA-4859-89D3-63343ED2A0AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17BDCE12-6964-4B87-B2AC-68CE270A3E9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17BDCE12-6964-4B87-B2AC-68CE270A3E9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17BDCE12-6964-4B87-B2AC-68CE270A3E9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17BDCE12-6964-4B87-B2AC-68CE270A3E9A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -344,6 +350,7 @@ Global
 		{004DEF24-7EBB-499D-BD1C-E940AC4E122D} = {A7B4FF1E-3DF7-4F28-9333-D0961CDDF702}
 		{277D77B9-8915-41E3-8763-0B66328ADDDA} = {A7B4FF1E-3DF7-4F28-9333-D0961CDDF702}
 		{901DA3C3-3ABA-4859-89D3-63343ED2A0AC} = {9D6603BD-7EA2-4D11-A69C-0D9E01317FD6}
+		{17BDCE12-6964-4B87-B2AC-68CE270A3E9A} = {FD7243E4-BF18-43F8-8744-BA1D17ACF378}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {497D2ED4-A13E-4BCA-8D29-F30CA7D0EA4A}

build/pipelines/templates/extensions-variables.yml

@@ -1,10 +1,10 @@
- variables:
-    ${{ if not(contains(variables['Build.SourceBranch'], '/release/' )) }}:
-      buildNumberTemp: $(Build.BuildNumber)
-    ${{ if contains(variables['Build.SourceBranch'], '/release/' ) }}:
-      isReleaseBuildTemp: true
-    buildNumber: $[variables.buildNumberTemp]
-    isReleaseBuild: $[variables.isReleaseBuildTemp]
-    solution: '**/*.sln'
-    buildPlatform: 'Any CPU'
-    buildConfiguration: 'Release'
+variables:
+  ${{ if and( not(contains(variables['Build.SourceBranch'], '/release/')),  not(startsWith(variables['Build.SourceBranch'], 'refs/tags')) ) }}:
+    buildNumberTemp: $(Build.BuildNumber)
+  ${{ if or( contains(variables['Build.SourceBranch'], '/release/'), startsWith(variables['Build.SourceBranch'], 'refs/tags') ) }}:
+    isReleaseBuildTemp: true
+  buildNumber: $[variables.buildNumberTemp]
+  isReleaseBuild: $[variables.isReleaseBuildTemp]
+  solution: '**/*.sln'
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'

docs/analyzer-rules/AZFW0009.md

@@ -0,0 +1,26 @@
+# AZFW0009: Invalid use of SupportsDeferredBinding attribute
+
+| | Value |
+|-|-|
+| **Rule ID** |AZFW0009|
+| **Category** |[Usage]|
+| **Severity** |Error|
+
+## Cause
+
+This rule is triggered when the `SupportsDeferredBinding` attribute is used on any class other
+than an input (`InputBindingAttribute`) or trigger (`TriggerBindingAttribute`) binding based class.
+
+## Rule description
+
+The `SupportsDeferredBinding` attribute is used to determine if a binding supports deferred binding.
+Currently, this feature is only supported for input and trigger bindings. Output bindings are not supported
+and this attribute should not be used on any other class type.
+
+## How to fix violations
+
+Remove the use of the `SupportsDeferredBinding` attribute from your class.
+
+## When to suppress warnings
+
+This rule should not be suppressed because this error may prevent your Azure Functions from running.

extensions/Worker.Extensions.Abstractions/src/SupportsDeferredBindingAttribute.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.Azure.Functions.Worker.Extensions.Abstractions
+{
+    /// <summary>
+    /// Specifies if a converter supports deferred binding when generating function metadata.
+    /// This is to be used on converters that support deferred binding.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class)]
+    public class SupportsDeferredBindingAttribute : Attribute
+    {
+    }
+}

extensions/Worker.Extensions.Abstractions/src/Worker.Extensions.Abstractions.csproj

@@ -6,8 +6,9 @@
     <AssemblyName>Microsoft.Azure.Functions.Worker.Extensions.Abstractions</AssemblyName>
     <RootNamespace>Microsoft.Azure.Functions.Worker.Extensions.Abstractions</RootNamespace>
     <Description>Abstractions for Azure Functions .NET Worker</Description>
-    <MinorProductVersion>1</MinorProductVersion>
-    <PatchProductVersion>1</PatchProductVersion>
+    <MinorProductVersion>2</MinorProductVersion>
+    <PatchProductVersion>0</PatchProductVersion>
+    <VersionSuffix>-preview2</VersionSuffix>
   </PropertyGroup>
 
   <Import Project="..\..\..\build\Common.props" />

extensions/Worker.Extensions.CosmosDB/release_notes.md

@@ -7,3 +7,4 @@
 ### Microsoft.Azure.Functions.Worker.Extensions.CosmosDB <version>
 
 - Add `BindingCapabilities` attribute to CosmosDb trigger to express function-level retry capabilities. (#1457)
+- Update `Microsoft.Azure.Cosmos` to `3.34.0` (#1550)

extensions/Worker.Extensions.CosmosDB/src/Config/CosmosDBBindingOptions.cs

@@ -0,0 +1,52 @@
+// 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.Collections.Concurrent;
+using Azure.Core;
+using Microsoft.Azure.Cosmos;
+using Microsoft.Azure.Functions.Worker.Extensions.CosmosDB;
+
+namespace Microsoft.Azure.Functions.Worker
+{
+    internal class CosmosDBBindingOptions
+    {
+        public string? ConnectionString { get; set; }
+
+        public string? AccountEndpoint { get; set; }
+
+        public TokenCredential? Credential { get; set; }
+
+        internal string BuildCacheKey(string connectionString, string region) => $"{connectionString}|{region}";
+        internal ConcurrentDictionary<string, CosmosClient> ClientCache { get; } = new ConcurrentDictionary<string, CosmosClient>();
+
+        internal virtual CosmosClient GetClient(string connection, string preferredLocations = "")
+        {
+            if (string.IsNullOrEmpty(connection))
+            {
+                throw new ArgumentNullException(nameof(connection));
+            }
+
+            string cacheKey = BuildCacheKey(connection, preferredLocations);
+
+            CosmosClientOptions cosmosClientOptions = new ()
+            {
+                ConnectionMode = ConnectionMode.Gateway
+            };
+
+            if (!string.IsNullOrEmpty(preferredLocations))
+            {
+                cosmosClientOptions.ApplicationPreferredRegions = Utilities.ParsePreferredLocations(preferredLocations);
+            }
+
+            return ClientCache.GetOrAdd(cacheKey, (c) => CreateService(cosmosClientOptions));
+        }
+
+        private CosmosClient CreateService(CosmosClientOptions cosmosClientOptions)
+        {
+            return string.IsNullOrEmpty(ConnectionString)
+                    ? new CosmosClient(AccountEndpoint, Credential, cosmosClientOptions) // AAD auth
+                    : new CosmosClient(ConnectionString, cosmosClientOptions); // Connection string based auth
+        }
+    }
+}

extensions/Worker.Extensions.CosmosDB/src/Config/CosmosDBBindingOptionsSetup.cs

@@ -0,0 +1,56 @@
+// 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 Microsoft.Azure.Functions.Worker.Extensions;
+using Microsoft.Azure.Functions.Worker.Extensions.CosmosDB;
+using Microsoft.Extensions.Azure;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Azure.Functions.Worker
+{
+    internal class CosmosDBBindingOptionsSetup : IConfigureNamedOptions<CosmosDBBindingOptions>
+    {
+        private readonly IConfiguration _configuration;
+        private readonly AzureComponentFactory _componentFactory;
+
+        public CosmosDBBindingOptionsSetup(IConfiguration configuration, AzureComponentFactory componentFactory)
+        {
+            _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
+            _componentFactory = componentFactory ?? throw new ArgumentNullException(nameof(componentFactory));
+        }
+
+        public void Configure(CosmosDBBindingOptions options)
+        {
+            Configure(Options.DefaultName, options);
+        }
+
+        public void Configure(string name, CosmosDBBindingOptions options)
+        {
+            IConfigurationSection connectionSection = _configuration.GetWebJobsConnectionStringSection(name);
+
+            if (!connectionSection.Exists())
+            {
+                throw new InvalidOperationException($"Cosmos DB connection configuration '{name}' does not exist. " +
+                                                    "Make sure that it is a defined App Setting.");
+            }
+
+            if (!string.IsNullOrWhiteSpace(connectionSection.Value))
+            {
+                options.ConnectionString = connectionSection.Value;
+            }
+            else
+            {
+                options.AccountEndpoint = connectionSection[Constants.AccountEndpoint];
+                if (string.IsNullOrWhiteSpace(options.AccountEndpoint))
+                {
+                    throw new InvalidOperationException($"Connection should have an '{Constants.AccountEndpoint}' property or be a " +
+                        $"string representing a connection string.");
+                }
+
+                options.Credential = _componentFactory.CreateTokenCredential(connectionSection);
+            }
+        }
+    }
+}

extensions/Worker.Extensions.CosmosDB/src/Constants.cs

@@ -0,0 +1,15 @@
+
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+namespace Microsoft.Azure.Functions.Worker.Extensions.CosmosDB
+{
+    internal static class Constants
+    {
+        internal const string CosmosExtensionName = "CosmosDB";
+        internal const string ConfigurationSectionName = "AzureWebJobs";
+        internal const string ConnectionStringsSectionName = "ConnectionStrings";
+        internal const string AccountEndpoint = "accountEndpoint";
+        internal const string JsonContentType = "application/json";
+    }
+}