Merge pull request #4027 from NikCharlebois/Integration-Test-Improvem…

…ents Fixes Examples
microsoft · Dec 12, 2023 · 060a537 · 060a537
2 parents db57a10 + 779ce98
commit 060a537
Show file tree

Hide file tree

Showing 426 changed files with 958 additions and 965 deletions.
diff --git a/.github/workflows/Global - Integration - INTUNE.yml b/.github/workflows/Global - Integration - INTUNE.yml
@@ -44,3 +44,12 @@ jobs:
           git push
           $SHA = git rev-parse HEAD
           echo "commitid=$SHA" >> $env:GITHUB_OUTPUT
+      - name: Commit Integration Tests
+        shell: pwsh
+        env:
+          PUBLIC_USERNAME: ${{ secrets.PUBLIC_USERNAME }}
+          PUBLIC_PASSWORD: ${{ secrets.PUBLIC_PASSWORD }}
+        run: |
+          $CredPassword = ConvertTo-SecureString $env:PUBLIC_PASSWORD -AsPlainText -Force
+          $Credential = New-Object System.Management.Automation.PSCredential ($env:PUBLIC_USERNAME, $CredPassword)
+          .\Tests\Integration\Microsoft365DSC\M365DSCIntegration.INTUNE.Tests.ps1 -Credential $Credential
diff --git a/...icrosoft365DSC/Examples/Resources/AADAdministrativeUnit/1-CreateNewAdministrativeUnit.ps1 b/...icrosoft365DSC/Examples/Resources/AADAdministrativeUnit/1-CreateNewAdministrativeUnit.ps1
@@ -9,7 +9,7 @@ Configuration Example
     (
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
 
     Import-DscResource -ModuleName Microsoft365DSC
@@ -24,7 +24,7 @@ Configuration Example
             MembershipRuleProcessingState = 'On'
             MembershipType                = 'Dynamic'
             Ensure                        = 'Present'
-            Credential                    = $credsGlobalAdmin
+            Credential                    = $Credscredential
         }
     }
 }
diff --git a/...icrosoft365DSC/Examples/Resources/AADAdministrativeUnit/2-CreateNewAdministrativeUnit.ps1 b/...icrosoft365DSC/Examples/Resources/AADAdministrativeUnit/2-CreateNewAdministrativeUnit.ps1
@@ -9,7 +9,7 @@ Configuration Example
     (
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
 
     Import-DscResource -ModuleName Microsoft365DSC
@@ -25,7 +25,7 @@ Configuration Example
             MailEnabled                   = $false
             IsAssignableToRole            = $true
             Ensure                        = "Present"
-            Credential                    = $credsGlobalAdmin
+            Credential                    = $Credscredential
         }
         AADAdministrativeUnit 'TestUnit'
         {
@@ -43,7 +43,7 @@ Configuration Example
                 }
             )
             Ensure                        = 'Present'
-            Credential                    = $credsGlobalAdmin
+            Credential                    = $Credscredential
             DependsOn                     = "[AADGroup]TestGroup"
         }
     }

diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADApplication/1-ConfigureAADApplication.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADApplication/1-ConfigureAADApplication.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -49,7 +49,7 @@ Configuration Example
                 }
             )
             Ensure                    = "Present"
-            Credential                = $credsGlobalAdmin
+            Credential                = $Credscredential
         }
     }
 }
diff --git a/...oft365DSC/Examples/Resources/AADAuthorizationPolicy/1-ConfigureAADAuthorizationPolicy.ps1 b/...oft365DSC/Examples/Resources/AADAuthorizationPolicy/1-ConfigureAADAuthorizationPolicy.ps1
@@ -9,7 +9,7 @@ Configuration Example
     (
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
 
     Import-DscResource -ModuleName Microsoft365DSC
@@ -32,7 +32,7 @@ Configuration Example
             GuestUserRole                                     = 'Guest'
             PermissionGrantPolicyIdsAssignedToDefaultUserRole = @()
             Ensure                                            = 'Present'
-            Credential                                        = $credsGlobalAdmin
+            Credential                                        = $Credscredential
         }
     }
 }
diff --git a/...C/Examples/Resources/AADConditionalAccessPolicy/1-ConfigureAADConditionalAccessPolicy.ps1 b/...C/Examples/Resources/AADConditionalAccessPolicy/1-ConfigureAADConditionalAccessPolicy.ps1
@@ -9,7 +9,7 @@ Configuration Example
     (
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -52,7 +52,7 @@ Configuration Example
             State                                = 'disabled'
             UserRiskLevels                       = @('High', 'Medium')
             Ensure                               = 'Present'
-            Credential                           = $credsGlobalAdmin
+            Credential                           = $Credscredential
         }
     }
 }
