Merge pull request #4886 from NikCharlebois/Tests-Improvements

Testing Dependencies in Tests
microsoft · Jul 15, 2024 · 47b616c · 47b616c
2 parents 05c00ef + 0d8e6a0
commit 47b616c
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 7 deletions.
diff --git a/...cessPackageCatalogResource/MSFT_AADEntitlementManagementAccessPackageCatalogResource.psm1 b/...cessPackageCatalogResource/MSFT_AADEntitlementManagementAccessPackageCatalogResource.psm1
@@ -183,7 +183,7 @@ function Get-TargetResource
             Description           = $getValue.description
             DisplayName           = $getValue.displayName
             IsPendingOnboarding   = $getValue.isPendingOnboarding #Read-Only
-            OriginId              = $getValue.originId
+            OriginId              = $OriginId
             OriginSystem          = $getValue.originSystem
             ResourceType          = $getValue.resourceType
             Url                   = $getValue.url
@@ -336,9 +336,20 @@ function Set-TargetResource
     $PSBoundParameters.Remove('isPendingOnboarding') | Out-Null
     $PSBoundParameters.Remove('AccessTokens') | Out-Null
 
+    $resource = ([Hashtable]$PSBoundParameters).clone()
+    $ObjectGuid = [System.Guid]::empty
+    if ($OriginSystem -eq 'AADGroup' -and `
+        -not [System.Guid]::TryParse($OriginId, [System.Management.Automation.PSReference]$ObjectGuid))
+    {
+        Write-Verbose -Message "The Group reference was provided by name {$OriginId}. Retrieving associated id."
+        $groupInfo = Get-MgGroup -Filter "DisplayName eq '$OriginId'"
+        if ($null -ne $groupInfo)
+        {
+            $resource.OriginId = $groupInfo.Id
+        }
+    }
     if ($Ensure -eq 'Present' -and $currentInstance.Ensure -eq 'Absent')
     {
-        $resource = ([Hashtable]$PSBoundParameters).clone()
         $ObjectGuid = [System.Guid]::empty
         if (-not [System.Guid]::TryParse($CatalogId, [System.Management.Automation.PSReference]$ObjectGuid))
         {

diff --git a/...5DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/1-Create.ps1 b/...5DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/1-Create.ps1
@@ -22,14 +22,29 @@ Configuration Example
 
     node localhost
     {
+        AADGroup 'MyGroups'
+        {
+            DisplayName     = "MyGroup"
+            Description     = "Microsoft DSC Group"
+            SecurityEnabled = $True
+            MailEnabled     = $True
+            GroupTypes      = @("Unified")
+            MailNickname    = "MyGroup"
+            Visibility      = "Private"
+            Owners          = @("admin@$TenantId", "AdeleV@$TenantId")
+            Ensure          = "Present"
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            CertificateThumbprint = $CertificateThumbprint
+        }
         AADEntitlementManagementAccessPackageCatalogResource 'myAccessPackageCatalogResource'
         {
             ApplicationId         = $ApplicationId;
             CatalogId             = "My Catalog";
             CertificateThumbprint = $CertificateThumbprint;
-            DisplayName           = "Finance Team";
+            DisplayName           = "MyGroup";
             OriginSystem          = "AADGroup";
-            OriginId              = '50523ab8-a3d2-4b4f-a77d-16bd1abd328f'
+            OriginId              = 'MyGroup'
             Ensure                = "Present";
             IsPendingOnboarding   = $False;
             TenantId              = $TenantId;

diff --git a/...5DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/2-Update.ps1 b/...5DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/2-Update.ps1
@@ -22,14 +22,29 @@ Configuration Example
 
     node localhost
     {
+        AADGroup 'MyGroups'
+        {
+            DisplayName     = "MyGroup"
+            Description     = "Microsoft DSC Group"
+            SecurityEnabled = $True
+            MailEnabled     = $True
+            GroupTypes      = @("Unified")
+            MailNickname    = "MyGroup"
+            Visibility      = "Private"
+            Owners          = @("admin@$TenantId", "AdeleV@$TenantId")
+            Ensure          = "Present"
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            CertificateThumbprint = $CertificateThumbprint
+        }
         AADEntitlementManagementAccessPackageCatalogResource 'myAccessPackageCatalogResource'
         {
             ApplicationId         = $ApplicationId;
             CatalogId             = "My Catalog";
             CertificateThumbprint = $CertificateThumbprint;
-            DisplayName           = "Finance Team";
+            DisplayName           = "DSCGroup";
             OriginSystem          = "AADGroup";
-            OriginId              = '50523ab8-a3d2-4b4f-a77d-16bd1abd328f'
+            OriginId              = '849b3661-61a8-44a8-92e7-fcc91d296235'
             Ensure                = "Present";
             IsPendingOnboarding   = $False;
             TenantId              = $TenantId;

diff --git a/...5DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/3-Remove.ps1 b/...5DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/3-Remove.ps1
@@ -22,9 +22,24 @@ Configuration Example
 
     node localhost
     {
+        AADGroup 'MyGroups'
+        {
+            DisplayName     = "MyGroup"
+            Description     = "Microsoft DSC Group"
+            SecurityEnabled = $True
+            MailEnabled     = $True
+            GroupTypes      = @("Unified")
+            MailNickname    = "MyGroup"
+            Visibility      = "Private"
+            Owners          = @("admin@$TenantId", "AdeleV@$TenantId")
+            Ensure          = "Absent"
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            CertificateThumbprint = $CertificateThumbprint
+        }
         AADEntitlementManagementAccessPackageCatalogResource 'myAccessPackageCatalogResource'
         {
-            DisplayName         = 'Finance Team'
+            DisplayName         = 'DSCGroup'
             Ensure              = 'Absent'
             ApplicationId         = $ApplicationId
             TenantId              = $TenantId