Merge remote-tracking branch 'origin/vnext' into release/1.3.0

microsoft · Apr 12, 2022 · f1fcecf · f1fcecf
2 parents d034f51 + a16ef23
commit f1fcecf
Show file tree

Hide file tree

Showing 22 changed files with 180 additions and 77 deletions.
diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
@@ -270,11 +270,13 @@ stages:
               inputs:
                 source: current
             - pwsh: |
-                $artifactName = Get-ChildItem -Path $(Pipeline.Workspace) -Filter Microsoft.OpenApi.Hidi-* -recurse | select -First 1
-                $artifactVersion= $artifactName -replace "Microsoft.OpenApi.Hidi-", ""
+                $artifactName = Get-ChildItem -Path $(Pipeline.Workspace)\Nugets -Filter Microsoft.OpenApi.*.nupkg -recurse | select -First 1
+                $artifactVersion= $artifactName.Name -replace "Microsoft.OpenApi.", "" -replace ".nupkg", ""
                 #Set Variable $artifactName and $artifactVersion
                 Write-Host "##vso[task.setvariable variable=artifactVersion; isSecret=false; isOutput=true]$artifactVersion"
                 Write-Host "##vso[task.setvariable variable=artifactName; isSecret=false; isOutput=true]$artifactName.FullName"
+                echo "$artifactName"
+                echo "$artifactVersion"
               displayName: 'Fetch Artifact Name'
 
             - task: NuGetCommand@2
@@ -290,7 +292,7 @@ stages:
                 gitHubConnection: 'Github-MaggieKimani1'
                 tagSource: userSpecifiedTag
                 tag: '$(artifactVersion)'
-                title: '$(artifactName)'
+                title: '$(artifactVersion)'
                 releaseNotesSource: inline
                 assets: '$(Pipeline.Workspace)\**\*.exe'
                 changeLogType: issueBased

diff --git a/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj b/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
@@ -15,7 +15,7 @@
     <PackageId>Microsoft.OpenApi.Hidi</PackageId>
     <ToolCommandName>hidi</ToolCommandName>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-    <Version>0.5.0-preview5</Version>
+    <Version>0.5.0-preview6</Version>
     <Description>OpenAPI.NET CLI tool for slicing OpenAPI documents</Description>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>OpenAPI .NET</PackageTags>

diff --git a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
@@ -10,7 +10,7 @@
         <Company>Microsoft</Company>
         <Title>Microsoft.OpenApi.Readers</Title>
         <PackageId>Microsoft.OpenApi.Readers</PackageId>
-        <Version>1.3.1-preview5</Version>
+        <Version>1.3.1-preview6</Version>
         <Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
         <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
         <PackageTags>OpenAPI .NET</PackageTags>

diff --git a/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs b/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs
@@ -17,6 +17,11 @@ public class OpenApiDiagnostic : IDiagnostic
         /// </summary>
         public IList<OpenApiError> Errors { get; set; } = new List<OpenApiError>();
 
+        /// <summary>
+        /// List of all warnings
+        /// </summary>
+        public IList<OpenApiError> Warnings { get; set; } = new List<OpenApiError>();
+
         /// <summary>
         /// Open API specification version of the document parsed.
         /// </summary>

diff --git a/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Extensions;
@@ -12,6 +13,7 @@
 using Microsoft.OpenApi.Readers.Interface;
 using Microsoft.OpenApi.Readers.Services;
 using Microsoft.OpenApi.Services;
+using Microsoft.OpenApi.Validations;
 using SharpYaml.Serialization;
 
 namespace Microsoft.OpenApi.Readers
