Added additional constructor for AzOpsRoleEligibilityScheduleRequest (A…

…zure#902) * Added additional constructor for AzOpsRoleEligibilityScheduleRequest * Update * BumpVersion * Update * Update * Update --------- Co-authored-by: Jesper Fajers <[email protected]>
Jefajers · Dec 11, 2024 · c47f29e · c47f29e
1 parent c3ad03a
commit c47f29e
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 9 deletions.
diff --git a/src/AzOps.psd1 b/src/AzOps.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Customer Architecture Team (CAT)
 #
-# Generated on: 09/09/2024
+# Generated on: 12/2/2024
 #
 
 @{
@@ -51,11 +51,11 @@ PowerShellVersion = '7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'PSFramework'; RequiredVersion = '1.11.343'; }, 
-               @{ModuleName = 'Az.Accounts'; RequiredVersion = '3.0.4'; }, 
-               @{ModuleName = 'Az.Billing'; RequiredVersion = '2.0.4'; }, 
-               @{ModuleName = 'Az.ResourceGraph'; RequiredVersion = '1.0.0'; }, 
-               @{ModuleName = 'Az.Resources'; RequiredVersion = '7.4.0'; })
+RequiredModules = @(@{ModuleName = 'PSFramework'; RequiredVersion = '1.12.346'; }, 
+               @{ModuleName = 'Az.Accounts'; RequiredVersion = '4.0.0'; }, 
+               @{ModuleName = 'Az.Billing'; RequiredVersion = '2.1.0'; }, 
+               @{ModuleName = 'Az.ResourceGraph'; RequiredVersion = '1.0.1'; }, 
+               @{ModuleName = 'Az.Resources'; RequiredVersion = '7.6.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

diff --git a/src/internal/classes/AzOpsRoleEligibilityScheduleRequest.ps1 b/src/internal/classes/AzOpsRoleEligibilityScheduleRequest.ps1
@@ -20,8 +20,29 @@
                 StartDateTime  = $roleEligibilitySchedule.StartDateTime
             }
         }
-        $this.Id = $roleEligibilityScheduleRequest.Id
+        $this.Id = $roleEligibilitySchedule.RequestId
         $this.Name = $roleEligibilitySchedule.Name
         $this.ResourceType = $roleEligibilityScheduleRequest.Type
     }
+
+    AzOpsRoleEligibilityScheduleRequest($roleEligibilitySchedule) {
+        $this.Properties = [ordered]@{
+            Condition = $roleEligibilitySchedule.Condition
+            ConditionVersion = $roleEligibilitySchedule.ConditionVersion
+            PrincipalId = $roleEligibilitySchedule.PrincipalId
+            RoleDefinitionId = $roleEligibilitySchedule.RoleDefinitionId
+            RequestType = "AdminAssign"
+            ScheduleInfo = [ordered]@{
+                Expiration = [ordered]@{
+                    EndDateTime = $roleEligibilitySchedule.EndDateTime
+                    Duration = $roleEligibilitySchedule.ExpirationDuration
+                    ExpirationType = if ($roleEligibilitySchedule.ExpirationType) {$roleEligibilitySchedule.ExpirationType.ToString()}
+                }
+                StartDateTime  = $roleEligibilitySchedule.StartDateTime
+            }
+        }
+        $this.Id = $roleEligibilitySchedule.RequestId
+        $this.Name = $roleEligibilitySchedule.Name
+        $this.ResourceType = "Microsoft.Authorization/roleEligibilityScheduleRequests"
+    }
 }
diff --git a/src/internal/functions/Get-AzOpsRoleEligibilityScheduleRequest.ps1 b/src/internal/functions/Get-AzOpsRoleEligibilityScheduleRequest.ps1
@@ -30,12 +30,18 @@
         if ($roleEligibilitySchedules) {
             foreach ($roleEligibilitySchedule in $roleEligibilitySchedules) {
                 # Process roleEligibilitySchedule together with RoleEligibilityScheduleRequest
+                $roleEligibilityScheduleRequest = $null
                 $roleEligibilityScheduleRequest = Get-AzRoleEligibilityScheduleRequest -Scope $ScopeObject.Scope -Name $roleEligibilitySchedule.Name -ErrorAction SilentlyContinue
                 if ($roleEligibilityScheduleRequest) {
                     Write-AzOpsMessage -LogLevel Debug -LogString 'Get-AzOpsRoleEligibilityScheduleRequest.Assignment' -LogStringValues $roleEligibilitySchedule.Name -Target $ScopeObject
                     # Construct AzOpsRoleEligibilityScheduleRequest by combining information from roleEligibilitySchedule and roleEligibilityScheduleRequest
                     [AzOpsRoleEligibilityScheduleRequest]::new($roleEligibilitySchedule, $roleEligibilityScheduleRequest)
                 }
+                else {
+                    Write-AzOpsMessage -LogLevel Verbose -LogString 'Get-AzOpsRoleEligibilityScheduleRequest.Processing.NotFound' -LogStringValues $ScopeObject.Scope, $roleEligibilitySchedule.Name -Target $ScopeObject
+                    # Construct AzOpsRoleEligibilityScheduleRequest from roleEligibilitySchedule since no AzRoleEligibilityScheduleRequest was found
+                    [AzOpsRoleEligibilityScheduleRequest]::new($roleEligibilitySchedule)
+                }
             }
         }
     }

diff --git a/src/localized/en-us/Strings.psd1 b/src/localized/en-us/Strings.psd1
@@ -132,6 +132,7 @@
     'Get-AzOpsRoleDefinition.Definition'                                            = 'Processing object {0}' # $roleDefinition.id
 
     'Get-AzOpsRoleEligibilityScheduleRequest.Processing'                            = 'Retrieving Privileged Identity Management RoleEligibilitySchedule at [{0}]' # $ScopeObject.Scope
+    'Get-AzOpsRoleEligibilityScheduleRequest.Processing.NotFound'                   = 'No RoleEligibilityScheduleRequest found at [{0}] for RoleEligibilitySchedule [{1}], creating template based on RoleEligibilitySchedule' # $ScopeObject.Scope, $roleEligibilitySchedule.Name
     'Get-AzOpsRoleEligibilityScheduleRequest.Assignment'                            = 'Found Privileged Identity Management RoleEligibilityScheduleRequest assignment [{0}]' # $roleEligibilitySchedule.Name
 
     'Get-AzOpsSubscription.Excluded.Offers'                                         = 'Excluded subscription offers: {0}' # ($ExcludedOffers -join ',')

diff --git a/src/tests/templates/azuredeploy.jsonc b/src/tests/templates/azuredeploy.jsonc
@@ -421,7 +421,7 @@
                             "name": "TestPolicyAssignment",
                             "properties": {
                                 "metadata": {
-                                    "customkey": "customvalue",
+                                    "customkey": "customvalue"
                                 },
                                 "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/0a914e76-4921-4c19-b460-a2d36003525a"
                             }
@@ -551,7 +551,7 @@
                         },
                         {
                             "type": "Microsoft.Authorization/policyExemptions",
-                            "apiVersion": "2020-07-01-preview",
+                            "apiVersion": "2022-07-01-preview",
                             "name": "PolicyExemptionTest",
                             "properties": {
                                 "displayName": "TestPolicyAssignment - PolicyExemptionTest",