Fix a null reference exception with extensible template deployment (A…

…zure#19783) * Add symbolic name test * Add extensibility test, fix null ref bug * Add changelog entry * Update ChangeLog.md Co-authored-by: Yabo Hu <yabhu@microsoft.com>
azure-sdk · Oct 14, 2022 · f003a89 · f003a89
1 parent 2fb0fcc
commit f003a89
Show file tree

Hide file tree

Showing 9 changed files with 456,304 additions and 1 deletion.
diff --git a/src/Resources/ResourceManager/SdkClient/ResourceManagerSdkClient.cs b/src/Resources/ResourceManager/SdkClient/ResourceManagerSdkClient.cs
@@ -355,7 +355,7 @@ private List<DeploymentOperation> GetNewOperations(List<DeploymentOperation> old
                 }
 
                 //If nested deployment, get the operations under those deployments as well
-                if (operation.Properties.TargetResource != null && operation.Properties.TargetResource.ResourceType.Equals(Constants.MicrosoftResourcesDeploymentType, StringComparison.OrdinalIgnoreCase))
+                if (operation.Properties.TargetResource?.ResourceType?.Equals(Constants.MicrosoftResourcesDeploymentType, StringComparison.OrdinalIgnoreCase) == true)
                 {
                     HttpStatusCode statusCode;
                     Enum.TryParse<HttpStatusCode>(operation.Properties.StatusCode, out statusCode);

diff --git a/src/Resources/Resources.Test/ScenarioTests/DeploymentTests.cs b/src/Resources/Resources.Test/ScenarioTests/DeploymentTests.cs
@@ -230,5 +230,19 @@ public void TestNewDeploymentFromTemplateAndParameterFileContainingTagsOutput()
         {
             TestRunner.RunTestScript("Test-NewDeploymentFromTemplateAndParameterFileContainingTagsOutput");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSymbolicNameDeployment()
+        {
+            TestRunner.RunTestScript("Test-SymbolicNameDeployment");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestExtensibleResourceDeployment()
+        {
+            TestRunner.RunTestScript("Test-ExtensibleResourceDeployment");
+        }
     }
 }