Joperezr/merge rc2 changes (#4555)

dotnet · Oct 12, 2023 · fbe530f · fbe530f
1 parent 4e850f2
commit fbe530f
Show file tree

Hide file tree

Showing 10 changed files with 279 additions and 23 deletions.
diff --git a/src/Generators/Microsoft.Gen.AutoClient/Parser.cs b/src/Generators/Microsoft.Gen.AutoClient/Parser.cs
@@ -318,11 +318,13 @@ potentialNamespaceParent is not NamespaceDeclarationSyntax &&
         return result;
     }
 
-    private static ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<AttributeData> methodAttributes, SymbolHolder symbols)
+    private ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<AttributeData> methodAttributes, SymbolHolder symbols)
     {
         List<string?> httpMethods = [];
         string? requestName = null;
         string? path = null;
+        bool requestNameFailed = false;
+        bool headersParsingFailed = false;
         Dictionary<string, string> staticHeaders = [];
 
         foreach (var methodAttribute in methodAttributes)
@@ -342,7 +344,19 @@ private static ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<
                     continue;
                 }
 
-                path = methodAttribute.ConstructorArguments[0].Value as string;
+                var methodArg = methodAttribute.ConstructorArguments[0];
+                if (methodArg.IsNull)
+                {
+                    continue;
+                }
+
+                var argString = methodArg.Value as string;
+                if (string.IsNullOrEmpty(argString))
+                {
+                    continue;
+                }
+
+                path = argString;
             }
             else if (attributeSymbol.Equals(symbols.RestPostAttribute, SymbolEqualityComparer.Default))
             {
@@ -353,7 +367,19 @@ private static ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<
                     continue;
                 }
 
-                path = methodAttribute.ConstructorArguments[0].Value as string;
+                var methodArg = methodAttribute.ConstructorArguments[0];
+                if (methodArg.IsNull)
+                {
+                    continue;
+                }
+
+                var argString = methodArg.Value as string;
+                if (string.IsNullOrEmpty(argString))
+                {
+                    continue;
+                }
+
+                path = argString;
             }
             else if (attributeSymbol.Equals(symbols.RestPutAttribute, SymbolEqualityComparer.Default))
             {
@@ -364,7 +390,19 @@ private static ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<
                     continue;
                 }
 
-                path = methodAttribute.ConstructorArguments[0].Value as string;
+                var methodArg = methodAttribute.ConstructorArguments[0];
+                if (methodArg.IsNull)
+                {
+                    continue;
+                }
+
+                var argString = methodArg.Value as string;
+                if (string.IsNullOrEmpty(argString))
+                {
+                    continue;
+                }
+
+                path = argString;
             }
             else if (attributeSymbol.Equals(symbols.RestDeleteAttribute, SymbolEqualityComparer.Default))
             {
@@ -375,7 +413,19 @@ private static ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<
                     continue;
                 }
 
-                path = methodAttribute.ConstructorArguments[0].Value as string;
+                var methodArg = methodAttribute.ConstructorArguments[0];
+                if (methodArg.IsNull)
+                {
+                    continue;
+                }
+
+                var argString = methodArg.Value as string;
+                if (string.IsNullOrEmpty(argString))
+                {
+                    continue;
+                }
+
+                path = argString;
             }
             else if (attributeSymbol.Equals(symbols.RestPatchAttribute, SymbolEqualityComparer.Default))
             {
@@ -386,7 +436,19 @@ private static ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<
                     continue;
                 }
 
-                path = methodAttribute.ConstructorArguments[0].Value as string;
+                var methodArg = methodAttribute.ConstructorArguments[0];
+                if (methodArg.IsNull)
+                {
+                    continue;
+                }
+
+                var argString = methodArg.Value as string;
+                if (string.IsNullOrEmpty(argString))
+                {
+                    continue;
+                }
+
+                path = argString;
             }
             else if (attributeSymbol.Equals(symbols.RestOptionsAttribute, SymbolEqualityComparer.Default))
             {
@@ -397,7 +459,19 @@ private static ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<
                     continue;
                 }
 
