Merge pull request #1503 from microsoft/mk/fix-bugs-and-failing-tests

Fixes bugs and failing tests

Author: MaggieKimani1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,8 +10,8 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the current behavior:
+**OpenApi File To Reproduce**
+Add the OpenApi file you're using or a link to it as well as the steps to reproduce the current behavior.
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.

.github/workflows/ci-cd.yml

@@ -14,7 +14,7 @@ jobs:
       GITHUB_RUN_NUMBER: ${{ github.run_number }}
     steps:
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 7.0.x
 

.github/workflows/codeql-analysis.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 7.0.x
 

.github/workflows/sonarcloud.yml

@@ -30,16 +30,16 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17
       - name: Setup .NET 5 # At the moment the scanner requires dotnet 5 https://www.nuget.org/packages/dotnet-sonarscanner
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 5.0.x
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 7.0.x
       - uses: actions/checkout@v4

docs/CI-CD_DOCUMENTATION.md

@@ -44,8 +44,8 @@ static PowerShellFormatter()
         // 6. Add AdditionalProperties to object schemas.
 
         public override void Visit(ref JsonSchema schema)
-        {
-            AddAdditionalPropertiesToSchema(schema);
+         {
+            AddAdditionalPropertiesToSchema(ref schema);
             schema = ResolveAnyOfSchema(ref schema);
             schema = ResolveOneOfSchema(ref schema);
 
@@ -174,7 +174,7 @@ private static IList<OpenApiParameter> ResolveFunctionParameters(IList<OpenApiPa
             return parameters;
         }
 
-        private void AddAdditionalPropertiesToSchema(JsonSchema schema)
+        private void AddAdditionalPropertiesToSchema(ref JsonSchema schema)
         {
             if (schema != null && !_schemaLoop.Contains(schema) && schema.GetJsonType().Equals(SchemaValueType.Object))
             {
@@ -200,6 +200,7 @@ private void AddAdditionalPropertiesToSchema(JsonSchema schema)
                     _schemaLoop.Push(additionalProps);
                 }
             }
+            
         }
 
         private static JsonSchema ResolveOneOfSchema(ref JsonSchema schema)
@@ -254,6 +255,14 @@ private static JsonSchema FlattenSchema(JsonSchema schema, JsonSchema newSchema)
         private static JsonSchema CopySchema(JsonSchema schema, JsonSchema newSchema)
         {
             var schemaBuilder = new JsonSchemaBuilder();
+            var keywords = schema.Keywords;
+            if (keywords != null)
+            {
+                foreach (var keyword in keywords)
+                {
+                    schemaBuilder.Add(keyword);
+                }
+            }
 
             if (schema.GetTitle() == null && newSchema.GetTitle() is { } title)
             {

docs/images/Actions_workflow_dispatch.png

@@ -9,7 +9,7 @@
     <Nullable>enable</Nullable>
     <ToolCommandName>hidi</ToolCommandName>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-    <Version>1.3.5</Version>
+    <Version>1.3.6</Version>
     <Description>OpenAPI.NET CLI tool for slicing OpenAPI documents</Description>
     <SignAssembly>true</SignAssembly>
     <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
@@ -34,8 +34,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageReference Include="Microsoft.OData.Edm" Version="7.18.0" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.5.0-preview9" />
+    <PackageReference Include="Microsoft.OData.Edm" Version="7.20.0" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.5.0" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.0-preview" />
     <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
   </ItemGroup>

src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System.IO;
 using Microsoft.Extensions.Configuration;
 using Microsoft.OpenApi.OData;
 
@@ -11,15 +12,19 @@ internal static class SettingsUtilities
         internal static IConfiguration GetConfiguration(string? settingsFile = null)
         {
             if (string.IsNullOrEmpty(settingsFile))
+            {
                 settingsFile = "appsettings.json";
+            }
+
+            var settingsFilePath = Path.Combine(Directory.GetCurrentDirectory(), settingsFile);
 
             IConfiguration config = new ConfigurationBuilder()
-            .AddJsonFile(settingsFile, true)
-            .Build();
+                .AddJsonFile(settingsFilePath, true)
+                .Build();
 
             return config;
         }
-
+        
         internal static OpenApiConvertSettings GetOpenApiConvertSettings(IConfiguration config, string? metadataVersion)
         {
             if (config == null) { throw new System.ArgumentNullException(nameof(config)); }

src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>1.6.10</Version>
+        <Version>1.6.11</Version>
         <Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
         <SignAssembly>true</SignAssembly>
         <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
@@ -21,7 +21,6 @@
         <PackageReference Include="JsonSchema.Net" Version="4.1.5" />
         <PackageReference Include="JsonSchema.Net.OpenApi" Version="1.1.0" />
         <PackageReference Include="SharpYaml" Version="2.1.0" />
-        <PackageReference Include="Yaml2JsonNode" Version="1.1.1" />
         <PackageReference Include="System.Text.Json" Version="7.0.2" />
     </ItemGroup>