Skip to content

Validate scopes in OpenApiDocumentProvider tests and fix scope #58307

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

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Validate scopes in OpenApiDocumentProvider tests and fix scope #58307

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e882501
Validate scopes in OpenApiDocumentProvider tests and fix scope
captainsafia Oct 8, 2024
aa68576
Use IOptionsMonitor to resolve OpenApiOptions
captainsafia Oct 9, 2024
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
4 changes: 3 additions & 1 deletion src/OpenApi/src/Services/OpenApiDocumentProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ internal sealed class OpenApiDocumentProvider(IServiceProvider serviceProvider)
/// <param name="writer">A text writer associated with the document to write to.</param>
public async Task GenerateAsync(string documentName, TextWriter writer)
{
var optionsSnapshot = serviceProvider.GetRequiredService<IOptionsSnapshot<OpenApiOptions>>();
// Resolving IOptionsSnapshot requires a scoped service provider.
using var scopedService = serviceProvider.CreateScope();
var optionsSnapshot = scopedService.ServiceProvider.GetRequiredService<IOptionsSnapshot<OpenApiOptions>>();
var namedOption = optionsSnapshot.Get(documentName);
var resolvedOpenApiVersion = namedOption.OpenApiVersion;
await GenerateAsync(documentName, writer, resolvedOpenApiVersion);
Expand Down
2 changes: 1 addition & 1 deletion src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private static IServiceProvider CreateServiceProvider(string[] documentNames)
{
serviceCollection.AddOpenApi(documentName);
}
var serviceProvider = serviceCollection.BuildServiceProvider();
var serviceProvider = serviceCollection.BuildServiceProvider(validateScopes: true);
return serviceProvider;
}
}
Loading