Merge pull request #2014 from microsoft/chore/v1-sync

chore/v1 sync

Author: baywet

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

@@ -40,7 +40,7 @@
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
     <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview.7" />
-    <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.0-preview" />
+    <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.6-preview" />
     <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
     <!--STJ
     required until Microsoft.Extensions.Logging.Console and Microsoft.Extensions.Configuration.Json

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -22,6 +22,7 @@
 using Microsoft.OData.Edm.Csdl;
 using Microsoft.OpenApi.ApiManifest;
 using Microsoft.OpenApi.ApiManifest.OpenAI;
+using Microsoft.OpenApi.ApiManifest.OpenAI.Authentication;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Hidi.Extensions;
 using Microsoft.OpenApi.Hidi.Formatters;
@@ -85,7 +86,7 @@ public static async Task TransformOpenApiDocumentAsync(HidiOptions options, ILog
                 var apiDependency = await FindApiDependencyAsync(options.FilterOptions.FilterByApiManifest, logger, cancellationToken).ConfigureAwait(false);
                 if (apiDependency != null)
                 {
-                    options.OpenApi = apiDependency.ApiDescripionUrl;
+                    options.OpenApi = apiDependency.ApiDescriptionUrl;
                 }
 
                 // If Postman Collection is provided, load it
@@ -745,7 +746,7 @@ internal static async Task PluginManifestAsync(HidiOptions options, ILogger logg
             var apiDependency = await FindApiDependencyAsync(options.FilterOptions?.FilterByApiManifest, logger, cancellationToken).ConfigureAwait(false);
             if (apiDependency != null)
             {
-                options.OpenApi = apiDependency.ApiDescripionUrl;
+                options.OpenApi = apiDependency.ApiDescriptionUrl;
             }
 
             // Load OpenAPI document
@@ -771,15 +772,11 @@ internal static async Task PluginManifestAsync(HidiOptions options, ILogger logg
             WriteOpenApi(options, OpenApiFormat.Json, OpenApiSpecVersion.OpenApi3_1, document, logger);
 
             // Create OpenAIPluginManifest from ApiDependency and OpenAPI document
-            var manifest = new OpenAIPluginManifest
+            var manifest = new OpenAIPluginManifest(document.Info?.Title ?? "Title", document.Info?.Title ?? "Title", "https://go.microsoft.com/fwlink/?LinkID=288890", document.Info?.Contact?.Email ?? "[email protected]", document.Info?.License?.Url.ToString() ?? "https://placeholderlicenseurl.com")
             {
-                NameForHuman = document.Info.Title,
-                DescriptionForHuman = document.Info.Description,
-                Api = new()
-                {
-                    Type = "openapi",
-                    Url = "./openapi.json"
-                }
+                DescriptionForHuman = document.Info?.Description ?? "Description placeholder",
+                Api = new("openapi", "./openapi.json"),
+                Auth = new ManifestNoAuth(),
             };
             manifest.NameForModel = manifest.NameForHuman;
             manifest.DescriptionForModel = manifest.DescriptionForHuman;

test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs

@@ -335,7 +335,7 @@ public async Task InvokeShowCommandAsync()
             var openApi = Path.Combine(".", "UtilityFiles", "SampleOpenApi.yml");
             var args = new[] { "show", "-d", openApi, "-o", "sample.md" };
             var parseResult = rootCommand.Parse(args);
-            var handler = rootCommand.Subcommands.Where(c => c.Name == "show").First().Handler;
+            var handler = rootCommand.Subcommands.First(c => c.Name == "show").Handler;
             var context = new InvocationContext(parseResult);
 
             await handler!.InvokeAsync(context);
@@ -351,7 +351,7 @@ public async Task InvokePluginCommandAsync()
             var manifest = Path.Combine(".", "UtilityFiles", "exampleapimanifest.json");
             var args = new[] { "plugin", "-m", manifest, "--of", AppDomain.CurrentDomain.BaseDirectory };
             var parseResult = rootCommand.Parse(args);
-            var handler = rootCommand.Subcommands.Where(c => c.Name == "plugin").First().Handler;
+            var handler = rootCommand.Subcommands.First(c => c.Name == "plugin").Handler;
             var context = new InvocationContext(parseResult);
 
             await handler!.InvokeAsync(context);

test/Microsoft.OpenApi.Hidi.Tests/UtilityFiles/exampleapimanifest.json

@@ -1,11 +1,12 @@
 {
+    "applicationName": "Example API",
     "publisher": {
         "name": "Alice",
         "contactEmail": "[email protected]"
     },
     "apiDependencies": {
         "moostodon" : {
-            "apiDescripionUrl": "https://raw.githubusercontent.com/APIPatterns/Moostodon/main/spec/tsp-output/%40typespec/openapi3/openapi.yaml",
+            "apiDescriptionUrl": "https://raw.githubusercontent.com/APIPatterns/Moostodon/main/spec/tsp-output/%40typespec/openapi3/openapi.yaml",
             "auth": {
                 "clientIdentifier": "some-uuid-here",
                 "access": [ "resourceA.ReadWrite",