@@ -68,11 +70,16 @@ public OpenApiDocument Read(YamlDocument input, out OpenApiDiagnostic diagnostic
             // Validate the document
             if (_settings.RuleSet != null && _settings.RuleSet.Rules.Count > 0)
             {
-                var errors = document.Validate(_settings.RuleSet);
-                foreach (var item in errors)
+                var openApiErrors = document.Validate(_settings.RuleSet);
+                foreach (var item in openApiErrors.Where(e => e is OpenApiValidatorError))
                 {
                     diagnostic.Errors.Add(item);
                 }
+                foreach (var item in openApiErrors.Where(e => e is OpenApiValidatorWarning))
+                {
+                    diagnostic.Warnings.Add(item);
+                }
+
             }
 
             return document;

diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. 
 
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Services;
@@ -25,7 +26,7 @@ public static IEnumerable<OpenApiError> Validate(this IOpenApiElement element, V
             var validator = new OpenApiValidator(ruleSet);
             var walker = new OpenApiWalker(validator);
             walker.Walk(element);
-            return validator.Errors;
+            return validator.Errors.Cast<OpenApiError>().Union(validator.Warnings);
         }
     }
 }
diff --git a/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
@@ -11,7 +11,7 @@
         <Company>Microsoft</Company>
         <Title>Microsoft.OpenApi</Title>
         <PackageId>Microsoft.OpenApi</PackageId>
-        <Version>1.3.1-preview5</Version>
+        <Version>1.3.1-preview6</Version>
         <Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
         <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
         <PackageTags>OpenAPI .NET</PackageTags>

diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
@@ -351,7 +351,15 @@ internal T ResolveReferenceTo<T>(OpenApiReference reference) where T : class, IO
         /// <summary>
         /// Load the referenced <see cref="IOpenApiReferenceable"/> object from a <see cref="OpenApiReference"/> object
         /// </summary>
-        public IOpenApiReferenceable ResolveReference(OpenApiReference reference, bool useExternal)
+        public IOpenApiReferenceable ResolveReference(OpenApiReference reference)
+        {
+            return ResolveReference(reference, false);
+        }
+
+        /// <summary>
+        /// Load the referenced <see cref="IOpenApiReferenceable"/> object from a <see cref="OpenApiReference"/> object
+        /// </summary>
+        internal IOpenApiReferenceable ResolveReference(OpenApiReference reference, bool useExternal)
         {
             if (reference == null)
             {

diff --git a/src/Microsoft.OpenApi/Validations/IValidationContext.cs b/src/Microsoft.OpenApi/Validations/IValidationContext.cs
@@ -14,6 +14,12 @@ public interface IValidationContext
         /// <param name="error">Error to register.</param>
         void AddError(OpenApiValidatorError error);
 
+        /// <summary>
+        /// Register a warning with the validation context.
+        /// </summary>
+        /// <param name="warning">Warning to register.</param>
+        void AddWarning(OpenApiValidatorWarning warning);
+
         /// <summary>
         /// Allow Rule to indicate validation error occured at a deeper context level.  
         /// </summary>

diff --git a/src/Microsoft.OpenApi/Validations/OpenApiValidatiorWarning.cs b/src/Microsoft.OpenApi/Validations/OpenApiValidatiorWarning.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.OpenApi.Exceptions;
+using Microsoft.OpenApi.Models;
+
+namespace Microsoft.OpenApi.Validations
+{    
+    /// <summary>
+     /// Warnings detected when validating an OpenAPI Element
+     /// </summary>
+    public class OpenApiValidatorWarning : OpenApiError
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiError"/> class.
+        /// </summary>
+        public OpenApiValidatorWarning(string ruleName, string pointer, string message) : base(pointer, message)
+        {
+            RuleName = ruleName;
+        }
+
+        /// <summary>
+        /// Name of rule that detected the error.
+        /// </summary>
+        public string RuleName { get; set; }
+    }
+
+}
diff --git a/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs b/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs
@@ -17,6 +17,7 @@ public class OpenApiValidator : OpenApiVisitorBase, IValidationContext
     {
         private readonly ValidationRuleSet _ruleSet;
         private readonly IList<OpenApiValidatorError> _errors = new List<OpenApiValidatorError>();
+        private readonly IList<OpenApiValidatorWarning> _warnings = new List<OpenApiValidatorWarning>();
 
         /// <summary>
         /// Create a vistor that will validate an OpenAPIDocument
@@ -38,6 +39,17 @@ public IEnumerable<OpenApiValidatorError> Errors
             }
         }
 