-                path = methodAttribute.ConstructorArguments[0].Value as string;
+                var methodArg = methodAttribute.ConstructorArguments[0];
+                if (methodArg.IsNull)
+                {
+                    continue;
+                }
+
+                var argString = methodArg.Value as string;
+                if (string.IsNullOrEmpty(argString))
+                {
+                    continue;
+                }
+
+                path = argString;
             }
             else if (attributeSymbol.Equals(symbols.RestHeadAttribute, SymbolEqualityComparer.Default))
             {
@@ -408,7 +482,19 @@ private static ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<
                     continue;
                 }
 
-                path = methodAttribute.ConstructorArguments[0].Value as string;
+                var methodArg = methodAttribute.ConstructorArguments[0];
+                if (methodArg.IsNull)
+                {
+                    continue;
+                }
+
+                var argString = methodArg.Value as string;
+                if (string.IsNullOrEmpty(argString))
+                {
+                    continue;
+                }
+
+                path = argString;
             }
             else if (attributeSymbol.Equals(symbols.RestStaticHeaderAttribute, SymbolEqualityComparer.Default))
             {
@@ -417,28 +503,67 @@ private static ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<
                     continue;
                 }
 
-                var key = methodAttribute.ConstructorArguments[0].Value as string;
-                var value = methodAttribute.ConstructorArguments[1].Value as string;
+                var keyArg = methodAttribute.ConstructorArguments[0];
+                var valueArg = methodAttribute.ConstructorArguments[1];
 
-                if (key == null || value == null)
+                if (keyArg.IsNull)
                 {
+                    Diag(DiagDescriptors.ErrorInvalidHeaderName, attributeSymbol.GetLocation());
+                    headersParsingFailed = true;
                     continue;
                 }
 
-                staticHeaders.Add(key, value);
+                if (valueArg.IsNull)
+                {
+                    Diag(DiagDescriptors.ErrorInvalidHeaderValue, attributeSymbol.GetLocation());
+                    headersParsingFailed = true;
+                    continue;
+                }
+
+                var keyString = keyArg.Value as string;
+                var valueString = valueArg.Value as string;
+
+                if (string.IsNullOrEmpty(keyString))
+                {
+                    Diag(DiagDescriptors.ErrorInvalidHeaderName, attributeSymbol.GetLocation());
+                    headersParsingFailed = true;
+                    continue;
+                }
+
+                if (valueString == null)
+                {
+                    Diag(DiagDescriptors.ErrorInvalidHeaderValue, attributeSymbol.GetLocation());
+                    headersParsingFailed = true;
+                    continue;
+                }
+
+                staticHeaders.Add(keyString!, valueString);
             }
 
             foreach (var a in methodAttribute.NamedArguments)
             {
                 if (a.Key == RequestNamePropertyName)
                 {
-                    requestName = (string)a.Value.Value!;
+                    if (a.Value.IsNull)
+                    {
+                        requestNameFailed = true;
+                        continue;
+                    }
+
+                    var valueString = a.Value.Value as string;
+                    if (string.IsNullOrEmpty(valueString))
+                    {
+                        requestNameFailed = true;
+                        continue;
+                    }
+
+                    requestName = valueString;
                     break;
                 }
             }
         }
 
-        return new(httpMethods, path, requestName, staticHeaders);
+        return new(httpMethods, path, requestName, requestNameFailed, headersParsingFailed, staticHeaders);
     }
 
     private RestApiMethod? ProcessMethod(
@@ -474,6 +599,18 @@ private static ParseMethodAttributesResult ParseMethodAttributes(ImmutableArray<
             hasErrors = true;
         }
 
+        if (methodAttrResult.RequestNameParsingFailed)
+        {
+            Diag(DiagDescriptors.ErrorInvalidRequestName, methodSymbol.GetLocation());
+            hasErrors = true;
+        }
+
+        if (methodAttrResult.HeadersParsingFailed)
+        {
+            // Diagnostics are already emitted from the parsing method
+            hasErrors = true;
+        }
+
         var returnTypeSymbol = (INamedTypeSymbol)methodSymbol.ReturnType;
         ITypeSymbol? innerType = null;
 
@@ -662,5 +799,7 @@ private sealed record class ParseMethodAttributesResult(
         List<string?> HttpMethods,
         string? Path,
         string? RequestName,
+        bool RequestNameParsingFailed,
+        bool HeadersParsingFailed,
         Dictionary<string, string> StaticHeaders);
 }
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/DeleteAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/DeleteAttribute.cs
@@ -34,7 +34,7 @@ public sealed class DeleteAttribute : Attribute
     /// <summary>
     /// Initializes a new instance of the <see cref="DeleteAttribute"/> class.
     /// </summary>
