enable credential based authentication

src/ManualTests.HostV4/HttpSender.cs

@@ -6,15 +6,8 @@
 using NServiceBus;
 
 
-class HttpSender
+class HttpSender(IFunctionEndpoint functionEndpoint)
 {
-    readonly IFunctionEndpoint functionEndpoint;
-
-    public HttpSender(IFunctionEndpoint functionEndpoint)
-    {
-        this.functionEndpoint = functionEndpoint;
-    }
-
     [Function("HttpSenderV4")]
     public async Task<HttpResponseData> Run(
         [HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = null)] HttpRequestData req,

src/ManualTests.HostV4/ManualTests.HostV4.csproj

@@ -8,6 +8,8 @@
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>
 
+  <Import Project="..\NServiceBus.AzureFunctions.Worker.ServiceBus\NServiceBus.AzureFunctions.Worker.ServiceBus.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\NServiceBus.AzureFunctions.Worker.Analyzer\NServiceBus.AzureFunctions.Worker.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\NServiceBus.AzureFunctions.Worker.ServiceBus\NServiceBus.AzureFunctions.Worker.ServiceBus.csproj" />
@@ -16,6 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.22.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.18.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.2" />
     <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="4.0.1" />
   </ItemGroup>

src/ManualTests.HostV4/Program.cs

@@ -3,20 +3,13 @@
 
 [assembly: NServiceBusTriggerFunction("FunctionsTestEndpoint2", TriggerFunctionName = "MyFunctionName")]
 
-public class Program
-{
-    public static void Main()
+var host = new HostBuilder()
+    .ConfigureFunctionsWorkerDefaults()
+    .UseNServiceBus(c =>
     {
-        var host = new HostBuilder()
-            .ConfigureFunctionsWorkerDefaults()
-            .UseNServiceBus(c =>
-            {
-                c.Routing.RouteToEndpoint(typeof(TriggerMessage), "some-queue");
-                c.AdvancedConfiguration.EnableInstallers();
-            })
-            .Build();
+        c.Routing.RouteToEndpoint(typeof(TriggerMessage), "FunctionsTestEndpoint2");
+        c.AdvancedConfiguration.EnableInstallers();
+    })
+    .Build();
 
-        host.Run();
-    }
-
-}
+host.Run();

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/ApprovalFiles/SourceGeneratorApprovals.Can_override_trigger_function_name.approved.txt

@@ -4,16 +4,16 @@ using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker;
 using NServiceBus;
 
