4.4.1 - Fixing NullReferenceException in IsWebJobsAttribute extension…

… method (#655)

* Adding null check to `IsWebJobsAttribute` extension method.

* Fix method summary.

* Updating E2E test to include a function with nullable parameter type.

common.props

@@ -4,7 +4,7 @@
 
     <MajorProductVersion>4</MajorProductVersion>
     <MinorProductVersion>4</MinorProductVersion>
-    <PatchProductVersion>0</PatchProductVersion>
+    <PatchProductVersion>1</PatchProductVersion>
 
     <!-- Clear this value for non-preview releases -->
     <PreviewProductVersion></PreviewProductVersion>

src/Microsoft.NET.Sdk.Functions.Generator/AttributeExtensions.cs

@@ -43,13 +43,20 @@ private static string ToAttributeFriendlyName(string name)
          };
 
         /// <summary>
-        ///
+        /// Checks if a custom attribute is a WebJobs attribute.
         /// </summary>
-        /// <param name="attribute"></param>
-        /// <returns></returns>
+        /// <param name="attribute">The custom attribute to check.</param>
+        /// <returns>True if the attribute is a WebJobs attribute; otherwise, False.</returns>
         public static bool IsWebJobsAttribute(this CustomAttribute attribute)
         {
-            return attribute.AttributeType.Resolve().CustomAttributes.Any(a => a.AttributeType.FullName == "Microsoft.Azure.WebJobs.Description.BindingAttribute")
+            var attributeTypeDefinition = attribute.AttributeType?.Resolve();
+
+            if (attributeTypeDefinition == null)
+            {
+                return false;
+            }
+
+            return attributeTypeDefinition.CustomAttributes.Any(a => a.AttributeType.FullName == "Microsoft.Azure.WebJobs.Description.BindingAttribute")
                 || _supportedAttributes.Contains(attribute.AttributeType.FullName);
         }
 

test/Microsoft.NET.Sdk.Functions.EndToEnd.Tests/FunctionsV4SdkTests.cs

@@ -11,11 +11,11 @@ public class FunctionsV4SdkTests
         private string _testsDirectory;
         private TestInitialize _testInitializer;
         private ITestOutputHelper _testOutputHelper;
-        private const string _testVersion = "v4";
+        private const string TestVersion = "v4";
 
         public FunctionsV4SdkTests(ITestOutputHelper testOutputHelper)
         {
-            _testInitializer = new TestInitialize(testOutputHelper, _testVersion);
+            _testInitializer = new TestInitialize(testOutputHelper, TestVersion);
             _testOutputHelper = testOutputHelper;
             _functionsSdkPackageSource = _testInitializer.FunctionsSdkPackageSource;
             _testsDirectory = _testInitializer.TestDirectory;
@@ -68,7 +68,7 @@ public void BuildAndPublish_CopiesRuntimesToAdditionalBinFolder()
             Assert.True(Directory.Exists(additionalBinDir));
             var files = Directory.EnumerateFiles(additionalBinDir, "*.dll", SearchOption.AllDirectories);
             Assert.True(files.Count() > 1);
-            // Test addional runtimes
+            // Test additional runtimes
             files = Directory.EnumerateFiles(Path.Combine(additionalBinDir, "runtimes"), "*.dll", SearchOption.AllDirectories);
             Assert.True(files.Count() > 1);
 
@@ -99,7 +99,7 @@ public void BuildAndPublish_GeneratesFunctions()
             string dotnetArgs = $"build {projectFileToTest}.csproj --configuration {TestInitialize.Configuration}";
             int? exitCode = new ProcessWrapper().RunProcess(TestInitialize.DotNetExecutable, dotnetArgs, projectFileDirectory, out int? _, createDirectoryIfNotExists: false, testOutputHelper: _testOutputHelper);
             Assert.True(exitCode.HasValue && exitCode.Value == 0);
-            // Test addional bin
+            // Test additional bin
             string binDir = Path.Combine(projectFileDirectory, "bin", TestInitialize.Configuration, TestInitialize.NetCoreFramework);
             string additionalBinDir = Path.Combine(binDir, "bin");
             Assert.True(Directory.Exists(additionalBinDir));
@@ -108,6 +108,8 @@ public void BuildAndPublish_GeneratesFunctions()
             // Test functions generator output
             string httpTriggerFunctionpath = Path.Combine(binDir, "HttpFunction", "function.json");
             Assert.True(File.Exists(httpTriggerFunctionpath));
+            string httpTrigger2Functionpath = Path.Combine(binDir, "HttpFunction2", "function.json");
+            Assert.True(File.Exists(httpTrigger2Functionpath));
 
             // Publish
             dotnetArgs = $"publish {projectFileToTest}.csproj --configuration {TestInitialize.Configuration}";
@@ -122,6 +124,8 @@ public void BuildAndPublish_GeneratesFunctions()
             // Test functions generator output
             httpTriggerFunctionpath = Path.Combine(publishDir, "HttpFunction", "function.json");
             Assert.True(File.Exists(httpTriggerFunctionpath));
+            httpTrigger2Functionpath = Path.Combine(publishDir, "HttpFunction2", "function.json");
+            Assert.True(File.Exists(httpTrigger2Functionpath));
         }
 
         private void UpdatePackageReference(string projectFileToTest, string projectFileDirectory)

test/Microsoft.NET.Sdk.Functions.EndToEnd.Tests/Resources/v4/FunctionAppWithHttpTrigger/HttpFunction.cs

@@ -31,5 +31,13 @@ public static async Task<IActionResult> Run(
 
             return new OkObjectResult(responseMessage);
         }
+
+        // A function which uses nullable type for parameter.
+        [FunctionName("HttpFunction2")]
+        public static async Task<IActionResult> Run2(
+            [HttpTrigger(AuthorizationLevel.Function, "get", "post", Route = "hello/{id}")] HttpRequest req, ILogger log, string? id)
+        {
+            return new OkObjectResult($"Hello {id}");
+        }
     }
 }