Fix abac condition not included in role definition payload 2 (#23904)

Co-authored-by: Ryan Ren <[email protected]>

Author: mumoryan

src/Resources/Resources.Test/ScenarioTests/RoleDefinitionTests.cs

@@ -117,6 +117,13 @@ public void RDGetScenario()
         {
             TestRunner.RunTestScript("Test-RDGet");
         }
+        
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void RDWithConditionGetScenario()
+        {
+            TestRunner.RunTestScript("Test-RDWithAbacConditionsGet");
+        }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]

src/Resources/Resources.Test/ScenarioTests/RoleDefinitionTests.ps1

@@ -12,6 +12,51 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
+<#
+.SYNOPSIS
+Tests verify scenarios for RoleDefinitions creation.
+#>
+function Test-RDWithAbacConditionsGet
+{
+    # Setup
+    $subscription = $(Get-AzContext).Subscription
+
+    $resource = Get-AzResource | Select-Object -Last 1 -Wait
+    Assert-NotNull $resource "Cannot find any resource to continue test execution."
+
+    $subScope = "/subscriptions/" + $subscription[0].SubscriptionId
+    $rgScope = "/subscriptions/" + $subscription[0].SubscriptionId + "/resourceGroups/" + $resource.ResourceGroupName
+    $resourceScope = $resource.ResourceId
+
+    # Task 1: Get Contributor role, verify condition doesn't exist
+    $roleDef1 = Get-AzRoleDefinition -Name "Reader"
+    Assert-AreEqual $roleDef1.Name "Reader"
+    Assert-AreEqual $false $roleDef1.IsCustom
+
+    # TODO: replace the active code with the commented Permissions check after the breaking change
+    # Assert-NotNull $roleDef1.Permissions
+    # Assert-True { $roleDef1.Permissions.Length -gt 0 }
+    # Assert-NotNull $roleDef1.Permissions[0].Actions
+    # Assert-True { $roleDef1.Permissions[0].Actions.Length -gt 0 }
+    Assert-NotNull $roleDef1.Actions
+    Assert-True { $roleDef1.Actions.Length -gt 0 }
+
+    # Task 2: Get Key Vault role, verify condition exists
+    $roleDef2 = Get-AzRoleDefinition -Id 8b54135c-b56d-4d72-a534-26097cfdc8d8
+    Assert-AreEqual $false $roleDef1.IsCustom
+
+    # TODO: replace the active code with the commented Permissions check after the breaking change
+    # Assert-NotNull $roleDef2.Permissions
+    # Assert-True { $roleDef2.Permissions.Length -gt 0 }
+    # Assert-NotNull $roleDef2.Permissions[0].Actions
+    # Assert-NotNull $roleDef2.Permissions[0].Condition
+    # Assert-NotNull $roleDef2.Permissions[0].ConditionVersion
+    Assert-NotNull $roleDef2.Actions
+    Assert-True { $roleDef2.Actions.Length -gt 0 }
+    Assert-NotNull $roleDef2.ConditionVersion
+    Assert-NotNull $roleDef2.Condition
+}
+
 <#
 .SYNOPSIS
 Tests verify scenarios for RoleDefinitions creation.

src/Resources/Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleDefinitionTests/RDFilter.json

@@ -6,16 +6,16 @@
       "RequestMethod": "GET",
       "RequestHeaders": {
         "x-ms-client-request-id": [
-          "8307b308-3ee7-47aa-96be-8a6a9c2cc774"
+          "a2f0c6f1-d216-4b32-95d9-f1c0e5ff9d6b"
         ],
         "Accept-Language": [
           "en-US"
         ],
         "User-Agent": [
           "FxVersion/6.0.2523.51912",
           "OSName/Windows",
-          "OSVersion/Microsoft.Windows.10.0.23606",
-          "Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/6.12.0"
+          "OSVersion/Microsoft.Windows.10.0.23612",
+          "Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/6.13.0"
         ]
       },
       "RequestBody": "",
@@ -27,7 +27,7 @@
           "no-cache"
         ],
         "x-ms-request-id": [
-          "b8bbf362-9f8a-4e3e-ad5d-885818fa77a4"
+          "71225889-740a-4338-8a27-87cce6222d6d"
         ],
         "X-Content-Type-Options": [
           "nosniff"
@@ -39,16 +39,16 @@
           "x-ms-gateway-slice=Production; path=/; secure; samesite=none; httponly"
         ],
         "x-ms-ratelimit-remaining-subscription-reads": [
-          "11998"
+          "11999"
         ],
         "x-ms-correlation-request-id": [
-          "a6cb0a47-a7ad-43d6-91c3-ad88f16e5818"
+          "5cc130f2-2628-4594-bfa8-9a36245d93e1"
         ],
         "x-ms-routing-request-id": [
-          "WESTUS2:20231219T080514Z:a6cb0a47-a7ad-43d6-91c3-ad88f16e5818"
+          "WESTUS2:20240109T031247Z:5cc130f2-2628-4594-bfa8-9a36245d93e1"
         ],
         "Date": [
-          "Tue, 19 Dec 2023 08:05:13 GMT"
+          "Tue, 09 Jan 2024 03:12:46 GMT"
         ],
         "Content-Length": [
           "627"
@@ -72,16 +72,16 @@
       "RequestMethod": "GET",
       "RequestHeaders": {
         "x-ms-client-request-id": [
-          "d7e52298-3f08-4933-b08b-25640b484d59"
+          "96c667b6-3d64-4d85-9516-0769d84908d3"
         ],
         "Accept-Language": [
           "en-US"
         ],
         "User-Agent": [
           "FxVersion/6.0.2523.51912",
           "OSName/Windows",
-          "OSVersion/Microsoft.Windows.10.0.23606",
-          "Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/6.12.0"
+          "OSVersion/Microsoft.Windows.10.0.23612",
+          "Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/6.13.0"
         ]
       },
       "RequestBody": "",
@@ -93,7 +93,7 @@
           "no-cache"
         ],
         "x-ms-request-id": [
-          "6e0db89b-3f49-4a3b-8d28-29f39ed52529"
+          "28c5c972-c565-4dfa-a680-f79bc39894bc"
         ],
         "X-Content-Type-Options": [
           "nosniff"
@@ -105,16 +105,16 @@
           "x-ms-gateway-slice=Production; path=/; secure; samesite=none; httponly"
         ],
         "x-ms-ratelimit-remaining-subscription-reads": [
-          "11998"
+          "11999"
         ],
         "x-ms-correlation-request-id": [
-          "3a09c70f-f6d0-4b8b-a126-f0a9b82701ed"
+          "6f095309-4a48-45ae-b3d1-b292099bf206"
         ],
         "x-ms-routing-request-id": [
-          "WESTUS2:20231219T080514Z:3a09c70f-f6d0-4b8b-a126-f0a9b82701ed"
+          "WESTUS2:20240109T031247Z:6f095309-4a48-45ae-b3d1-b292099bf206"
         ],
         "Date": [
-          "Tue, 19 Dec 2023 08:05:13 GMT"
+          "Tue, 09 Jan 2024 03:12:47 GMT"
         ],
         "Content-Length": [
           "956286"