+[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
 public class FunctionEndpointTrigger
 {
-    IFunctionEndpoint endpoint;
+        readonly IFunctionEndpoint endpoint;
 
         public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
         {
             this.endpoint = endpoint;
         }
 
-
         [Function("trigger")]
         public async Task Run(
             [ServiceBusTrigger("endpoint")] byte[] messageBody,

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/ApprovalFiles/SourceGeneratorApprovals.Can_supply_connection_name.approved.txt

@@ -0,0 +1,29 @@
+// <autogenerated/>
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Azure.Functions.Worker;
+using NServiceBus;
+
+[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+public class FunctionEndpointTrigger
+{
+        readonly IFunctionEndpoint endpoint;
+
+        public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
+        {
+            this.endpoint = endpoint;
+        }
+
+        [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
+        public async Task Run(
+            [ServiceBusTrigger("endpoint", Connection="FooBar")] byte[] messageBody,
+            IDictionary<string, object> userProperties,
+            string messageId,
+            int deliveryCount,
+            string correlationId,
+            FunctionContext context,
+            string replyTo = null)
+        {
+            await endpoint.Process(messageBody, userProperties, messageId, deliveryCount, replyTo, correlationId, context);
+        }
+}

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/ApprovalFiles/SourceGeneratorApprovals.NameIsStringValue.approved.txt

@@ -4,16 +4,16 @@ using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker;
 using NServiceBus;
 
+[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
 public class FunctionEndpointTrigger
 {
-    IFunctionEndpoint endpoint;
+        readonly IFunctionEndpoint endpoint;
 
         public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
         {
             this.endpoint = endpoint;
         }
 
-
         [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
         public async Task Run(
             [ServiceBusTrigger("endpoint")] byte[] messageBody,

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/ApprovalFiles/SourceGeneratorApprovals.UsingFullyQualifiedAttributeName.approved.txt

@@ -4,16 +4,16 @@ using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker;
 using NServiceBus;
 
+[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
 public class FunctionEndpointTrigger
 {
-    IFunctionEndpoint endpoint;
+        readonly IFunctionEndpoint endpoint;
 
         public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
         {
             this.endpoint = endpoint;
         }
 
-
         [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
         public async Task Run(
             [ServiceBusTrigger("endpoint")] byte[] messageBody,

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/ApprovalFiles/SourceGeneratorApprovals.UsingNamespace.approved.txt

@@ -4,16 +4,16 @@ using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker;
 using NServiceBus;
 
+[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
 public class FunctionEndpointTrigger
 {
-    IFunctionEndpoint endpoint;
+        readonly IFunctionEndpoint endpoint;
 
         public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
         {
             this.endpoint = endpoint;
         }
 
-
         [Function("NServiceBusFunctionEndpointTrigger-endpoint")]
         public async Task Run(
             [ServiceBusTrigger("endpoint")] byte[] messageBody,

src/NServiceBus.AzureFunctions.Worker.Analyzer.Tests/SourceGeneratorApprovals.cs

@@ -168,6 +168,22 @@ public void Invalid_trigger_function_name_should_cause_an_error()
             Assert.True(diagnostics.Any(d => d.Severity == DiagnosticSeverity.Error && d.Id == AzureFunctionsDiagnostics.InvalidTriggerFunctionNameErrorId));
         }
 
+        [Test]
+        public void Can_supply_connection_name()
+        {
+            var source =
+                @"using NServiceBus;
+
+[assembly: NServiceBusTriggerFunction(""endpoint"", Connection = ""FooBar"")]
+
+public class Startup
+{
+}";
+            var (output, _) = GetGeneratedOutput(source);
+
+            Approver.Verify(output);
+        }
+
         [OneTimeSetUp]
         public void Init()
         {

src/NServiceBus.AzureFunctions.Worker.Analyzer/TriggerFunctionGenerator.cs

@@ -1,5 +1,6 @@
 namespace NServiceBus.AzureFunctions.Worker.Analyzer
 {
+    using System.Linq;
     using System.Text;
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -17,6 +18,7 @@ class SyntaxReceiver : ISyntaxContextReceiver
         {
             internal string endpointName;
             internal string triggerFunctionName;
+            internal string connection;
             internal bool attributeFound;
             internal bool isInvalidBindingExpression = false;
 
@@ -42,8 +44,17 @@ public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
                         return;
                     }
 
-                    // 2nd parameter was triggerFunctionName
-                    triggerFunctionName = AttributeParameterAtPosition(1);
+                    var triggerFunctionNameAttribute = attributeSyntax.ArgumentList.Arguments.FirstOrDefault(arg => arg.GetFirstToken().ValueText == "TriggerFunctionName");
+                    if (triggerFunctionNameAttribute != null)
+                    {
+                        triggerFunctionName = context.SemanticModel.GetConstantValue(triggerFunctionNameAttribute.Expression).Value?.ToString();
+                    }
+
+                    var connectionAttribute = attributeSyntax.ArgumentList.Arguments.FirstOrDefault(arg => arg.GetFirstToken().ValueText == "Connection");
+                    if (connectionAttribute != null)
+                    {
+                        connection = context.SemanticModel.GetConstantValue(connectionAttribute.Expression).Value?.ToString();
+                    }
                 }
 
                 bool IsNServiceBusEndpointNameAttribute(string value) => value?.Equals("NServiceBus.NServiceBusTriggerFunctionAttribute") ?? false;
@@ -88,26 +99,29 @@ public void Execute(GeneratorExecutionContext context)
                 return;
             }
 
+            var connectionParam = string.IsNullOrWhiteSpace(syntaxReceiver.connection)
+                ? ""
+                : $", Connection=\"{syntaxReceiver.connection}\"";
             var source =
 $@"// <autogenerated/>
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker;
 using NServiceBus;
 
+[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
 public class FunctionEndpointTrigger
 {{
-    IFunctionEndpoint endpoint;
+        readonly IFunctionEndpoint endpoint;
 
         public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
         {{
             this.endpoint = endpoint;
         }}
 
-
         [Function(""{syntaxReceiver.triggerFunctionName}"")]
         public async Task Run(
-            [ServiceBusTrigger(""{syntaxReceiver.endpointName}"")] byte[] messageBody,
+            [ServiceBusTrigger(""{syntaxReceiver.endpointName}""{connectionParam})] byte[] messageBody,
             IDictionary<string, object> userProperties,
             string messageId,
             int deliveryCount,

src/NServiceBus.AzureFunctions.Worker.ServiceBus.Tests/ApprovalFiles/APIApprovals.Approve.approved.txt

@@ -45,6 +45,7 @@ namespace NServiceBus
     public sealed class NServiceBusTriggerFunctionAttribute : System.Attribute
     {
         public NServiceBusTriggerFunctionAttribute(string endpointName) { }
+        public string Connection { get; set; }
         public string EndpointName { get; }
         public string TriggerFunctionName { get; set; }
     }

src/NServiceBus.AzureFunctions.Worker.ServiceBus.Tests/DefaultEndpoint.cs

@@ -6,6 +6,7 @@
     using NServiceBus;
     using NServiceBus.AcceptanceTesting.Customization;
     using NServiceBus.AcceptanceTesting.Support;
+    using NServiceBus.AzureFunctions.Worker.ServiceBus;
 
     class DefaultEndpoint : IEndpointSetupTemplate
     {
@@ -27,7 +28,7 @@ public async Task<EndpointConfiguration> GetConfiguration(
             recoverability.Immediate(immediate => immediate.NumberOfRetries(0));
             configuration.SendFailedMessagesTo("error");
 
-            var connectionString = Environment.GetEnvironmentVariable(ServiceBusTriggeredEndpointConfiguration.DefaultServiceBusConnectionName);
+            var connectionString = Environment.GetEnvironmentVariable(ServerlessTransport.DefaultServiceBusConnectionName);
             var azureServiceBusTransport = new AzureServiceBusTransport(connectionString)
             {
                 SubscriptionRuleNamingConvention = type =>

src/NServiceBus.AzureFunctions.Worker.ServiceBus.Tests/FakeFunctionContext.cs

@@ -3,19 +3,10 @@
     using System;
     using System.Collections.Generic;
     using Microsoft.Azure.Functions.Worker;
-    using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Logging;
 
     sealed class FakeFunctionContext : FunctionContext
     {
-        public FakeFunctionContext()
-        {
-            var sc = new ServiceCollection();
-            sc.AddSingleton<ILoggerFactory>(new TestLoggingFactory());
-
-            InstanceServices = sc.BuildServiceProvider();
-        }
-
         public override string InvocationId { get; }
         public override string FunctionId { get; }
         public override TraceContext TraceContext { get; }
@@ -35,10 +26,7 @@ public void Dispose()
         {
         }
 
-        public ILogger CreateLogger(string categoryName)
-        {
-            return new DummyLogger();
-        }
+        public ILogger CreateLogger(string categoryName) => new DummyLogger();
 
         public void AddProvider(ILoggerProvider provider)
         {