Skip to content

Set workspace baseUrl when creating a workspace #1849

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 4 commits into from
Oct 2, 2024
Merged

Set workspace baseUrl when creating a workspace #1849

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f04d45e
se workspace baseUrl to settings.BaseUrl
MaggieKimani1 Oct 1, 2024
5046131
Use current working directory to resolve file path
MaggieKimani1 Oct 1, 2024
e85e478
Clean up
MaggieKimani1 Oct 1, 2024
c3fac4e
Use ternary operator
MaggieKimani1 Oct 1, 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
3 changes: 2 additions & 1 deletion src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ private JsonNode LoadJsonNodes(TextReader input)
private async Task<OpenApiDiagnostic> LoadExternalRefs(OpenApiDocument document, CancellationToken cancellationToken, OpenApiReaderSettings settings, string format = null)
{
// Create workspace for all documents to live in.
var openApiWorkSpace = new OpenApiWorkspace();
var baseUrl = settings.BaseUrl ?? new Uri(OpenApiConstants.BaseRegistryUri);
var openApiWorkSpace = new OpenApiWorkspace(baseUrl);

// Load this root document into the workspace
var streamLoader = new DefaultStreamLoader(settings.BaseUrl);
Expand Down
11 changes: 10 additions & 1 deletion src/Microsoft.OpenApi/Reader/Services/DefaultStreamLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,16 @@
/// <exception cref="ArgumentException"></exception>
public async Task<Stream> LoadAsync(Uri uri)
{
var absoluteUri = new Uri(baseUrl, uri);
Uri absoluteUri;
if (baseUrl.Equals(OpenApiConstants.BaseRegistryUri))
{
// use current working directory
absoluteUri = new Uri(Directory.GetCurrentDirectory() + uri);
}
else
{
absoluteUri = new Uri(baseUrl, uri);
}

switch (absoluteUri.Scheme)
{
Expand Down
Loading