Merge pull request #947 from microsoft/vnext

Releases Hidi

Author: andrueastman

Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System;
@@ -135,5 +135,22 @@ public void ThrowsInvalidOperationExceptionInCreatePredicateWhenInvalidArguments
             var message2 = Assert.Throws<InvalidOperationException>(() => OpenApiFilterService.CreatePredicate("users.user.ListUser", "users.user")).Message;
             Assert.Equal("Cannot specify both operationIds and tags at the same time.", message2);
         }
+
+        [Theory]
+        [InlineData("reports.getTeamsUserActivityUserDetail-a3f1", null)]
+        [InlineData(null, "reports.Functions")]
+        public void ReturnsPathParametersOnSlicingBasedOnOperationIdsOrTags(string operationIds, string tags)
+        {
+            // Act
+            var predicate = OpenApiFilterService.CreatePredicate(operationIds, tags);
+            var subsetOpenApiDocument = OpenApiFilterService.CreateFilteredDocument(_openApiDocumentMock, predicate);
+
+            // Assert
+            foreach (var pathItem in subsetOpenApiDocument.Paths)
+            {
+                Assert.True(pathItem.Value.Parameters.Any());
+                Assert.Equal(1, pathItem.Value.Parameters.Count);
+            }
+        }
     }
 }

Microsoft.OpenApi.Hidi.Tests/UtilityFiles/OpenApiDocumentMock.cs

@@ -116,6 +116,21 @@ public static OpenApiDocument CreateOpenApiDocument()
                                     }
                                 }
                             }
+                        },
+                        Parameters = new List<OpenApiParameter>
+                        {
+                            {
+                                new OpenApiParameter()
+                                {
+                                    Name = "period",
+                                    In = ParameterLocation.Path,
+                                    Required = true,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = "string"
+                                    }
+                                }
+                            }
                         }
                     },
                     ["/reports/microsoft.graph.getTeamsUserActivityUserDetail(date={date})"] = new OpenApiPathItem()
@@ -175,7 +190,20 @@ public static OpenApiDocument CreateOpenApiDocument()
                                     }
                                 }
                             }
-                        }
+                        },
+                        Parameters = new List<OpenApiParameter>
+                        {
+                            new OpenApiParameter
+                            {
+                                Name = "period",
+                                In = ParameterLocation.Path,
+                                Required = true,
+                                Schema = new OpenApiSchema()
+                                {
+                                    Type = "string"
+                                }
+                            }
+                        }                                    
                     },
                     ["/users"] = new OpenApiPathItem()
                     {

src/Directory.Build.props

@@ -3,6 +3,6 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1-*" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 </Project>

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

@@ -15,7 +15,7 @@
     <PackageId>Microsoft.OpenApi.Hidi</PackageId>
     <ToolCommandName>hidi</ToolCommandName>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-    <Version>1.0.0-preview8</Version>
+    <Version>1.0.0-preview9</Version>
     <Description>OpenAPI.NET CLI tool for slicing OpenAPI documents</Description>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>OpenAPI .NET</PackageTags>
@@ -43,16 +43,12 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
     <PackageReference Include="Microsoft.OData.Edm" Version="7.12.0" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.0.11-preview5" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.0.11" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj" />
     <ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-  </ItemGroup>
-
 </Project>

src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj

@@ -33,10 +33,6 @@
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="SharpYaml" Version="1.9.2" />
     </ItemGroup>

src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj

@@ -7,7 +7,6 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs

@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Reflection;
+
+namespace Microsoft.OpenApi.Any
+{
+    /// <summary>
+    /// Contains logic for cloning objects through copy constructors.
+    /// </summary>
+    public class OpenApiAnyCloneHelper
+    {
+        /// <summary>
+        /// Clones an instance of <see cref="IOpenApiAny"/> object from the copy constructor
+        /// </summary>
+        /// <param name="obj">The object instance.</param>
+        /// <returns>A clone copy or the object itself.</returns>
+        public static IOpenApiAny CloneFromCopyConstructor(IOpenApiAny obj)
+        {
+            if (obj != null)
+            {
+                var t = obj.GetType();
+                foreach (ConstructorInfo ci in t.GetConstructors())
+                {
+                    ParameterInfo[] pi = ci.GetParameters();
+                    if (pi.Length == 1 && pi[0].ParameterType == t)
+                    {
+                        return (IOpenApiAny)ci.Invoke(new object[] { obj });
+                    }
+                }
+            }
+
+            return obj;
+        }
+    }
+}

src/Microsoft.OpenApi/Any/OpenApiArray.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. 
 
 using Microsoft.OpenApi.Writers;
+using System;
 using System.Collections.Generic;
 
 namespace Microsoft.OpenApi.Any
@@ -16,6 +17,19 @@ public class OpenApiArray : List<IOpenApiAny>, IOpenApiAny
         /// </summary>
         public AnyType AnyType { get; } = AnyType.Array;
 
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiArray() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiArray"/> object
+        /// </summary>
+        public OpenApiArray(OpenApiArray array)
+        {
+            AnyType = array.AnyType;
+        }
+
         /// <summary>
         /// Write out contents of OpenApiArray to passed writer
         /// </summary>

src/Microsoft.OpenApi/Any/OpenApiNull.cs

@@ -15,6 +15,19 @@ public class OpenApiNull : IOpenApiAny
         /// </summary>
         public AnyType AnyType { get; } = AnyType.Null;
 
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiNull() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiNull"/> object
+        /// </summary>
+        public OpenApiNull(OpenApiNull openApiNull)
+        {
+            AnyType = openApiNull.AnyType;
+        }
+
         /// <summary>
         /// Write out null representation
         /// </summary>

src/Microsoft.OpenApi/Any/OpenApiObject.cs

@@ -16,6 +16,19 @@ public class OpenApiObject : Dictionary<string, IOpenApiAny>, IOpenApiAny
         /// </summary>
         public AnyType AnyType { get; } = AnyType.Object;
 
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiObject() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiObject"/> object
+        /// </summary>
+        public OpenApiObject(OpenApiObject obj)
+        {
+            AnyType = obj.AnyType;
+        }
+
         /// <summary>
         /// Serialize OpenApiObject to writer
         /// </summary>