-    /// <param name="path">The path of the request.</param>
+    /// <param name="path">The path of the request. Cannot be empty or null.</param>
     public DeleteAttribute(string path)
     {
         Path = path;

diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/GetAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/GetAttribute.cs
@@ -34,7 +34,7 @@ public sealed class GetAttribute : Attribute
     /// <summary>
     /// Initializes a new instance of the <see cref="GetAttribute"/> class.
     /// </summary>
-    /// <param name="path">The path of the request.</param>
+    /// <param name="path">The path of the request. Cannot be empty or null.</param>
     public GetAttribute(string path)
     {
         Path = path;

diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/HeadAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/HeadAttribute.cs
@@ -34,7 +34,7 @@ public sealed class HeadAttribute : Attribute
     /// <summary>
     /// Initializes a new instance of the <see cref="HeadAttribute"/> class.
     /// </summary>
-    /// <param name="path">The path of the request.</param>
+    /// <param name="path">The path of the request. Cannot be empty or null.</param>
     public HeadAttribute(string path)
     {
         Path = path;

diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/OptionsAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/OptionsAttribute.cs
@@ -34,7 +34,7 @@ public sealed class OptionsAttribute : Attribute
     /// <summary>
     /// Initializes a new instance of the <see cref="OptionsAttribute"/> class.
     /// </summary>
-    /// <param name="path">The path of the request.</param>
+    /// <param name="path">The path of the request. Cannot be empty or null.</param>
     public OptionsAttribute(string path)
     {
         Path = path;

diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/PatchAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/PatchAttribute.cs
@@ -34,7 +34,7 @@ public sealed class PatchAttribute : Attribute
     /// <summary>
     /// Initializes a new instance of the <see cref="PatchAttribute"/> class.
     /// </summary>
-    /// <param name="path">The path of the request.</param>
+    /// <param name="path">The path of the request. Cannot be empty or null.</param>
     public PatchAttribute(string path)
     {
         Path = path;

diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/PostAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/PostAttribute.cs
@@ -34,7 +34,7 @@ public sealed class PostAttribute : Attribute
     /// <summary>
     /// Initializes a new instance of the <see cref="PostAttribute"/> class.
     /// </summary>
-    /// <param name="path">The path of the request.</param>
+    /// <param name="path">The path of the request. Cannot be empty or null.</param>
     public PostAttribute(string path)
     {
         Path = path;

diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/PutAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/PutAttribute.cs
@@ -34,7 +34,7 @@ public sealed class PutAttribute : Attribute
     /// <summary>
     /// Initializes a new instance of the <see cref="PutAttribute"/> class.
     /// </summary>
-    /// <param name="path">The path of the request.</param>
+    /// <param name="path">The path of the request. Cannot be empty or null.</param>
     public PutAttribute(string path)
     {
         Path = path;

diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/StaticHeaderAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/StaticHeaderAttribute.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// Injects a static header to be sent with every request. When this attribute is applied
 /// to an interface, then it impacts every method described by the interface. Otherwise, it only
 /// affects the method where it is applied.
+/// The header name must not be null or empty. The value, on the other hand, can be empty, but not null.
 /// </remarks>
 /// <example>
 /// <code>
@@ -33,8 +34,8 @@ public sealed class StaticHeaderAttribute : Attribute
     /// <summary>
     /// Initializes a new instance of the <see cref="StaticHeaderAttribute"/> class.
     /// </summary>
-    /// <param name="header">The name of the header.</param>
-    /// <param name="value">The value of the header.</param>
+    /// <param name="header">The name of the header. Cannot be empty or null.</param>
+    /// <param name="value">The value of the header. Cannot be null.</param>
     public StaticHeaderAttribute(string header, string value)
     {
         Header = header;