Skip to content

Commit 7aac03f

Browse files
committed
Updated commands to enable reading from CSDL url for both transform and show commands
1 parent a7c4983 commit 7aac03f

File tree

5 files changed

+254
-146
lines changed

5 files changed

+254
-146
lines changed

src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ internal class ShowCommandHandler : ICommandHandler
1616
public Option<string> DescriptionOption { get; set; }
1717
public Option<FileInfo> OutputOption { get; set; }
1818
public Option<LogLevel> LogLevelOption { get; set; }
19+
public Option<string> CsdlOption { get; set; }
20+
public Option<string> CsdlFilterOption { get; set; }
21+
1922

2023
public int Invoke(InvocationContext context)
2124
{
@@ -26,13 +29,15 @@ public async Task<int> InvokeAsync(InvocationContext context)
2629
string openapi = context.ParseResult.GetValueForOption(DescriptionOption);
2730
FileInfo output = context.ParseResult.GetValueForOption(OutputOption);
2831
LogLevel logLevel = context.ParseResult.GetValueForOption(LogLevelOption);
32+
string csdlFilter = context.ParseResult.GetValueForOption(CsdlFilterOption);
33+
string csdl = context.ParseResult.GetValueForOption(CsdlOption);
2934
CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetService(typeof(CancellationToken));
3035

3136
using var loggerFactory = Logger.ConfigureLogger(logLevel);
3237
var logger = loggerFactory.CreateLogger<OpenApiService>();
3338
try
3439
{
35-
await OpenApiService.ShowOpenApiDocument(openapi, output, logLevel, cancellationToken);
40+
await OpenApiService.ShowOpenApiDocument(openapi, csdl, csdlFilter, output, logger, cancellationToken);
3641

3742
return 0;
3843
}

src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public async Task<int> InvokeAsync(InvocationContext context)
5757
var logger = loggerFactory.CreateLogger<OpenApiService>();
5858
try
5959
{
60-
await OpenApiService.TransformOpenApiDocument(openapi, csdl, csdlFilter, output, cleanOutput, version, format, terseOutput, settingsFile, logLevel, inlineLocal, inlineExternal, filterbyoperationids, filterbytags, filterbycollection, cancellationToken);
60+
await OpenApiService.TransformOpenApiDocument(openapi, csdl, csdlFilter, output, cleanOutput, version, format, terseOutput, settingsFile, inlineLocal, inlineExternal, filterbyoperationids, filterbytags, filterbycollection, logger, cancellationToken);
6161

6262
return 0;
6363
}

src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public async Task<int> InvokeAsync(InvocationContext context)
3030
var logger = loggerFactory.CreateLogger<OpenApiService>();
3131
try
3232
{
33-
await OpenApiService.ValidateOpenApiDocument(openapi, logLevel, cancellationToken);
33+
await OpenApiService.ValidateOpenApiDocument(openapi, logger, cancellationToken);
3434
return 0;
3535
}
3636
catch (Exception ex)

0 commit comments

Comments
 (0)