+        /// <summary>
+        /// Gets the validation warnings.
+        /// </summary>
+        public IEnumerable<OpenApiValidatorWarning> Warnings
+        {
+            get
+            {
+                return _warnings;
+            }
+        }
+
         /// <summary>
         /// Register an error with the validation context.
         /// </summary>
@@ -52,6 +64,19 @@ public void AddError(OpenApiValidatorError error)
             _errors.Add(error);
         }
 
+        /// <summary>
+        /// Register an error with the validation context.
+        /// </summary>
+        /// <param name="warning">Error to register.</param>
+        public void AddWarning(OpenApiValidatorWarning warning)
+        {
+            if (warning == null)
+            {
+                throw Error.ArgumentNull(nameof(warning));
+            }
+
+            _warnings.Add(warning);
+        }
 
         /// <summary>
         /// Execute validation rules against an <see cref="OpenApiDocument"/>

diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiHeaderRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiHeaderRules.cs
@@ -10,6 +10,7 @@ namespace Microsoft.OpenApi.Validations.Rules
     /// <summary>
     /// The validation rules for <see cref="OpenApiHeader"/>.
     /// </summary>
+    //Removed from Default Rules as this is not a MUST in OpenAPI
     [OpenApiRule]
     public static class OpenApiHeaderRules
     {

diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiMediaTypeRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiMediaTypeRules.cs
@@ -17,7 +17,7 @@ namespace Microsoft.OpenApi.Validations.Rules
     /// Future versions of the example parsers should not try an infer types.
     /// Example validation should be done as a separate post reading step so all schemas can be fully available.
     /// </remarks>
-    //[OpenApiRule]
+    [OpenApiRule]
     public static class OpenApiMediaTypeRules
     {
         /// <summary>

diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs
@@ -11,6 +11,7 @@ namespace Microsoft.OpenApi.Validations.Rules
     /// <summary>
     /// The validation rules for <see cref="OpenApiSchema"/>.
     /// </summary>
+
     [OpenApiRule]
     public static class OpenApiSchemaRules
     {

diff --git a/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs b/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs
@@ -77,7 +77,7 @@ public static void ValidateDataTypeMismatch(
                 // If value is not a string and also not an object, there is a data mismatch.
                 if (!(value is OpenApiObject))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                     return;
@@ -117,7 +117,7 @@ public static void ValidateDataTypeMismatch(
                 // If value is not a string and also not an array, there is a data mismatch.
                 if (!(value is OpenApiArray))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                     return;
@@ -141,7 +141,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiInteger))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -153,7 +153,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiLong))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                        ruleName,
                        DataTypeMismatchedErrorMessage);
                 }
@@ -165,7 +165,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiInteger))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -177,7 +177,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiFloat))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -189,7 +189,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiDouble))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -201,7 +201,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiDouble))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -213,7 +213,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiByte))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -225,7 +225,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiDate))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -237,7 +237,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiDateTime))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -249,7 +249,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiPassword))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -261,7 +261,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiString))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -273,7 +273,7 @@ public static void ValidateDataTypeMismatch(
             {
                 if (!(value is OpenApiBoolean))
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }

diff --git a/src/Microsoft.OpenApi/Validations/ValidationExtensions.cs b/src/Microsoft.OpenApi/Validations/ValidationExtensions.cs
@@ -23,5 +23,15 @@ public static void CreateError(this IValidationContext context, string ruleName,
             OpenApiValidatorError error = new OpenApiValidatorError(ruleName, context.PathString, message);
             context.AddError(error);
         }
+
+        /// <summary>
+        /// Helper method to simplify validation rules
+        /// </summary>
+        public static void CreateWarning(this IValidationContext context, string ruleName, string message)
+        {
+            OpenApiValidatorWarning warning = new OpenApiValidatorWarning(ruleName, context.PathString, message);
+            context.AddWarning(warning);
+        }
+
     }
 }