diff --git a/...ADEntitlementManagementAccessPackage/1-ConfigureAADEntitlementManagementAccessPackage.ps1 b/...ADEntitlementManagementAccessPackage/1-ConfigureAADEntitlementManagementAccessPackage.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -33,7 +33,7 @@ Configuration Example
             AccessPackagesIncompatibleWith  = @()
             IncompatibleGroups              = @()
             Ensure                          = 'Present'
-            Credential                      = $credsGlobalAdmin
+            Credential                      = $Credscredential
         }
     }
 }
diff --git a/...kageAssignmentPolicy/1-ConfigureAADEntitlementManagementAccessPackageAssignmentPolicy.ps1 b/...kageAssignmentPolicy/1-ConfigureAADEntitlementManagementAccessPackageAssignmentPolicy.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -51,7 +51,7 @@ Configuration Example
                 ScopeType = 'SpecificConnectedOrganizationSubjects'
             };
             Ensure                     = "Present"
-            Credential                 = $credsGlobalAdmin
+            Credential                 = $Credscredential
         }
     }
 }
diff --git a/...kageAssignmentPolicy/2-ConfigureAADEntitlementManagementAccessPackageAssignmentPolicy.ps1 b/...kageAssignmentPolicy/2-ConfigureAADEntitlementManagementAccessPackageAssignmentPolicy.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -18,7 +18,7 @@ Configuration Example
         {
             AccessPackageId         = "5d05114c-b4d9-4ae7-bda6-4bade48e60f2";
             CanExtend               = $False;
-            Credential              = $credsGlobalAdmin
+            Credential              = $Credscredential
             Description             = "Initial Policy";
             DisplayName             = "Initial Policy";
             DurationInDays          = 365;

diff --git a/...anagementAccessPackageCatalog/1-ConfigureAADEntitlementManagementAccessPackageCatalog.ps1 b/...anagementAccessPackageCatalog/1-ConfigureAADEntitlementManagementAccessPackageCatalog.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -24,7 +24,7 @@ Configuration Example
             IsExternallyVisible = $True
             Managedidentity     = $False
             Ensure              = 'Present'
-            Credential          = $credsGlobalAdmin
+            Credential          = $Credscredential
         }
     }
 }
diff --git a/...ackageCatalogResource/1-ConfigureAADEntitlementManagementAccessPackageCatalogResource.ps1 b/...ackageCatalogResource/1-ConfigureAADEntitlementManagementAccessPackageCatalogResource.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -28,7 +28,7 @@ Configuration Example
             ResourceType        = 'SharePoint Online Site'
             Url                 = 'https://contoso.sharepoint.com/'
             Ensure              = 'Present'
-            Credential          = $credsGlobalAdmin
+            Credential          = $Credscredential
         }
     }
 }
diff --git a/...sources/AADEntitlementManagementConnectedOrganization/Configure_ConnectedOrganization.ps1 b/...sources/AADEntitlementManagementConnectedOrganization/Configure_ConnectedOrganization.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -30,7 +30,7 @@ Configuration Example
             InternalSponsors      = @("12345678-1234-1234-1234-123456789012");
             State                 = "configured";
             Ensure                = "Present"
-            Credential            = $credsGlobalAdmin
+            Credential            = $Credscredential
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADGroup/1-ConfigureAADGroups.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADGroup/1-ConfigureAADGroups.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -24,7 +24,7 @@ Configuration Example
             MailNickname    = "M365DSC"
             Visibility      = "Private"
             Ensure          = "Present"
-            Credential      = $credsGlobalAdmin
+            Credential      = $Credscredential
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADGroup/2-ConfigureAADGroups.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADGroup/2-ConfigureAADGroups.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -25,7 +25,7 @@ Configuration Example
             Ensure             = "Present"
             IsAssignableToRole = $True
             AssignedToRole     = "Identity Governance Administrator"
-            Credential         = $credsGlobalAdmin
+            Credential         = $Credscredential
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADGroup/3-ConfigureAADGroups.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADGroup/3-ConfigureAADGroups.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -23,7 +23,7 @@ Configuration Example
             GroupTypes         = @()
             MailNickname       = "M365DSCG"
             Ensure             = "Present"
