Fixes expand with direct outputs reference Azure#2935 (Azure#2940)

* Fixes expand with direct outputs reference Azure#2935

* Bump change log

Author: BernieWhite

docs/CHANGELOG-v1.md

@@ -31,9 +31,16 @@ See [upgrade notes][1] for helpful information when upgrading from previous vers
 
 What's changed since pre-release v1.38.0-B0011:
 
+- New rules:
+  - Azure Kubernetes Service:
+    - Added check to automatically upgrade AKS cluster node image by @sharmilamusunuru.
+      [#2445](https://github.com/Azure/PSRule.Rules.Azure/issues/2445)
 - Engineering:
   - Quality updates to rule documentation by @BernieWhite.
     [#2570](https://github.com/Azure/PSRule.Rules.Azure/issues/2570)
+- Bug fixes:
+  - Fixed failed to expand with direct outputs reference by @BernieWhite.
+    [#2935](https://github.com/Azure/PSRule.Rules.Azure/issues/2935)
 
 ## v1.38.0-B0011 (pre-release)
 

src/PSRule.Rules.Azure/Data/Template/DeploymentValue.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 using System;
@@ -59,7 +59,7 @@ public bool TryProperty(string propertyName, out object value)
             }
         }
 
-        private sealed class DeploymentOutputs : ILazyObject
+        private sealed class DeploymentOutputs : JObject, ILazyObject
         {
             private readonly DeploymentValue _Deployment;
 
@@ -77,6 +77,18 @@ public bool TryProperty(string propertyName, out object value)
                 value = lazy.GetValue();
                 return true;
             }
+
+            public override JToken this[object key]
+            {
+                get
+                {
+                    return key is string propertyName && TryProperty(propertyName, out var o) ? JToken.FromObject(o) : default;
+                }
+                set
+                {
+
+                }
+            }
         }
 
         public JObject Value => _Value.Value;

src/PSRule.Rules.Azure/Data/Template/ExpressionHelpers.cs

@@ -205,6 +205,9 @@ internal static bool TryPropertyOrField(object o, string propertyName, out objec
                 return true;
             }
 
+            if (o is ILazyObject lazy && lazy.TryProperty(propertyName, out value))
+                return true;
+
             if (o is JObject jObject)
             {
                 if (!jObject.TryGetValue(propertyName, StringComparison.OrdinalIgnoreCase, out var propertyToken))
@@ -224,9 +227,6 @@ internal static bool TryPropertyOrField(object o, string propertyName, out objec
                 return true;
             }
 
-            if (o is ILazyObject lazy && lazy.TryProperty(propertyName, out value))
-                return true;
-
             // Try dictionary
             if (o is IDictionary dictionary && dictionary.TryGetValue(propertyName, out value))
                 return true;

tests/PSRule.Rules.Azure.Tests/PSRule.Rules.Azure.Tests.csproj

@@ -257,6 +257,9 @@
     <None Update="Tests.Bicep.4.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Tests.Bicep.40.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Tests.Bicep.5.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

tests/PSRule.Rules.Azure.Tests/TemplateVisitorTests.cs

@@ -1249,6 +1249,21 @@ public void ProcessTemplate_WhenUsingSpreadOperator_ReturnsSingleObject()
             Assert.Equal(new string[] { "bar" }, output["value"].Values<string>());
         }
 
+        /// <summary>
+        /// Test case for https://github.com/Azure/PSRule.Rules.Azure/issues/2935
+        /// </summary>
+        [Fact]
+        public void ProcessTemplate_WhenOutputsPropertyDirectly_ReturnsObject()
+        {
+            _ = ProcessTemplate(GetSourcePath("Tests.Bicep.40.json"), null, out var templateContext);
+
+            Assert.True(templateContext.RootDeployment.TryOutput("items", out JObject output));
+            var items = output["value"].Value<JArray>();
+
+            Assert.Equal("/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/ps-rule-test-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/child", items[0].Value<string>());
+            Assert.NotNull(items[1].Value<JObject>());
+        }
+
         #region Helper methods
 
         private static string GetSourcePath(string fileName)

tests/PSRule.Rules.Azure.Tests/Tests.Bicep.40.bicep

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+// Test case for https://github.com/Azure/PSRule.Rules.Azure/issues/2935
+
+module child './Tests.Bicep.40.child.bicep' = {
+  name: 'child'
+  params: {
+    name: 'child'
+  }
+}
+
+output items array = union([child.outputs.id, child.outputs], [])

tests/PSRule.Rules.Azure.Tests/Tests.Bicep.40.child.bicep

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+param name string
+param location string = resourceGroup().location
+
+resource identity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
+  name: name
+  location: location
+}
+
+output id string = identity.id

tests/PSRule.Rules.Azure.Tests/Tests.Bicep.40.json

@@ -0,0 +1,69 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "metadata": {
+    "_generator": {
+      "name": "bicep",
+      "version": "0.28.1.47646",
+      "templateHash": "3288768750295631438"
+    }
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2022-09-01",
+      "name": "child",
+      "properties": {
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "mode": "Incremental",
+        "parameters": {
+          "name": {
+            "value": "child"
+          }
+        },
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "metadata": {
+            "_generator": {
+              "name": "bicep",
+              "version": "0.28.1.47646",
+              "templateHash": "4224472757695175223"
+            }
+          },
+          "parameters": {
+            "name": {
+              "type": "string"
+            },
+            "location": {
+              "type": "string",
+              "defaultValue": "[resourceGroup().location]"
+            }
+          },
+          "resources": [
+            {
+              "type": "Microsoft.ManagedIdentity/userAssignedIdentities",
+              "apiVersion": "2023-01-31",
+              "name": "[parameters('name')]",
+              "location": "[parameters('location')]"
+            }
+          ],
+          "outputs": {
+            "id": {
+              "type": "string",
+              "value": "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('name'))]"
+            }
+          }
+        }
+      }
+    }
+  ],
+  "outputs": {
+    "items": {
+      "type": "array",
+      "value": "[union(createArray(reference(resourceId('Microsoft.Resources/deployments', 'child'), '2022-09-01').outputs.id.value, reference(resourceId('Microsoft.Resources/deployments', 'child'), '2022-09-01').outputs), createArray())]"
+    }
+  }
+}