Merge pull request #4870 from NikCharlebois/Tests-Improvements

Fixing Examples
microsoft · Jul 12, 2024 · 02313f5 · 02313f5
2 parents 1de104f + 48a9462
commit 02313f5
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 24 deletions.
diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADAdministrativeUnit/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADAdministrativeUnit/1-Create.ps1
@@ -20,7 +20,6 @@ Configuration Example
     )
 
     Import-DscResource -ModuleName Microsoft365DSC
-    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         AADAdministrativeUnit 'TestUnit'
@@ -36,7 +35,7 @@ Configuration Example
                     RoleName       = 'User Administrator'
                     RoleMemberInfo = MSFT_MicrosoftGraphMember
                     {
-                        Identity = "admin@$Domain"
+                        Identity = "admin@$TenantId"
                         Type     = "User"
                     }
                 }

diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADAdministrativeUnit/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADAdministrativeUnit/2-Update.ps1
@@ -20,7 +20,6 @@ Configuration Example
     )
 
     Import-DscResource -ModuleName Microsoft365DSC
-    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         AADAdministrativeUnit 'TestUnit'
@@ -37,7 +36,7 @@ Configuration Example
                     RoleName       = 'User Administrator'
                     RoleMemberInfo = MSFT_MicrosoftGraphMember
                     {
-                        Identity = "AdeleV@$Domain" # Updated Property
+                        Identity = "AdeleV@$TenantId" # Updated Property
                         Type     = "User"
                     }
                 }

diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADAdministrativeUnit/3-Remove.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADAdministrativeUnit/3-Remove.ps1
@@ -20,7 +20,6 @@ Configuration Example
     )
 
     Import-DscResource -ModuleName Microsoft365DSC
-    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         AADAdministrativeUnit 'TestUnit'

diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADApplication/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADApplication/1-Create.ps1
@@ -19,8 +19,6 @@ Configuration Example
         $CertificateThumbprint
     )
     Import-DscResource -ModuleName Microsoft365DSC
-
-    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         AADApplication 'AADApp1'
@@ -29,12 +27,12 @@ Configuration Example
             AvailableToOtherTenants   = $false
             Description               = "Application Description"
             GroupMembershipClaims     = "None"
-            Homepage                  = "https://$Domain"
-            IdentifierUris            = "https://$Domain"
+            Homepage                  = "https://$TenandId"
+            IdentifierUris            = "https://$TenandId"
             KnownClientApplications   = ""
-            LogoutURL                 = "https://$Domain/logout"
+            LogoutURL                 = "https://$TenandId/logout"
             PublicClient              = $false
-            ReplyURLs                 = "https://$Domain"
+            ReplyURLs                 = "https://$TenandId"
             Permissions               = @(
                 MSFT_AADApplicationPermission
                 {

diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADApplication/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADApplication/2-Update.ps1
@@ -20,7 +20,6 @@ Configuration Example
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
-    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         AADApplication 'AADApp1'
@@ -29,12 +28,12 @@ Configuration Example
             AvailableToOtherTenants   = $true # Updated Property
             Description               = "Application Description"
             GroupMembershipClaims     = "None"
-            Homepage                  = "https://$Domain"
-            IdentifierUris            = "https://$Domain"
+            Homepage                  = "https://$TenandId"
+            IdentifierUris            = "https://$TenandId"
             KnownClientApplications   = ""
-            LogoutURL                 = "https://$Domain/logout"
+            LogoutURL                 = "https://$TenandId/logout"
             PublicClient              = $false
-            ReplyURLs                 = "https://$Domain"
+            ReplyURLs                 = "https://$TenandId"
             Permissions               = @(
                 MSFT_AADApplicationPermission
                 {

diff --git a/...5DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/1-Create.ps1 b/...5DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/1-Create.ps1
@@ -20,19 +20,18 @@ Configuration Example
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
-    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         AADEntitlementManagementAccessPackageCatalogResource 'myAccessPackageCatalogResource'
         {
             DisplayName         = 'Human Resources'
             CatalogId           = 'My Catalog'
-            Description         = "https://$($Domain.Split('.')[0]).sharepoint.com/sites/HumanResources"
+            Description         = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
             IsPendingOnboarding = $true
-            OriginId            = "https://$($Domain.Split('.')[0]).sharepoint.com/sites/HumanResources"
+            OriginId            = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
             OriginSystem        = 'SharePointOnline'
             ResourceType        = 'SharePoint Online Site'
-            Url                 = "https://$($Domain.Split('.')[0]).sharepoint.com/sites/HumanResources"
+            Url                 = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
             Ensure              = 'Present'
             ApplicationId         = $ApplicationId
             TenantId              = $TenantId

diff --git a/...5DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/2-Update.ps1 b/...5DSC/Examples/Resources/AADEntitlementManagementAccessPackageCatalogResource/2-Update.ps1
@@ -20,19 +20,18 @@ Configuration Example
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
-    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         AADEntitlementManagementAccessPackageCatalogResource 'myAccessPackageCatalogResource'
         {
             DisplayName         = 'Human Resources'
             CatalogId           = 'My Catalog'
-            Description         = "https://$($Domain.Split('.')[0]).sharepoint.com/sites/HumanResources"
+            Description         = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
             IsPendingOnboarding = $false # Updated Property
-            OriginId            = "https://$($Domain.Split('.')[0]).sharepoint.com/sites/HumanResources"
+            OriginId            = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
             OriginSystem        = 'SharePointOnline'
             ResourceType        = 'SharePoint Online Site'
-            Url                 = "https://$($Domain.Split('.')[0]).sharepoint.com/sites/HumanResources"
+            Url                 = "https://$($TenantId.Split('.')[0]).sharepoint.com/sites/HumanResources"
             Ensure              = 'Present'
             ApplicationId         = $ApplicationId
             TenantId              = $TenantId