-            Credential         = $credsGlobalAdmin
+            Credential         = $Credscredential
         }
         AADGroup 'MyGroups2'
         {
@@ -35,7 +35,7 @@ Configuration Example
             MailNickname       = "M365DSCMG"
             Ensure             = "Present"
             MemberOf           = @("DSCGroup")
-            Credential         = $credsGlobalAdmin
+            Credential         = $Credscredential
         }
     }
 }
diff --git a/...soft365DSC/Examples/Resources/AADGroupLifecyclePolicy/1-ConfigureGroupLifecyclePolicy.ps1 b/...soft365DSC/Examples/Resources/AADGroupLifecyclePolicy/1-ConfigureGroupLifecyclePolicy.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -21,7 +21,7 @@ Configuration Example
             GroupLifetimeInDays         = 99
             ManagedGroupTypes           = "Selected"
             Ensure                      = "Present"
-            Credential                  = $credsGlobalAdmin
+            Credential                  = $Credscredential
         }
     }
 }
diff --git a/...icrosoft365DSC/Examples/Resources/AADGroupsNamingPolicy/1-ConfigureGroupsNamingPolicy.ps1 b/...icrosoft365DSC/Examples/Resources/AADGroupsNamingPolicy/1-ConfigureGroupsNamingPolicy.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -20,7 +20,7 @@ Configuration Example
             CustomBlockedWordsList        = @("CEO", "President")
             PrefixSuffixNamingRequirement = "[Title]Test[Company][GroupName][Office]Redmond"
             Ensure                        = "Present"
-            Credential                    = $credsGlobalAdmin
+            Credential                    = $Credscredential
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADGroupsSettings/1-ConfigureGroupsSettings.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADGroupsSettings/1-ConfigureGroupsSettings.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -25,7 +25,7 @@ Configuration Example
             GuestUsageGuidelinesUrl       = "https://contoso.com/guestusage"
             UsageGuidelinesUrl            = "https://contoso.com/usage"
             Ensure                        = "Present"
-            Credential                    = $credsGlobalAdmin
+            Credential                    = $Credscredential
         }
     }
 }
diff --git a/...oft365DSC/Examples/Resources/AADNamedLocationPolicy/1-ConfigureAADNamedLocationPolicy.ps1 b/...oft365DSC/Examples/Resources/AADNamedLocationPolicy/1-ConfigureAADNamedLocationPolicy.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -21,7 +21,7 @@ Configuration Example
             IsTrusted   = $True
             OdataType   = "#microsoft.graph.ipNamedLocation"
             Ensure      = "Present"
-            Credential  = $credsGlobalAdmin
+            Credential  = $Credscredential
         }
         AADNamedLocationPolicy 'AllowedCountries'
         {
@@ -30,7 +30,7 @@ Configuration Example
             IncludeUnknownCountriesAndRegions = $False
             OdataType                         = "#microsoft.graph.countryNamedLocation"
             Ensure                            = "Present"
-            Credential                        = $credsGlobalAdmin
+            Credential                        = $Credscredential
         }
     }
 }
diff --git a/...les/Microsoft365DSC/Examples/Resources/AADRoleDefinition/1-ConfigureAADRoleDefinition.ps1 b/...les/Microsoft365DSC/Examples/Resources/AADRoleDefinition/1-ConfigureAADRoleDefinition.ps1
@@ -8,7 +8,7 @@ Configuration Example
     param(
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
@@ -23,7 +23,7 @@ Configuration Example
             RolePermissions               = "microsoft.directory/applicationPolicies/allProperties/read","microsoft.directory/applicationPolicies/allProperties/update","microsoft.directory/applicationPolicies/basic/update"
             Version                       = "1.0"
             Ensure                        = "Present"
-            Credential                    = $credsGlobalAdmin
+            Credential                    = $Credscredential
         }
     }
 }
diff --git a/...ources/AADRoleEligibilityScheduleRequest/1-CreateNewAADRoleEligibilityScheduleRequest.ps1 b/...ources/AADRoleEligibilityScheduleRequest/1-CreateNewAADRoleEligibilityScheduleRequest.ps1
@@ -9,7 +9,7 @@ Configuration Example
     (
         [Parameter(Mandatory = $true)]
         [PSCredential]
-        $credsGlobalAdmin
+        $Credscredential
     )
 
     Import-DscResource -ModuleName Microsoft365DSC
@@ -19,7 +19,7 @@ Configuration Example
         AADRoleEligibilityScheduleRequest "MyRequest"
         {
             Action               = "AdminAssign";
-            Credential           = $credsGlobalAdmin;
+            Credential           = $Credscredential;
             DirectoryScopeId     = "/";
             Ensure               = "Present";
             IsValidationOnly     = $False;