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.

Sign up for GitHub

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

Adding check for dotnet-isolated app with extension bundle configured #9466

Merged
merged 4 commits into from
Aug 16, 2023
Merged

Adding check for dotnet-isolated app with extension bundle configured #9466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b19cdf1
Adding check for Dotnet isolated app
surgupta-msft Aug 14, 2023
65e8fed
Ading null check on worker config
surgupta-msft Aug 15, 2023
04acbd3
Added test for dotnet isolated
surgupta-msft Aug 15, 2023
0711fa9
minor cleanup
surgupta-msft Aug 15, 2023
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
14 changes: 13 additions & 1 deletion src/WebJobs.Script/DependencyInjection/ScriptStartupTypeLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ public async Task<IEnumerable<Type>> GetExtensionsStartupTypesAsync()
}
}

bool isDotnetApp = isPrecompiledFunctionApp || IsDotnetIsolatedApp(workerConfigs);
surgupta-msft marked this conversation as resolved.
Show resolved Hide resolved

if (SystemEnvironment.Instance.IsPlaceholderModeEnabled())
{
// Do not move this.
Expand All @@ -112,7 +114,7 @@ public async Task<IEnumerable<Type>> GetExtensionsStartupTypesAsync()

string baseProbingPath = null;

if (bundleConfigured && (!isPrecompiledFunctionApp || isLegacyExtensionBundle))
if (bundleConfigured && (!isDotnetApp || isLegacyExtensionBundle))
{
extensionsMetadataPath = await _extensionBundleManager.GetExtensionBundleBinPathAsync();
if (string.IsNullOrEmpty(extensionsMetadataPath))
Expand Down Expand Up @@ -331,6 +333,16 @@ void CollectError(Type extensionType, Version minimumVersion, ExtensionStartupTy
}
}

private bool IsDotnetIsolatedApp(IList<RpcWorkerConfig> workerConfigs)
{
if (workerConfigs != null)
{
return workerConfigs.Where(config => config.Description is not null && config.Description.Language == RpcWorkerConstants.DotNetIsolatedLanguageWorkerName).Any();
}

return false;
}

private class TypeNameEqualityComparer : IEqualityComparer<Type>
{
public bool Equals(Type x, Type y)
Expand Down
44 changes: 44 additions & 0 deletions test/WebJobs.Script.Tests/ScriptStartupTypeDiscovererTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,50 @@ public async Task GetExtensionsStartupTypes_LegacyBundles_UsesExtensionBundleBin
}
}

[Fact]
public async Task GetExtensionsStartupTypes_DotnetIsolated_ExtensionBundleConfigured()
{
using (var directory = GetTempDirectory())
{
var binPath = Path.Combine(directory.Path, "bin");
TestMetricsLogger testMetricsLogger = new TestMetricsLogger();
TestLoggerProvider testLoggerProvider = new TestLoggerProvider();
LoggerFactory factory = new LoggerFactory();
factory.AddProvider(testLoggerProvider);
var testLogger = factory.CreateLogger<ScriptStartupTypeLocator>();

var mockExtensionBundleManager = new Mock<IExtensionBundleManager>();
mockExtensionBundleManager.Setup(e => e.IsExtensionBundleConfigured()).Returns(true);
mockExtensionBundleManager.Setup(e => e.GetExtensionBundleBinPathAsync()).Returns(Task.FromResult(binPath));
mockExtensionBundleManager.Setup(e => e.IsLegacyExtensionBundle()).Returns(false);
mockExtensionBundleManager.Setup(e => e.GetExtensionBundleDetails()).Returns(Task.FromResult(GetV2BundleDetails()));

RpcWorkerConfig workerConfig = new RpcWorkerConfig() { Description = TestHelpers.GetTestWorkerDescription("dotnet-isolated", "none", true) };
var tempOptions = new LanguageWorkerOptions();
tempOptions.WorkerConfigs = new List<RpcWorkerConfig>();
tempOptions.WorkerConfigs.Add(workerConfig);
var optionsMonitor = new TestOptionsMonitor<LanguageWorkerOptions>(tempOptions);
var mockFunctionMetadataManager = GetTestFunctionMetadataManager(optionsMonitor);

var languageWorkerOptions = new TestOptionsMonitor<LanguageWorkerOptions>(tempOptions);
Environment.SetEnvironmentVariable(EnvironmentSettingNames.FunctionWorkerRuntime, "dotnet-isolated");

var discoverer = new ScriptStartupTypeLocator(directory.Path, testLogger, mockExtensionBundleManager.Object, mockFunctionMetadataManager, testMetricsLogger, languageWorkerOptions);

// Act
var types = await discoverer.GetExtensionsStartupTypesAsync();

//Assert
var traces = testLoggerProvider.GetAllLogMessages();
var expectedTrace = traces.FirstOrDefault(val => val.EventId.Name.Equals("ScriptStartNotLoadingExtensionBundle"));
Assert.NotNull(expectedTrace);

AreExpectedMetricsGenerated(testMetricsLogger);
Assert.Single(types);
Assert.Equal(typeof(AzureStorageWebJobsStartup).FullName, types.Single().FullName);
}
}

[Theory]
[InlineData(false)]
[InlineData(true)]
Expand Down