Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathieu Gamache committed Dec 21, 2023
1 parent 13e488c commit 215199f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
8 changes: 5 additions & 3 deletions src/Workleap.OpenApi.MSBuild/OasdiffManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,18 @@ public async Task RunOasdiffAsync(IEnumerable<string> openApiSpecFiles, IEnumera

foreach (var baseSpecFile in openApiSpecFiles)
{
this._loggerWrapper.LogMessage($"\n ******** Oasdiff: Diff comparison with {baseSpecFile} ********", MessageImportance.High);

var fileName = Path.GetFileName(baseSpecFile);
var generatedSpecFilePath = generatedOpenApiSpecFilesList.FirstOrDefault(x => x.Contains(fileName));
this._loggerWrapper.LogMessage($"\n ******** Oasdiff: Diff comparison with {fileName} ******** \n", MessageImportance.High);

var generatedSpecFilePath = generatedOpenApiSpecFilesList.FirstOrDefault(x => x.Contains(fileName));
if (generatedSpecFilePath == null)
{
this._loggerWrapper.LogWarning($"Could not find a generated spec file for {baseSpecFile}.");
continue;
}

this._loggerWrapper.LogMessage("- Specification file path: {0}", MessageImportance.High, baseSpecFile);
this._loggerWrapper.LogMessage("- Specification generated from code path: {0}", MessageImportance.High, generatedSpecFilePath);

var result = await this._processWrapper.RunProcessAsync(oasdiffExecutePath, new[] { "diff", baseSpecFile, generatedSpecFilePath, "--exclude-elements", "description,examples,title,summary", "-f", "text", "-o" }, cancellationToken);
this._loggerWrapper.LogMessage(result.StandardOutput, MessageImportance.High);
Expand Down
2 changes: 1 addition & 1 deletion src/Workleap.OpenApi.MSBuild/SpecGeneratorManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public SpecGeneratorManager(ILoggerWrapper loggerWrapper)
/// </summary>
public async Task UpdateSpecificationFilesAsync(IEnumerable<string> sourcedControlOpenApiSpecFiles, IEnumerable<string> generatedOpenApiSpecFiles, CancellationToken cancellationToken)
{
this._loggerWrapper.LogMessage("\n ******** Spec Generator: Starting updating specification files. ******** \n", MessageImportance.High);
this._loggerWrapper.LogMessage("\n ******** Specification Generator: Updating specification files. ******** \n", MessageImportance.High);

foreach (var baseSpecFile in sourcedControlOpenApiSpecFiles)
{
Expand Down
4 changes: 3 additions & 1 deletion src/Workleap.OpenApi.MSBuild/SpectralManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ public async Task RunSpectralAsync(IEnumerable<string> swaggerDocumentPaths, str
var outputSpectralReportName = $"spectral-{documentName}.html";
var htmlReportPath = Path.Combine(this._openApiReportsDirectoryPath, outputSpectralReportName);

this._loggerWrapper.LogMessage("\n ******** Spectral: Validating {0} against ruleset ********", MessageImportance.High, documentPath);
this._loggerWrapper.LogMessage("\n ******** Spectral: Validating {0} against ruleset ******** \n", MessageImportance.High, documentName);
this._loggerWrapper.LogMessage("- File path: {0}", MessageImportance.High, documentPath);
this._loggerWrapper.LogMessage("- Ruleset : {0}", MessageImportance.High, rulesetUrl);
File.Delete(htmlReportPath);
await this.GenerateSpectralReport(spectralExecutePath, documentPath, rulesetUrl, htmlReportPath, cancellationToken);
this._loggerWrapper.LogMessage("\n ****************************************************************", MessageImportance.High);
Expand Down

0 comments on commit 215199f

Please sign in to comment.