Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AWPS_Function] Fix parameter AutorResolve under WebPubSubTrigger. #22358

Merged
2 commits merged into from
Jul 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void Initialize(ExtensionConfigContext context)

// Trigger binding
context.AddBindingRule<WebPubSubTriggerAttribute>()
.BindToTrigger(new WebPubSubTriggerBindingProvider(_dispatcher, _options, webhookException));
.BindToTrigger(new WebPubSubTriggerBindingProvider(_dispatcher, _nameResolver, _options, webhookException));

var webpubsubConnectionAttributeRule = context.AddBindingRule<WebPubSubConnectionAttribute>();
webpubsubConnectionAttributeRule.AddValidator(ValidateWebPubSubConnectionAttributeBinding);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;

using Microsoft.Azure.WebJobs.Host.Bindings;
using Microsoft.Azure.WebJobs.Host.Listeners;
using Microsoft.Azure.WebJobs.Host.Protocols;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,22 @@
using System;
using System.Reflection;
using System.Threading.Tasks;

using Microsoft.Azure.WebJobs.Host;
using Microsoft.Azure.WebJobs.Host.Triggers;

namespace Microsoft.Azure.WebJobs.Extensions.WebPubSub
{
internal class WebPubSubTriggerBindingProvider : ITriggerBindingProvider
{
private readonly IWebPubSubTriggerDispatcher _dispatcher;
private readonly INameResolver _nameResolver;
private readonly WebPubSubOptions _options;
private readonly Exception _webhookException;

public WebPubSubTriggerBindingProvider(IWebPubSubTriggerDispatcher dispatcher, WebPubSubOptions options, Exception webhookException)
public WebPubSubTriggerBindingProvider(IWebPubSubTriggerDispatcher dispatcher, INameResolver nameResolver, WebPubSubOptions options, Exception webhookException)
{
_dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
_nameResolver = nameResolver ?? throw new ArgumentNullException(nameof(nameResolver));
_options = options ?? throw new ArgumentNullException(nameof(options));
_webhookException = webhookException;
}
Expand All @@ -41,7 +43,25 @@ public Task<ITriggerBinding> TryCreateAsync(TriggerBindingProviderContext contex
throw new NotSupportedException($"WebPubSubTrigger is disabled due to 'AzureWebJobsStorage' connection string is not set or invalid. {_webhookException}");
}

return Task.FromResult<ITriggerBinding>(new WebPubSubTriggerBinding(parameterInfo, attribute, _options, _dispatcher));
return Task.FromResult<ITriggerBinding>(new WebPubSubTriggerBinding(parameterInfo, GetResolvedAttribute(attribute), _options, _dispatcher));
}

internal WebPubSubTriggerAttribute GetResolvedAttribute(WebPubSubTriggerAttribute attribute)
{
// Try resolve and throw exception if not able to find one.
if (!_nameResolver.TryResolveWholeString(attribute.Hub, out var hub))
{
throw new ArgumentException($"Failed to resolve substitute configure: {attribute.Hub}, please add.");
}
if (!_nameResolver.TryResolveWholeString(attribute.EventName, out var eventName))
{
throw new ArgumentException($"Failed to resolve substitute configure: {attribute.EventName}, please add.");
}

return new WebPubSubTriggerAttribute(
hub,
attribute.EventType,
eventName);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
// 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.Threading;
using System.Threading.Tasks;
using Microsoft.Azure.WebJobs.Host.Triggers;
using Microsoft.Extensions.Configuration;
using Moq;
using NUnit.Framework;

namespace Microsoft.Azure.WebJobs.Extensions.WebPubSub.Tests
{
public class WebPubSubTriggerBindingProviderTests
{
private readonly WebPubSubTriggerBindingProvider _provider;
private readonly IConfiguration _configuration;

private const string TestHub = "test_hub";

public WebPubSubTriggerBindingProviderTests()
{
_configuration = new ConfigurationBuilder()
.AddEnvironmentVariables()
.AddInMemoryCollection()
.Build();
_configuration["testhub"] = TestHub;
var resolver = new DefaultNameResolver(_configuration);
var mockDispater = new Mock<IWebPubSubTriggerDispatcher>(MockBehavior.Strict);
var config = new WebPubSubOptions();
_provider = new WebPubSubTriggerBindingProvider(mockDispater.Object, resolver, config, null);
}

[TestCase]
public void ResolveTriggerAttributeTest()
{
var attribute = new WebPubSubTriggerAttribute("%testhub%", WebPubSubEventType.System, "testevent");
var resolvedAttr = _provider.GetResolvedAttribute(attribute);
Assert.AreEqual(resolvedAttr.Hub, TestHub);
Assert.AreEqual(resolvedAttr.EventName, "testevent");
}

[TestCase]
public void DefaultTriggerAttributeTest()
{
var attribute = new WebPubSubTriggerAttribute("defaulthub", WebPubSubEventType.System, "testevent");
var resolvedAttr = _provider.GetResolvedAttribute(attribute);
Assert.AreEqual(resolvedAttr.Hub, "defaulthub");
Assert.AreEqual(resolvedAttr.EventName, "testevent");
}

[TestCase]
public void ResolveTriggerAttributeTest_NotConfigureThrows()
{
var attribute = new WebPubSubTriggerAttribute("%nullhub%", WebPubSubEventType.System, "testevent");
Assert.Throws<ArgumentException>(() => _provider.GetResolvedAttribute(attribute),
"Failed to resolve substitute configure: %nullhub%, please add.");
}

[TestCase]
public async Task TestCreateAsyncTests()
{
var parameter = GetType().GetMethod("TestFunc").GetParameters()[0];
var context = new TriggerBindingProviderContext(parameter, CancellationToken.None);
var binding = await _provider.TryCreateAsync(context);

Assert.NotNull(binding);
}

public static void TestFunc(
[WebPubSubTrigger("%testhub%", WebPubSubEventType.System, "testevent")]ConnectionContext context)
{
}
}
}