From 8127483f33ec471226056f3130d5c8a53b8954d5 Mon Sep 17 00:00:00 2001 From: Yorick Kuijs Date: Thu, 27 Feb 2020 20:45:50 +0100 Subject: [PATCH 1/5] Added logging of result in Test method --- .../MSFT_SPAccessServiceApp.psm1 | 14 +++++-- .../MSFT_SPAccessServices2010.psm1 | 6 ++- .../MSFT_SPAlternateUrl.psm1 | 8 +++- .../MSFT_SPAntivirusSettings.psm1 | 6 ++- .../MSFT_SPAppCatalog/MSFT_SPAppCatalog.psm1 | 6 ++- .../MSFT_SPAppDomain/MSFT_SPAppDomain.psm1 | 6 ++- .../MSFT_SPAppManagementServiceApp.psm1 | 7 +++- .../MSFT_SPAppStoreSettings.psm1 | 5 +++ .../MSFT_SPAuthenticationRealm.psm1 | 6 ++- ...T_SPAzureAccessControlServiceAppProxy.psm1 | 8 +++- .../MSFT_SPBCSServiceApp.psm1 | 6 ++- .../MSFT_SPBlobCacheSettings.psm1 | 9 +++- .../MSFT_SPCacheAccounts.psm1 | 8 +++- .../MSFT_SPConfigWizard.psm1 | 6 ++- .../MSFT_SPContentDatabase.psm1 | 7 +++- .../MSFT_SPDatabaseAAG.psm1 | 6 ++- .../MSFT_SPDesignerSettings.psm1 | 6 ++- .../MSFT_SPDiagnosticLoggingSettings.psm1 | 6 ++- .../MSFT_SPDiagnosticsProvider.psm1 | 6 ++- ...MSFT_SPDistributedCacheClientSettings.psm1 | 6 ++- .../MSFT_SPDistributedCacheService.psm1 | 14 +++++-- .../MSFT_SPExcelServiceApp.psm1 | 9 ++++ .../DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 | 6 ++- .../MSFT_SPFarmAdministrators.psm1 | 2 + .../MSFT_SPFarmPropertyBag.psm1 | 6 ++- .../MSFT_SPFarmSolution.psm1 | 6 ++- .../MSFT_SPFeature/MSFT_SPFeature.psm1 | 7 +++- .../MSFT_SPHealthAnalyzerRuleState.psm1 | 6 ++- .../MSFT_SPIncomingEmailSettings.psm1 | 6 ++- .../MSFT_SPInfoPathFormsServiceConfig.psm1 | 6 ++- .../MSFT_SPInstall/MSFT_SPInstall.psm1 | 6 ++- .../MSFT_SPInstallLanguagePack.psm1 | 6 ++- .../MSFT_SPInstallPrereqs.psm1 | 18 ++++---- .../MSFT_SPIrmSettings.psm1 | 6 ++- .../MSFT_SPLogLevel/MSFT_SPLogLevel.psm1 | 10 ++++- .../MSFT_SPMachineTranslationServiceApp.psm1 | 5 ++- .../MSFT_SPManagedAccount.psm1 | 6 ++- .../MSFT_SPManagedMetaDataServiceApp.psm1 | 6 ++- ...FT_SPManagedMetadataServiceAppDefault.psm1 | 6 ++- .../MSFT_SPManagedPath.psm1 | 6 ++- .../MSFT_SPMinRoleCompliance.psm1 | 6 ++- ...FT_SPOAppPrincipalMgmtServiceAppProxy.psm1 | 8 +++- .../MSFT_SPOfficeOnlineServerBinding.psm1 | 6 ++- .../MSFT_SPOutgoingEmailSettings.psm1 | 6 ++- .../MSFT_SPPasswordChangeSettings.psm1 | 6 ++- .../MSFT_SPPerformancePointServiceApp.psm1 | 6 ++- ...MSFT_SPPowerPointAutomationServiceApp.psm1 | 8 +++- .../MSFT_SPProductUpdate.psm1 | 6 ++- ...SFT_SPProjectServerADResourcePoolSync.psm1 | 6 ++- ...SFT_SPProjectServerAdditionalSettings.psm1 | 6 ++- ...MSFT_SPProjectServerGlobalPermissions.psm1 | 6 ++- .../MSFT_SPProjectServerGroup.psm1 | 13 ++++-- .../MSFT_SPProjectServerLicense.psm1 | 6 ++- .../MSFT_SPProjectServerPermissionMode.psm1 | 5 ++- .../MSFT_SPProjectServerServiceApp.psm1 | 7 +++- ...MSFT_SPProjectServerTimeSheetSettings.psm1 | 6 ++- .../MSFT_SPProjectServerUserSyncSettings.psm1 | 6 ++- .../MSFT_SPProjectServerWssSettings.psm1 | 6 ++- .../MSFT_SPPublishServiceApplication.psm1 | 6 ++- .../MSFT_SPQuotaTemplate.psm1 | 15 +++++-- .../MSFT_SPRemoteFarmTrust.psm1 | 6 ++- .../MSFT_SPSearchAuthoritativePage.psm1 | 10 +++-- .../MSFT_SPSearchContentSource.psm1 | 42 ++++++++++++------- .../MSFT_SPSearchCrawlMapping.psm1 | 8 +++- .../MSFT_SPSearchCrawlRule.psm1 | 11 ++++- .../MSFT_SPSearchCrawlerImpactRule.psm1 | 8 +++- .../MSFT_SPSearchFileType.psm1 | 9 +++- .../MSFT_SPSearchIndexPartition.psm1 | 6 ++- .../MSFT_SPSearchManagedProperty.psm1 | 6 ++- .../MSFT_SPSearchMetadataCategory.psm1 | 6 ++- .../MSFT_SPSearchResultSource.psm1 | 6 ++- .../MSFT_SPSearchServiceApp.psm1 | 8 +++- .../MSFT_SPSearchServiceSettings.psm1 | 6 ++- .../MSFT_SPSearchTopology.psm1 | 6 ++- .../MSFT_SPSecureStoreServiceApp.psm1 | 8 +++- .../MSFT_SPSecurityTokenServiceConfig.psm1 | 6 ++- .../MSFT_SPSelfServiceSiteCreation.psm1 | 8 +++- .../MSFT_SPServiceAppPool.psm1 | 8 +++- .../MSFT_SPServiceAppProxyGroup.psm1 | 9 ++++ .../MSFT_SPServiceAppSecurity.psm1 | 3 ++ .../MSFT_SPServiceIdentity.psm1 | 6 ++- .../MSFT_SPServiceInstance.psm1 | 6 ++- .../MSFT_SPSessionStateService.psm1 | 8 +++- .../MSFT_SPShellAdmins.psm1 | 29 ++++++++++--- .../DSCResources/MSFT_SPSite/MSFT_SPSite.psm1 | 7 +++- .../MSFT_SPSitePropertyBag.psm1 | 7 +++- .../MSFT_SPSiteUrl/MSFT_SPSiteUrl.psm1 | 6 +++ .../MSFT_SPStateServiceApp.psm1 | 6 ++- ...MSFT_SPSubscriptionSettingsServiceApp.psm1 | 10 ++++- .../MSFT_SPTimerJobState.psm1 | 6 ++- .../MSFT_SPTrustedIdentityTokenIssuer.psm1 | 8 ++-- ...stedIdentityTokenIssuerProviderRealms.psm1 | 6 ++- .../MSFT_SPTrustedRootAuthority.psm1 | 8 +++- .../MSFT_SPTrustedSecurityTokenIssuer.psm1 | 6 ++- .../MSFT_SPUsageApplication.psm1 | 8 +++- .../MSFT_SPUserProfileProperty.psm1 | 8 +++- .../MSFT_SPUserProfileSection.psm1 | 8 +++- .../MSFT_SPUserProfileServiceApp.psm1 | 26 +++++++----- ...FT_SPUserProfileServiceAppPermissions.psm1 | 6 ++- .../MSFT_SPUserProfileSyncConnection.psm1 | 7 +++- .../MSFT_SPUserProfileSyncService.psm1 | 6 ++- .../MSFT_SPVisioServiceApp.psm1 | 6 ++- .../DSCResources/MSFT_SPWeb/MSFT_SPWeb.psm1 | 6 ++- .../MSFT_SPWebAppAuthentication.psm1 | 8 ++++ .../MSFT_SPWebAppBlockedFileTypes.psm1 | 6 ++- .../MSFT_SPWebAppClientCallableSettings.psm1 | 23 +++++++--- .../MSFT_SPWebAppGeneralSettings.psm1 | 6 ++- .../MSFT_SPWebAppPeoplePickerSettings.psm1 | 8 +++- .../MSFT_SPWebAppPermissions.psm1 | 18 ++++---- .../MSFT_SPWebAppPolicy.psm1 | 26 ++++++++---- .../MSFT_SPWebAppPropertyBag.psm1 | 7 +++- .../MSFT_SPWebAppProxyGroup.psm1 | 20 +++++---- .../MSFT_SPWebAppSiteUseAndDeletion.psm1 | 6 ++- .../MSFT_SPWebAppSuiteBar.psm1 | 9 +++- .../MSFT_SPWebAppThrottlingSettings.psm1 | 6 ++- .../MSFT_SPWebAppWorkflowSettings.psm1 | 6 ++- .../MSFT_SPWebApplication.psm1 | 7 +++- .../MSFT_SPWebApplicationAppDomain.psm1 | 6 ++- .../MSFT_SPWebApplicationExtension.psm1 | 7 +++- .../MSFT_SPWordAutomationServiceApp.psm1 | 6 ++- .../MSFT_SPWorkManagementServiceApp.psm1 | 8 +++- .../MSFT_SPWorkflowService.psm1 | 7 +++- 122 files changed, 777 insertions(+), 214 deletions(-) diff --git a/SharePointDsc/DSCResources/MSFT_SPAccessServiceApp/MSFT_SPAccessServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPAccessServiceApp/MSFT_SPAccessServiceApp.psm1 index 1baa515af..5fec153c2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAccessServiceApp/MSFT_SPAccessServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAccessServiceApp/MSFT_SPAccessServiceApp.psm1 @@ -191,12 +191,18 @@ function Test-TargetResource Write-Verbose -Message ("Specified database server does not match the actual " + ` "database server. This resource cannot move the database " + ` "to a different SQL instance.") - return $false + $result = $false + } + else + { + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -DesiredValues $PSBoundParameters ` + -ValuesToCheck @("Ensure") } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` - -DesiredValues $PSBoundParameters ` - -ValuesToCheck @("Ensure") + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPAccessServices2010/MSFT_SPAccessServices2010.psm1 b/SharePointDsc/DSCResources/MSFT_SPAccessServices2010/MSFT_SPAccessServices2010.psm1 index 9e25ce070..4ebfc75c9 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAccessServices2010/MSFT_SPAccessServices2010.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAccessServices2010/MSFT_SPAccessServices2010.psm1 @@ -191,9 +191,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "ApplicationPool", "Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPAlternateUrl/MSFT_SPAlternateUrl.psm1 b/SharePointDsc/DSCResources/MSFT_SPAlternateUrl/MSFT_SPAlternateUrl.psm1 index dea724ea6..e413e30b6 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAlternateUrl/MSFT_SPAlternateUrl.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAlternateUrl/MSFT_SPAlternateUrl.psm1 @@ -283,7 +283,7 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("WebAppName", ` "Zone", ` @@ -293,8 +293,12 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } diff --git a/SharePointDsc/DSCResources/MSFT_SPAntivirusSettings/MSFT_SPAntivirusSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPAntivirusSettings/MSFT_SPAntivirusSettings.psm1 index 8e36ef4f5..526037e0f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAntivirusSettings/MSFT_SPAntivirusSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAntivirusSettings/MSFT_SPAntivirusSettings.psm1 @@ -226,8 +226,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPAppCatalog/MSFT_SPAppCatalog.psm1 b/SharePointDsc/DSCResources/MSFT_SPAppCatalog/MSFT_SPAppCatalog.psm1 index f41c4d069..6b5d2c1af 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAppCatalog/MSFT_SPAppCatalog.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAppCatalog/MSFT_SPAppCatalog.psm1 @@ -176,9 +176,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SiteUrl") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPAppDomain/MSFT_SPAppDomain.psm1 b/SharePointDsc/DSCResources/MSFT_SPAppDomain/MSFT_SPAppDomain.psm1 index e629f00e7..3e23c751f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAppDomain/MSFT_SPAppDomain.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAppDomain/MSFT_SPAppDomain.psm1 @@ -96,9 +96,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AppDomain", "Prefix") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPAppManagementServiceApp/MSFT_SPAppManagementServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPAppManagementServiceApp/MSFT_SPAppManagementServiceApp.psm1 index 4865a5a9b..a672ad356 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAppManagementServiceApp/MSFT_SPAppManagementServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAppManagementServiceApp/MSFT_SPAppManagementServiceApp.psm1 @@ -302,10 +302,15 @@ function Test-TargetResource return $false } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", ` "Ensure") + + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPAppStoreSettings/MSFT_SPAppStoreSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPAppStoreSettings/MSFT_SPAppStoreSettings.psm1 index 83aee70d0..8726ca1d4 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAppStoreSettings/MSFT_SPAppStoreSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAppStoreSettings/MSFT_SPAppStoreSettings.psm1 @@ -151,6 +151,8 @@ function Test-TargetResource if ($null -eq $currentValues.WebAppUrl) { Write-Verbose -Message "Specified web application does not exist." + + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -158,6 +160,7 @@ function Test-TargetResource { if ($AllowAppPurchases -ne $CurrentValues.AllowAppPurchases) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -166,10 +169,12 @@ function Test-TargetResource { if ($AllowAppsForOffice -ne $CurrentValues.AllowAppsForOffice) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } + Write-Verbose -Message "Test-TargetResource returned true" return $true } diff --git a/SharePointDsc/DSCResources/MSFT_SPAuthenticationRealm/MSFT_SPAuthenticationRealm.psm1 b/SharePointDsc/DSCResources/MSFT_SPAuthenticationRealm/MSFT_SPAuthenticationRealm.psm1 index 02ebbc4c2..c247b1c1d 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAuthenticationRealm/MSFT_SPAuthenticationRealm.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAuthenticationRealm/MSFT_SPAuthenticationRealm.psm1 @@ -95,9 +95,13 @@ function Test-TargetResource() Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AuthenticationRealm") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPAzureAccessControlServiceAppProxy/MSFT_SPAzureAccessControlServiceAppProxy.psm1 b/SharePointDsc/DSCResources/MSFT_SPAzureAccessControlServiceAppProxy/MSFT_SPAzureAccessControlServiceAppProxy.psm1 index 3803bfe90..1a5e73d47 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAzureAccessControlServiceAppProxy/MSFT_SPAzureAccessControlServiceAppProxy.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAzureAccessControlServiceAppProxy/MSFT_SPAzureAccessControlServiceAppProxy.psm1 @@ -184,16 +184,20 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("MetadataServiceEndpointUri", "Ensure") } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPBCSServiceApp/MSFT_SPBCSServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPBCSServiceApp/MSFT_SPBCSServiceApp.psm1 index 853b04938..76e7aadf1 100644 --- a/SharePointDsc/DSCResources/MSFT_SPBCSServiceApp/MSFT_SPBCSServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPBCSServiceApp/MSFT_SPBCSServiceApp.psm1 @@ -269,9 +269,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPBlobCacheSettings/MSFT_SPBlobCacheSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPBlobCacheSettings/MSFT_SPBlobCacheSettings.psm1 index 9ea35abf0..fac052507 100644 --- a/SharePointDsc/DSCResources/MSFT_SPBlobCacheSettings/MSFT_SPBlobCacheSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPBlobCacheSettings/MSFT_SPBlobCacheSettings.psm1 @@ -374,18 +374,23 @@ function Test-TargetResource { if (-not (Test-Path -Path $Location)) { - Write-Verbose "Blob Cache Folder $Location does not exist" + Write-Verbose -Message "Blob Cache Folder $Location does not exist" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("EnableCache", "Location", "MaxSizeInGB", "FileType", "MaxAgeInSeconds") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPCacheAccounts/MSFT_SPCacheAccounts.psm1 b/SharePointDsc/DSCResources/MSFT_SPCacheAccounts/MSFT_SPCacheAccounts.psm1 index a47f88c71..98fb07a77 100644 --- a/SharePointDsc/DSCResources/MSFT_SPCacheAccounts/MSFT_SPCacheAccounts.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPCacheAccounts/MSFT_SPCacheAccounts.psm1 @@ -282,7 +282,7 @@ function Test-TargetResource if ($SetWebAppPolicy -eq $true) { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SuperUserAlias", ` "SuperReaderAlias", ` @@ -290,11 +290,15 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SuperUserAlias", ` "SuperReaderAlias") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPConfigWizard/MSFT_SPConfigWizard.psm1 b/SharePointDsc/DSCResources/MSFT_SPConfigWizard/MSFT_SPConfigWizard.psm1 index 8562a6d3e..5c03bf0a2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPConfigWizard/MSFT_SPConfigWizard.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPConfigWizard/MSFT_SPConfigWizard.psm1 @@ -317,9 +317,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPContentDatabase/MSFT_SPContentDatabase.psm1 b/SharePointDsc/DSCResources/MSFT_SPContentDatabase/MSFT_SPContentDatabase.psm1 index 2e6a67464..696a847ec 100644 --- a/SharePointDsc/DSCResources/MSFT_SPContentDatabase/MSFT_SPContentDatabase.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPContentDatabase/MSFT_SPContentDatabase.psm1 @@ -401,11 +401,16 @@ function Test-TargetResource Write-Verbose -Message ("Specified database server does not match the actual " + ` "database server. This resource cannot move the database " + ` "to a different SQL instance.") + Write-Verbose -Message "Test-TargetResource returned false" return $false } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPDatabaseAAG/MSFT_SPDatabaseAAG.psm1 b/SharePointDsc/DSCResources/MSFT_SPDatabaseAAG/MSFT_SPDatabaseAAG.psm1 index f1c12f5ce..26e1b8f6c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDatabaseAAG/MSFT_SPDatabaseAAG.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDatabaseAAG/MSFT_SPDatabaseAAG.psm1 @@ -295,8 +295,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "DatabaseName") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } diff --git a/SharePointDsc/DSCResources/MSFT_SPDesignerSettings/MSFT_SPDesignerSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPDesignerSettings/MSFT_SPDesignerSettings.psm1 index 0b2e048df..46f66fc19 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDesignerSettings/MSFT_SPDesignerSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDesignerSettings/MSFT_SPDesignerSettings.psm1 @@ -443,8 +443,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPDiagnosticLoggingSettings/MSFT_SPDiagnosticLoggingSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPDiagnosticLoggingSettings/MSFT_SPDiagnosticLoggingSettings.psm1 index 5eec23813..550b34e83 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDiagnosticLoggingSettings/MSFT_SPDiagnosticLoggingSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDiagnosticLoggingSettings/MSFT_SPDiagnosticLoggingSettings.psm1 @@ -361,8 +361,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPDiagnosticsProvider/MSFT_SPDiagnosticsProvider.psm1 b/SharePointDsc/DSCResources/MSFT_SPDiagnosticsProvider/MSFT_SPDiagnosticsProvider.psm1 index dd5588fc7..3fff6f35a 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDiagnosticsProvider/MSFT_SPDiagnosticsProvider.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDiagnosticsProvider/MSFT_SPDiagnosticsProvider.psm1 @@ -181,13 +181,17 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "Name", "Retention", "MaxTotalSizeInBytes", "Enabled") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPDistributedCacheClientSettings/MSFT_SPDistributedCacheClientSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPDistributedCacheClientSettings/MSFT_SPDistributedCacheClientSettings.psm1 index e6b325ccc..c9db8d2c9 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDistributedCacheClientSettings/MSFT_SPDistributedCacheClientSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDistributedCacheClientSettings/MSFT_SPDistributedCacheClientSettings.psm1 @@ -1042,7 +1042,7 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("DLTCMaxConnectionsToServer", "DLTCRequestTimeout", @@ -1090,6 +1090,10 @@ function Test-TargetResource "DHSCRequestTimeout", "DHSCChannelOpenTimeOut" ) + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPDistributedCacheService/MSFT_SPDistributedCacheService.psm1 b/SharePointDsc/DSCResources/MSFT_SPDistributedCacheService/MSFT_SPDistributedCacheService.psm1 index 9b5edaa05..8d2054aff 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDistributedCacheService/MSFT_SPDistributedCacheService.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDistributedCacheService/MSFT_SPDistributedCacheService.psm1 @@ -243,8 +243,8 @@ function Set-TargetResource if ($ServerCount -ge $params.ServerProvisionOrder.Length) { throw ("The server $($env:COMPUTERNAME) was not found in the " + ` - "ServerProvisionOrder array of Distributed Cache server(s). " + ` - "The server must be included in ServerProvisionOrder or Ensure equal to Absent.") + "ServerProvisionOrder array of Distributed Cache server(s). " + ` + "The server must be included in ServerProvisionOrder or Ensure equal to Absent.") } $currentServer = $params.ServerProvisionOrder[$serverCount] } @@ -525,11 +525,13 @@ function Test-TargetResource { if ($ServiceAccount -ne $CurrentValues.ServiceAccount) { + Write-Verbose -Message "Test-TargetResource returned false" + return $false } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", ` "CreateFirewallRules", ` @@ -537,10 +539,14 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPExcelServiceApp/MSFT_SPExcelServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPExcelServiceApp/MSFT_SPExcelServiceApp.psm1 index f984f47eb..f51df4bf2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPExcelServiceApp/MSFT_SPExcelServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPExcelServiceApp/MSFT_SPExcelServiceApp.psm1 @@ -645,6 +645,9 @@ function Test-TargetResource } if ($locationCheck -contains $false) { + + Write-Verbose -Message "Test-TargetResource returned false" + return $false } @@ -665,15 +668,21 @@ function Test-TargetResource } if ($locationCheck -contains $false) { + Write-Verbose -Message "Test-TargetResource returned false" + return $false } # at this point if no other value has been returned, all desired entires exist and are # correct, and no existing entries exist that are not in desired state, so return true + Write-Verbose -Message "Test-TargetResource returned true" + return $true } else { + Write-Verbose -Message "Test-TargetResource returned $mainCheck" + return $mainCheck } } diff --git a/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 index 353751d63..26908a67f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 @@ -1137,7 +1137,7 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "RunCentralAdmin", @@ -1145,6 +1145,10 @@ function Test-TargetResource "CentralAdministrationPort", "CentralAdministrationAuth", "DeveloperDashboard") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPFarmAdministrators/MSFT_SPFarmAdministrators.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarmAdministrators/MSFT_SPFarmAdministrators.psm1 index d278aab6a..fd56214e5 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarmAdministrators/MSFT_SPFarmAdministrators.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarmAdministrators/MSFT_SPFarmAdministrators.psm1 @@ -348,6 +348,8 @@ function Test-TargetResource } } + Write-Verbose -Message "Test-TargetResource returned $result" + return $result } diff --git a/SharePointDsc/DSCResources/MSFT_SPFarmPropertyBag/MSFT_SPFarmPropertyBag.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarmPropertyBag/MSFT_SPFarmPropertyBag.psm1 index e2645d5f5..ab32bfdd1 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarmPropertyBag/MSFT_SPFarmPropertyBag.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarmPropertyBag/MSFT_SPFarmPropertyBag.psm1 @@ -172,9 +172,13 @@ function Test-TargetResource() Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('Ensure', 'Key', 'Value') + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPFarmSolution/MSFT_SPFarmSolution.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarmSolution/MSFT_SPFarmSolution.psm1 index 412841fdd..47be9403f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarmSolution/MSFT_SPFarmSolution.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarmSolution/MSFT_SPFarmSolution.psm1 @@ -428,9 +428,13 @@ function Test-TargetResource $valuesToCheck += "WebAppUrls" } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } function Wait-SPDscSolutionJob diff --git a/SharePointDsc/DSCResources/MSFT_SPFeature/MSFT_SPFeature.psm1 b/SharePointDsc/DSCResources/MSFT_SPFeature/MSFT_SPFeature.psm1 index fca429718..d822162e2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFeature/MSFT_SPFeature.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFeature/MSFT_SPFeature.psm1 @@ -174,7 +174,6 @@ function Set-TargetResource } } - function Test-TargetResource { [CmdletBinding()] @@ -217,9 +216,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "Version") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPHealthAnalyzerRuleState/MSFT_SPHealthAnalyzerRuleState.psm1 b/SharePointDsc/DSCResources/MSFT_SPHealthAnalyzerRuleState/MSFT_SPHealthAnalyzerRuleState.psm1 index 62b0eff9e..c98c2c4f6 100644 --- a/SharePointDsc/DSCResources/MSFT_SPHealthAnalyzerRuleState/MSFT_SPHealthAnalyzerRuleState.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPHealthAnalyzerRuleState/MSFT_SPHealthAnalyzerRuleState.psm1 @@ -275,8 +275,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPIncomingEmailSettings/MSFT_SPIncomingEmailSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPIncomingEmailSettings/MSFT_SPIncomingEmailSettings.psm1 index 249a0a595..8681ffa84 100644 --- a/SharePointDsc/DSCResources/MSFT_SPIncomingEmailSettings/MSFT_SPIncomingEmailSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPIncomingEmailSettings/MSFT_SPIncomingEmailSettings.psm1 @@ -381,8 +381,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPInfoPathFormsServiceConfig/MSFT_SPInfoPathFormsServiceConfig.psm1 b/SharePointDsc/DSCResources/MSFT_SPInfoPathFormsServiceConfig/MSFT_SPInfoPathFormsServiceConfig.psm1 index bafdb46e9..281d396c8 100644 --- a/SharePointDsc/DSCResources/MSFT_SPInfoPathFormsServiceConfig/MSFT_SPInfoPathFormsServiceConfig.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPInfoPathFormsServiceConfig/MSFT_SPInfoPathFormsServiceConfig.psm1 @@ -385,7 +385,7 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "AllowUserFormBrowserEnabling", @@ -402,6 +402,10 @@ function Test-TargetResource "MaxUserActionsPerPostback", "ActiveSessionsTimeout", "MaxSizeOfUserFormState") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPInstall/MSFT_SPInstall.psm1 b/SharePointDsc/DSCResources/MSFT_SPInstall/MSFT_SPInstall.psm1 index 67de8334a..ffd437bc8 100644 --- a/SharePointDsc/DSCResources/MSFT_SPInstall/MSFT_SPInstall.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPInstall/MSFT_SPInstall.psm1 @@ -438,9 +438,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPInstallLanguagePack/MSFT_SPInstallLanguagePack.psm1 b/SharePointDsc/DSCResources/MSFT_SPInstallLanguagePack/MSFT_SPInstallLanguagePack.psm1 index 894d1f70b..c185ef878 100644 --- a/SharePointDsc/DSCResources/MSFT_SPInstallLanguagePack/MSFT_SPInstallLanguagePack.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPInstallLanguagePack/MSFT_SPInstallLanguagePack.psm1 @@ -550,9 +550,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/MSFT_SPInstallPrereqs.psm1 b/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/MSFT_SPInstallPrereqs.psm1 index 44f429017..2469cb639 100644 --- a/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/MSFT_SPInstallPrereqs.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/MSFT_SPInstallPrereqs.psm1 @@ -1068,9 +1068,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } function Test-SPDscPrereqInstallStatus @@ -1099,8 +1103,8 @@ function Test-SPDscPrereqInstallStatus "Equals" { $prereq = $InstalledItems | Where-Object -FilterScript { - $null -ne $_.DisplayName -and $_.DisplayName.Trim() -eq $itemToCheck.SearchValue - } + $null -ne $_.DisplayName -and $_.DisplayName.Trim() -eq $itemToCheck.SearchValue + } if ($null -eq $prereq) { $itemsInstalled = $false @@ -1111,8 +1115,8 @@ function Test-SPDscPrereqInstallStatus "Match" { $prereq = $InstalledItems | Where-Object -FilterScript { - $null -ne $_.DisplayName -and $_.DisplayName.Trim() -match $itemToCheck.SearchValue - } + $null -ne $_.DisplayName -and $_.DisplayName.Trim() -match $itemToCheck.SearchValue + } if ($null -eq $prereq) { $itemsInstalled = $false @@ -1123,8 +1127,8 @@ function Test-SPDscPrereqInstallStatus "Like" { $prereq = $InstalledItems | Where-Object -FilterScript { - $null -ne $_.DisplayName -and $_.DisplayName.Trim() -like $itemToCheck.SearchValue - } + $null -ne $_.DisplayName -and $_.DisplayName.Trim() -like $itemToCheck.SearchValue + } if ($null -eq $prereq) { $itemsInstalled = $false diff --git a/SharePointDsc/DSCResources/MSFT_SPIrmSettings/MSFT_SPIrmSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPIrmSettings/MSFT_SPIrmSettings.psm1 index b399be8c5..9d2721c0a 100644 --- a/SharePointDsc/DSCResources/MSFT_SPIrmSettings/MSFT_SPIrmSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPIrmSettings/MSFT_SPIrmSettings.psm1 @@ -192,8 +192,12 @@ function Test-TargetResource $PSBoundParameters.UseADRMS = $false } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPLogLevel/MSFT_SPLogLevel.psm1 b/SharePointDsc/DSCResources/MSFT_SPLogLevel/MSFT_SPLogLevel.psm1 index c05d2a651..187de2d31 100644 --- a/SharePointDsc/DSCResources/MSFT_SPLogLevel/MSFT_SPLogLevel.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPLogLevel/MSFT_SPLogLevel.psm1 @@ -292,6 +292,8 @@ function Test-TargetResource if ($null -eq $CurrentValues.SPLogLevelSetting) { + Write-Verbose -Message "Test-TargetResource returned false" + return $false } @@ -312,10 +314,14 @@ function Test-TargetResource if ($mismatchedSettingFound) { - return $false + $result = $false } else { - return $true + $result = $true } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } diff --git a/SharePointDsc/DSCResources/MSFT_SPMachineTranslationServiceApp/MSFT_SPMachineTranslationServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPMachineTranslationServiceApp/MSFT_SPMachineTranslationServiceApp.psm1 index f2e059e1b..19f1939ce 100644 --- a/SharePointDsc/DSCResources/MSFT_SPMachineTranslationServiceApp/MSFT_SPMachineTranslationServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPMachineTranslationServiceApp/MSFT_SPMachineTranslationServiceApp.psm1 @@ -252,7 +252,7 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "ApplicationPool", @@ -260,6 +260,9 @@ function Test-TargetResource "DatabaseServer", "Ensure") + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } diff --git a/SharePointDsc/DSCResources/MSFT_SPManagedAccount/MSFT_SPManagedAccount.psm1 b/SharePointDsc/DSCResources/MSFT_SPManagedAccount/MSFT_SPManagedAccount.psm1 index 90367b01c..e9a3a7d14 100644 --- a/SharePointDsc/DSCResources/MSFT_SPManagedAccount/MSFT_SPManagedAccount.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPManagedAccount/MSFT_SPManagedAccount.psm1 @@ -215,13 +215,17 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AccountName", "Schedule", "PreExpireDays", "EmailNotification", "Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceApp/MSFT_SPManagedMetaDataServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceApp/MSFT_SPManagedMetaDataServiceApp.psm1 index 2554b856c..fc4368292 100644 --- a/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceApp/MSFT_SPManagedMetaDataServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceApp/MSFT_SPManagedMetaDataServiceApp.psm1 @@ -771,9 +771,13 @@ function Test-TargetResource "TermStoreAdministrators" "ProxyName") - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceAppDefault/MSFT_SPManagedMetadataServiceAppDefault.psm1 b/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceAppDefault/MSFT_SPManagedMetadataServiceAppDefault.psm1 index 25a6f8acd..cbcc980b2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceAppDefault/MSFT_SPManagedMetadataServiceAppDefault.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceAppDefault/MSFT_SPManagedMetadataServiceAppDefault.psm1 @@ -192,9 +192,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPManagedPath/MSFT_SPManagedPath.psm1 b/SharePointDsc/DSCResources/MSFT_SPManagedPath/MSFT_SPManagedPath.psm1 index b828caa2d..4b91bf07b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPManagedPath/MSFT_SPManagedPath.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPManagedPath/MSFT_SPManagedPath.psm1 @@ -203,13 +203,17 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("WebAppUrl", "RelativeUrl", "Explicit", "HostHeader", "Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPMinRoleCompliance/MSFT_SPMinRoleCompliance.psm1 b/SharePointDsc/DSCResources/MSFT_SPMinRoleCompliance/MSFT_SPMinRoleCompliance.psm1 index 8eceea49f..14401b059 100644 --- a/SharePointDsc/DSCResources/MSFT_SPMinRoleCompliance/MSFT_SPMinRoleCompliance.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPMinRoleCompliance/MSFT_SPMinRoleCompliance.psm1 @@ -165,9 +165,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("State") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function Get-TargetResource, ` diff --git a/SharePointDsc/DSCResources/MSFT_SPOAppPrincipalMgmtServiceAppProxy/MSFT_SPOAppPrincipalMgmtServiceAppProxy.psm1 b/SharePointDsc/DSCResources/MSFT_SPOAppPrincipalMgmtServiceAppProxy/MSFT_SPOAppPrincipalMgmtServiceAppProxy.psm1 index adf8990dc..d2c265db0 100644 --- a/SharePointDsc/DSCResources/MSFT_SPOAppPrincipalMgmtServiceAppProxy/MSFT_SPOAppPrincipalMgmtServiceAppProxy.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPOAppPrincipalMgmtServiceAppProxy/MSFT_SPOAppPrincipalMgmtServiceAppProxy.psm1 @@ -184,16 +184,20 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("OnlineTenantUri", "Ensure") } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPOfficeOnlineServerBinding/MSFT_SPOfficeOnlineServerBinding.psm1 b/SharePointDsc/DSCResources/MSFT_SPOfficeOnlineServerBinding/MSFT_SPOfficeOnlineServerBinding.psm1 index 6be0bba20..a6ab6c460 100644 --- a/SharePointDsc/DSCResources/MSFT_SPOfficeOnlineServerBinding/MSFT_SPOfficeOnlineServerBinding.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPOfficeOnlineServerBinding/MSFT_SPOfficeOnlineServerBinding.psm1 @@ -174,9 +174,13 @@ function Test-TargetResource { $paramsToCheck += @("Zone", "DnsName") } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $paramsToCheck + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPOutgoingEmailSettings/MSFT_SPOutgoingEmailSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPOutgoingEmailSettings/MSFT_SPOutgoingEmailSettings.psm1 index cc580731b..73a39ff09 100644 --- a/SharePointDsc/DSCResources/MSFT_SPOutgoingEmailSettings/MSFT_SPOutgoingEmailSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPOutgoingEmailSettings/MSFT_SPOutgoingEmailSettings.psm1 @@ -257,7 +257,7 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SMTPServer", "FromAddress", @@ -265,6 +265,10 @@ function Test-TargetResource "CharacterSet", "UseTLS", "SMTPPort") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPPasswordChangeSettings/MSFT_SPPasswordChangeSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPPasswordChangeSettings/MSFT_SPPasswordChangeSettings.psm1 index ae4c662da..c48acfeca 100644 --- a/SharePointDsc/DSCResources/MSFT_SPPasswordChangeSettings/MSFT_SPPasswordChangeSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPPasswordChangeSettings/MSFT_SPPasswordChangeSettings.psm1 @@ -172,12 +172,16 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("MailAddress", "DaysBeforeExpiry", "PasswordChangeWaitTimeSeconds", "NumberOfRetries") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPPerformancePointServiceApp/MSFT_SPPerformancePointServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPPerformancePointServiceApp/MSFT_SPPerformancePointServiceApp.psm1 index 905340e70..f9699318e 100644 --- a/SharePointDsc/DSCResources/MSFT_SPPerformancePointServiceApp/MSFT_SPPerformancePointServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPPerformancePointServiceApp/MSFT_SPPerformancePointServiceApp.psm1 @@ -256,9 +256,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPPowerPointAutomationServiceApp/MSFT_SPPowerPointAutomationServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPPowerPointAutomationServiceApp/MSFT_SPPowerPointAutomationServiceApp.psm1 index 6024a0f3c..2ff75dc98 100644 --- a/SharePointDsc/DSCResources/MSFT_SPPowerPointAutomationServiceApp/MSFT_SPPowerPointAutomationServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPPowerPointAutomationServiceApp/MSFT_SPPowerPointAutomationServiceApp.psm1 @@ -414,15 +414,19 @@ function Test-TargetResource if ($Ensure -eq "Absent") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPProductUpdate/MSFT_SPProductUpdate.psm1 b/SharePointDsc/DSCResources/MSFT_SPProductUpdate/MSFT_SPProductUpdate.psm1 index 0b45e1089..f90ee5d32 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProductUpdate/MSFT_SPProductUpdate.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProductUpdate/MSFT_SPProductUpdate.psm1 @@ -664,9 +664,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } function Get-SPDscLocalVersionInfo diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerADResourcePoolSync/MSFT_SPProjectServerADResourcePoolSync.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerADResourcePoolSync/MSFT_SPProjectServerADResourcePoolSync.psm1 index 555858cb7..07f41a2d7 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerADResourcePoolSync/MSFT_SPProjectServerADResourcePoolSync.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerADResourcePoolSync/MSFT_SPProjectServerADResourcePoolSync.psm1 @@ -237,9 +237,13 @@ function Test-TargetResource } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $paramsToCheck + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerAdditionalSettings/MSFT_SPProjectServerAdditionalSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerAdditionalSettings/MSFT_SPProjectServerAdditionalSettings.psm1 index 15cf19ab3..e4bcc84b1 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerAdditionalSettings/MSFT_SPProjectServerAdditionalSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerAdditionalSettings/MSFT_SPProjectServerAdditionalSettings.psm1 @@ -184,13 +184,17 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @( "ProjectProfessionalMinBuildNumber" "ServerCurrency", "EnforceServerCurrency" ) + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerGlobalPermissions/MSFT_SPProjectServerGlobalPermissions.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerGlobalPermissions/MSFT_SPProjectServerGlobalPermissions.psm1 index 31f5124b3..9758f87ac 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerGlobalPermissions/MSFT_SPProjectServerGlobalPermissions.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerGlobalPermissions/MSFT_SPProjectServerGlobalPermissions.psm1 @@ -353,12 +353,16 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @( "AllowPermissions", "DenyPermissions" ) + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerGroup/MSFT_SPProjectServerGroup.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerGroup/MSFT_SPProjectServerGroup.psm1 index 897d69ffb..eb76744b4 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerGroup/MSFT_SPProjectServerGroup.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerGroup/MSFT_SPProjectServerGroup.psm1 @@ -409,6 +409,7 @@ function Test-TargetResource -ValuesToCheck @("Members") if ($membersMatch -eq $false) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -425,7 +426,8 @@ function Test-TargetResource } if ($missingMembers -eq $true) { - Write-Verbose -Message "Users from the MembersToInclude property are not included, returning false" + Write-Verbose -Message "Users from the MembersToInclude property are not included" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -442,12 +444,13 @@ function Test-TargetResource } if ($extraMembers -eq $true) { - Write-Verbose -Message "Users from the MembersToExclude property are included, returning false" + Write-Verbose -Message "Users from the MembersToExclude property are included" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @( "Name", @@ -455,6 +458,10 @@ function Test-TargetResource "ADGroup", "Ensure" ) + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerLicense/MSFT_SPProjectServerLicense.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerLicense/MSFT_SPProjectServerLicense.psm1 index 9c5796009..c8e085c0d 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerLicense/MSFT_SPProjectServerLicense.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerLicense/MSFT_SPProjectServerLicense.psm1 @@ -200,9 +200,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerPermissionMode/MSFT_SPProjectServerPermissionMode.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerPermissionMode/MSFT_SPProjectServerPermissionMode.psm1 index c204ea569..91474003a 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerPermissionMode/MSFT_SPProjectServerPermissionMode.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerPermissionMode/MSFT_SPProjectServerPermissionMode.psm1 @@ -117,10 +117,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("PermissionMode") + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerServiceApp/MSFT_SPProjectServerServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerServiceApp/MSFT_SPProjectServerServiceApp.psm1 index 26aa9c27b..2f9853672 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerServiceApp/MSFT_SPProjectServerServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerServiceApp/MSFT_SPProjectServerServiceApp.psm1 @@ -239,17 +239,20 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerTimeSheetSettings/MSFT_SPProjectServerTimeSheetSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerTimeSheetSettings/MSFT_SPProjectServerTimeSheetSettings.psm1 index 3c37e3239..c00d6c5c3 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerTimeSheetSettings/MSFT_SPProjectServerTimeSheetSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerTimeSheetSettings/MSFT_SPProjectServerTimeSheetSettings.psm1 @@ -624,8 +624,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerUserSyncSettings/MSFT_SPProjectServerUserSyncSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerUserSyncSettings/MSFT_SPProjectServerUserSyncSettings.psm1 index 218ba7526..a6d6fd2dc 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerUserSyncSettings/MSFT_SPProjectServerUserSyncSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerUserSyncSettings/MSFT_SPProjectServerUserSyncSettings.psm1 @@ -185,8 +185,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerWssSettings/MSFT_SPProjectServerWssSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerWssSettings/MSFT_SPProjectServerWssSettings.psm1 index d9474d1c1..b71ede24d 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerWssSettings/MSFT_SPProjectServerWssSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerWssSettings/MSFT_SPProjectServerWssSettings.psm1 @@ -172,8 +172,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPPublishServiceApplication/MSFT_SPPublishServiceApplication.psm1 b/SharePointDsc/DSCResources/MSFT_SPPublishServiceApplication/MSFT_SPPublishServiceApplication.psm1 index 00e144a4f..a8b548ee8 100644 --- a/SharePointDsc/DSCResources/MSFT_SPPublishServiceApplication/MSFT_SPPublishServiceApplication.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPPublishServiceApplication/MSFT_SPPublishServiceApplication.psm1 @@ -146,9 +146,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPQuotaTemplate/MSFT_SPQuotaTemplate.psm1 b/SharePointDsc/DSCResources/MSFT_SPQuotaTemplate/MSFT_SPQuotaTemplate.psm1 index 7e23440f9..dadbbaa5e 100644 --- a/SharePointDsc/DSCResources/MSFT_SPQuotaTemplate/MSFT_SPQuotaTemplate.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPQuotaTemplate/MSFT_SPQuotaTemplate.psm1 @@ -330,9 +330,12 @@ function Test-TargetResource { if ($CurrentValues.Ensure -eq "Absent") { - return $false + $result = $false + } + else + { + $result = Test-SPDscParameterState -CurrentValues $CurrentValues -DesiredValues $PSBoundParameters } - return Test-SPDscParameterState -CurrentValues $CurrentValues -DesiredValues $PSBoundParameters } "Absent" { @@ -349,15 +352,19 @@ function Test-TargetResource if ($CurrentValues.Ensure -eq "Present") { # Error occured in Get method or template exists, which is not supposed to be. Return false - return $false + $result = $false } else { # Template does not exists, which is supposed to be. Return true - return $true + $result = $true } } } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPRemoteFarmTrust/MSFT_SPRemoteFarmTrust.psm1 b/SharePointDsc/DSCResources/MSFT_SPRemoteFarmTrust/MSFT_SPRemoteFarmTrust.psm1 index 407f531d2..0d7933a0f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPRemoteFarmTrust/MSFT_SPRemoteFarmTrust.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPRemoteFarmTrust/MSFT_SPRemoteFarmTrust.psm1 @@ -219,9 +219,13 @@ function Test-TargetResource() Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchAuthoritativePage/MSFT_SPSearchAuthoritativePage.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchAuthoritativePage/MSFT_SPSearchAuthoritativePage.psm1 index fb0256d0c..230109c77 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchAuthoritativePage/MSFT_SPSearchAuthoritativePage.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchAuthoritativePage/MSFT_SPSearchAuthoritativePage.psm1 @@ -283,7 +283,7 @@ function Test-TargetResource { if ($Action -eq "Authoratative") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", "Path", @@ -293,7 +293,7 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", "Path", @@ -303,12 +303,16 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", "Action", "Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 index e6134201e..cc0098d85 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 @@ -318,10 +318,10 @@ function Set-TargetResource $CrawlSetting -ne "CrawlEverything" -and # Phaseout Major Release $CrawlSetting -ne "CrawlFirstOnly" -and # Phaseout Major Release $CrawlSetting -ne $null # Phaseout Major Release - ) + ) { throw ("Parameter CrawlSetting can only be set to CrawlVirtualServers or CrawlSites " + ` - "for SharePoint content sources") + "for SharePoint content sources") } } "Website" @@ -820,10 +820,10 @@ function Test-TargetResource $CrawlSetting -ne "CrawlEverything" -and # Phaseout Major Release $CrawlSetting -ne "CrawlFirstOnly" -and # Phaseout Major Release $CrawlSetting -ne $null # Phaseout Major Release - ) + ) { throw ("Parameter CrawlSetting can only be set to CrawlVirtualServers or CrawlSites " + ` - "for SharePoint content sources") + "for SharePoint content sources") } } "Website" @@ -876,9 +876,13 @@ function Test-TargetResource if ($Ensure -eq "Absent" -or $CurrentValues.Ensure -eq "Absent") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } $relativePath = "..\..\Modules\SharePointDsc.Search\SPSearchContentSource.Schedules.psm1" @@ -893,6 +897,7 @@ function Test-TargetResource -DesiredSchedule $IncrementalSchedule if ($propertyTest -eq $false) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -903,6 +908,7 @@ function Test-TargetResource -DesiredSchedule $FullSchedule if ($propertyTest -eq $false) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -924,17 +930,23 @@ function Test-TargetResource { return $false } + else + { + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -DesiredValues $PSBoundParameters ` + -ValuesToCheck @("ContentSourceType", + "CrawlSetting", + "ContinuousCrawl", + "Priority", + "LimitPageDepth", + "LimitServerHops", + "LOBSystemSet", + "Ensure") + } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` - -DesiredValues $PSBoundParameters ` - -ValuesToCheck @("ContentSourceType", - "CrawlSetting", - "ContinuousCrawl", - "Priority", - "LimitPageDepth", - "LimitServerHops", - "LOBSystemSet", - "Ensure") + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlMapping/MSFT_SPSearchCrawlMapping.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlMapping/MSFT_SPSearchCrawlMapping.psm1 index b819b7ec4..a0f096982 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlMapping/MSFT_SPSearchCrawlMapping.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlMapping/MSFT_SPSearchCrawlMapping.psm1 @@ -219,16 +219,20 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", "Url", "Target", "Ensure") } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlRule/MSFT_SPSearchCrawlRule.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlRule/MSFT_SPSearchCrawlRule.psm1 index dc947f26d..373f542e6 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlRule/MSFT_SPSearchCrawlRule.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlRule/MSFT_SPSearchCrawlRule.psm1 @@ -534,11 +534,13 @@ function Test-TargetResource -DifferenceObject $CurrentValues.CrawlConfigurationRules if ($null -ne $compareObject) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } else { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -547,11 +549,12 @@ function Test-TargetResource { if ($AuthenticationCredentials.UserName -ne $CurrentValues.AuthenticationCredentials) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "AuthenticationType", @@ -560,10 +563,14 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlerImpactRule/MSFT_SPSearchCrawlerImpactRule.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlerImpactRule/MSFT_SPSearchCrawlerImpactRule.psm1 index dbc13c78a..571f92c5c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlerImpactRule/MSFT_SPSearchCrawlerImpactRule.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlerImpactRule/MSFT_SPSearchCrawlerImpactRule.psm1 @@ -286,7 +286,7 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", "Name", @@ -294,12 +294,16 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", "Name", "Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchFileType/MSFT_SPSearchFileType.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchFileType/MSFT_SPSearchFileType.psm1 index 7d3b69411..b1eadfd96 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchFileType/MSFT_SPSearchFileType.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchFileType/MSFT_SPSearchFileType.psm1 @@ -329,11 +329,12 @@ function Test-TargetResource { if ($Enabled -ne $CurrentValues.Enabled) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "Description", @@ -341,10 +342,14 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchIndexPartition/MSFT_SPSearchIndexPartition.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchIndexPartition/MSFT_SPSearchIndexPartition.psm1 index 5060ca28a..05b708b36 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchIndexPartition/MSFT_SPSearchIndexPartition.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchIndexPartition/MSFT_SPSearchIndexPartition.psm1 @@ -271,9 +271,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Servers") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchManagedProperty/MSFT_SPSearchManagedProperty.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchManagedProperty/MSFT_SPSearchManagedProperty.psm1 index 61340078b..c59e39bd8 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchManagedProperty/MSFT_SPSearchManagedProperty.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchManagedProperty/MSFT_SPSearchManagedProperty.psm1 @@ -447,7 +447,7 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "PropertyType", @@ -462,6 +462,10 @@ function Test-TargetResource "Aliases", "Sortable", "SafeForAnonymous") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchMetadataCategory/MSFT_SPSearchMetadataCategory.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchMetadataCategory/MSFT_SPSearchMetadataCategory.psm1 index d765c15fb..7f72cfc73 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchMetadataCategory/MSFT_SPSearchMetadataCategory.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchMetadataCategory/MSFT_SPSearchMetadataCategory.psm1 @@ -209,7 +209,7 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "PropertyType", @@ -217,6 +217,10 @@ function Test-TargetResource "AutoCreateNewManagedProperties", "DiscoverNewProperties", "MapToContents") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchResultSource/MSFT_SPSearchResultSource.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchResultSource/MSFT_SPSearchResultSource.psm1 index faa8a0fc2..05c2fa98c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchResultSource/MSFT_SPSearchResultSource.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchResultSource/MSFT_SPSearchResultSource.psm1 @@ -318,9 +318,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchServiceApp/MSFT_SPSearchServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchServiceApp/MSFT_SPSearchServiceApp.psm1 index fc83f3ede..5b95bdc4d 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchServiceApp/MSFT_SPSearchServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchServiceApp/MSFT_SPSearchServiceApp.psm1 @@ -543,7 +543,7 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "ApplicationPool", @@ -553,10 +553,14 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchServiceSettings/MSFT_SPSearchServiceSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchServiceSettings/MSFT_SPSearchServiceSettings.psm1 index e6b35aef6..be2193d7f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchServiceSettings/MSFT_SPSearchServiceSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchServiceSettings/MSFT_SPSearchServiceSettings.psm1 @@ -239,10 +239,14 @@ function Test-TargetResource } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("PerformanceLevel", "ContactEmail") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchTopology/MSFT_SPSearchTopology.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchTopology/MSFT_SPSearchTopology.psm1 index 13a17c845..de9837d9b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchTopology/MSFT_SPSearchTopology.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchTopology/MSFT_SPSearchTopology.psm1 @@ -534,7 +534,7 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @( "Admin", @@ -544,6 +544,10 @@ function Test-TargetResource "QueryProcessing", "IndexPartition" ) + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSecureStoreServiceApp/MSFT_SPSecureStoreServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPSecureStoreServiceApp/MSFT_SPSecureStoreServiceApp.psm1 index 386002846..f624b383b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSecureStoreServiceApp/MSFT_SPSecureStoreServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSecureStoreServiceApp/MSFT_SPSecureStoreServiceApp.psm1 @@ -404,6 +404,7 @@ function Test-TargetResource Write-Verbose -Message ("Specified database server does not match the actual " + ` "database server. This resource cannot move the database " + ` "to a different SQL instance.") + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -413,12 +414,17 @@ function Test-TargetResource { Write-Verbose -Message ("Specified database name does not match the actual " + ` "database name. This resource cannot rename the database.") + Write-Verbose -Message "Test-TargetResource returned false" return $false } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSecurityTokenServiceConfig/MSFT_SPSecurityTokenServiceConfig.psm1 b/SharePointDsc/DSCResources/MSFT_SPSecurityTokenServiceConfig/MSFT_SPSecurityTokenServiceConfig.psm1 index b72cbc404..45b0bc947 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSecurityTokenServiceConfig/MSFT_SPSecurityTokenServiceConfig.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSecurityTokenServiceConfig/MSFT_SPSecurityTokenServiceConfig.psm1 @@ -210,13 +210,17 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "NameIdentifier", "UseSessionCookies", "AllowOAuthOverHttp", "AllowMetadataOverHttp") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSelfServiceSiteCreation/MSFT_SPSelfServiceSiteCreation.psm1 b/SharePointDsc/DSCResources/MSFT_SPSelfServiceSiteCreation/MSFT_SPSelfServiceSiteCreation.psm1 index 6a4538256..501dbe6a1 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSelfServiceSiteCreation/MSFT_SPSelfServiceSiteCreation.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSelfServiceSiteCreation/MSFT_SPSelfServiceSiteCreation.psm1 @@ -519,7 +519,7 @@ function Test-TargetResource if ($Enabled) { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("WebAppUrl", ` "Enabled", ` @@ -536,10 +536,14 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("WebAppUrl", ` "Enabled", ` "ShowStartASiteMenuItem") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } diff --git a/SharePointDsc/DSCResources/MSFT_SPServiceAppPool/MSFT_SPServiceAppPool.psm1 b/SharePointDsc/DSCResources/MSFT_SPServiceAppPool/MSFT_SPServiceAppPool.psm1 index 8f53a675e..ea0690efb 100644 --- a/SharePointDsc/DSCResources/MSFT_SPServiceAppPool/MSFT_SPServiceAppPool.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPServiceAppPool/MSFT_SPServiceAppPool.psm1 @@ -169,16 +169,20 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAccount", "Ensure") } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPServiceAppProxyGroup/MSFT_SPServiceAppProxyGroup.psm1 b/SharePointDsc/DSCResources/MSFT_SPServiceAppProxyGroup/MSFT_SPServiceAppProxyGroup.psm1 index 3deec421b..04d08e93f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPServiceAppProxyGroup/MSFT_SPServiceAppProxyGroup.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPServiceAppProxyGroup/MSFT_SPServiceAppProxyGroup.psm1 @@ -391,6 +391,7 @@ function Test-TargetResource if ($CurrentValues.Ensure -ne $Ensure) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -400,6 +401,7 @@ function Test-TargetResource if (-not $CurrentValues.ServiceAppProxies) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -413,6 +415,7 @@ function Test-TargetResource else { Write-Verbose -Message "ServiceAppProxies do not match" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -423,6 +426,7 @@ function Test-TargetResource if (-not $CurrentValues.ServiceAppProxies) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -436,6 +440,7 @@ function Test-TargetResource elseif ($differences.sideindicator -contains "=>") { Write-Verbose -Message "ServiceAppProxiesToInclude does not match" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -446,6 +451,7 @@ function Test-TargetResource if (-not $CurrentValues.ServiceAppProxies) { + Write-Verbose -Message "Test-TargetResource returned true" return $true } @@ -455,14 +461,17 @@ function Test-TargetResource if ($null -eq $differences) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } elseif ($differences.sideindicator -contains "==") { Write-Verbose -Message "ServiceAppProxiesToExclude does not match" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } + Write-Verbose -Message "Test-TargetResource returned true" return $true } diff --git a/SharePointDsc/DSCResources/MSFT_SPServiceAppSecurity/MSFT_SPServiceAppSecurity.psm1 b/SharePointDsc/DSCResources/MSFT_SPServiceAppSecurity/MSFT_SPServiceAppSecurity.psm1 index 937d72cd8..b503712be 100644 --- a/SharePointDsc/DSCResources/MSFT_SPServiceAppSecurity/MSFT_SPServiceAppSecurity.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPServiceAppSecurity/MSFT_SPServiceAppSecurity.psm1 @@ -532,6 +532,7 @@ function Test-TargetResource if ([System.String]::IsNullOrEmpty($CurrentValues.ServiceAppName) -eq $true) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -655,6 +656,8 @@ function Test-TargetResource return $result } + Write-Verbose -Message "Test-TargetResource returned $result" + return $result } diff --git a/SharePointDsc/DSCResources/MSFT_SPServiceIdentity/MSFT_SPServiceIdentity.psm1 b/SharePointDsc/DSCResources/MSFT_SPServiceIdentity/MSFT_SPServiceIdentity.psm1 index cb7c071c6..454dc6802 100644 --- a/SharePointDsc/DSCResources/MSFT_SPServiceIdentity/MSFT_SPServiceIdentity.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPServiceIdentity/MSFT_SPServiceIdentity.psm1 @@ -165,5 +165,9 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return ($CurrentValues.ManagedAccount -eq $ManagedAccount) + $result = ($CurrentValues.ManagedAccount -eq $ManagedAccount) + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } diff --git a/SharePointDsc/DSCResources/MSFT_SPServiceInstance/MSFT_SPServiceInstance.psm1 b/SharePointDsc/DSCResources/MSFT_SPServiceInstance/MSFT_SPServiceInstance.psm1 index 3fdccaab2..1388022f2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPServiceInstance/MSFT_SPServiceInstance.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPServiceInstance/MSFT_SPServiceInstance.psm1 @@ -198,9 +198,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } function Get-SPDscServiceTypeName diff --git a/SharePointDsc/DSCResources/MSFT_SPSessionStateService/MSFT_SPSessionStateService.psm1 b/SharePointDsc/DSCResources/MSFT_SPSessionStateService/MSFT_SPSessionStateService.psm1 index ee2951f07..f25fd4040 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSessionStateService/MSFT_SPSessionStateService.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSessionStateService/MSFT_SPSessionStateService.psm1 @@ -169,16 +169,20 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "SessionTimeout") } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPShellAdmins/MSFT_SPShellAdmins.psm1 b/SharePointDsc/DSCResources/MSFT_SPShellAdmins/MSFT_SPShellAdmins.psm1 index 2f788b2f0..4da48d544 100644 --- a/SharePointDsc/DSCResources/MSFT_SPShellAdmins/MSFT_SPShellAdmins.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPShellAdmins/MSFT_SPShellAdmins.psm1 @@ -778,6 +778,7 @@ function Test-TargetResource $null -eq $CurrentValues.MembersToInclude -and ` $null -eq $CurrentValues.MembersToExclude) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -786,6 +787,7 @@ function Test-TargetResource Write-Verbose -Message "Processing Members parameter" if (-not $CurrentValues.Members) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -799,6 +801,7 @@ function Test-TargetResource else { Write-Verbose -Message "Shell Admins group does not match" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -808,6 +811,7 @@ function Test-TargetResource Write-Verbose -Message "Processing MembersToInclude parameter" if (-not $CurrentValues.Members) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -815,7 +819,8 @@ function Test-TargetResource { if (-not($CurrentValues.Members.Contains($member))) { - Write-Verbose -Message "$member is not a Shell Admin. Set result to false" + Write-Verbose -Message "$member is not a Shell Admin." + Write-Verbose -Message "Test-TargetResource returned false" return $false } else @@ -834,7 +839,8 @@ function Test-TargetResource { if ($CurrentValues.Members.Contains($member)) { - Write-Verbose -Message "$member is a Shell Admin. Set result to false" + Write-Verbose -Message "$member is a Shell Admin." + Write-Verbose -Message "Test-TargetResource returned false" return $false } else @@ -860,6 +866,7 @@ function Test-TargetResource { if (-not $database.Members) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -873,6 +880,7 @@ function Test-TargetResource else { Write-Verbose -Message "Shell Admins group does not match" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -881,6 +889,7 @@ function Test-TargetResource { if (-not $database.Members) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -888,7 +897,8 @@ function Test-TargetResource { if (-not($database.Members.Contains($member))) { - Write-Verbose -Message "$member is not a Shell Admin. Set result to false" + Write-Verbose -Message "$member is not a Shell Admin." + Write-Verbose -Message "Test-TargetResource returned false" return $false } else @@ -906,7 +916,8 @@ function Test-TargetResource { if ($database.Members.Contains($member)) { - Write-Verbose -Message "$member is a Shell Admin. Set result to false" + Write-Verbose -Message "$member is a Shell Admin." + Write-Verbose -Message "Test-TargetResource returned false" return $false } else @@ -941,6 +952,7 @@ function Test-TargetResource Write-Verbose -Message "Processing Members parameter" if (-not $currentCDB.Members) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -954,6 +966,7 @@ function Test-TargetResource else { Write-Verbose -Message "Shell Admins group does not match" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -963,6 +976,7 @@ function Test-TargetResource Write-Verbose -Message "Processing MembersToInclude parameter" if (-not $currentCDB.Members) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -970,7 +984,8 @@ function Test-TargetResource { if (-not($currentCDB.Members.Contains($member))) { - Write-Verbose -Message "$member is not a Shell Admin. Set result to false" + Write-Verbose -Message "$member is not a Shell Admin." + Write-Verbose -Message "Test-TargetResource returned false" return $false } else @@ -989,7 +1004,8 @@ function Test-TargetResource { if ($currentCDB.Members.Contains($member)) { - Write-Verbose -Message "$member is a Shell Admin. Set result to false" + Write-Verbose -Message "$member is a Shell Admin." + Write-Verbose -Message "Test-TargetResource returned false" return $false } else @@ -1007,6 +1023,7 @@ function Test-TargetResource } } + Write-Verbose -Message "Test-TargetResource returned true" return $true } diff --git a/SharePointDsc/DSCResources/MSFT_SPSite/MSFT_SPSite.psm1 b/SharePointDsc/DSCResources/MSFT_SPSite/MSFT_SPSite.psm1 index 7c306b3d8..7fd23228f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSite/MSFT_SPSite.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSite/MSFT_SPSite.psm1 @@ -488,17 +488,22 @@ function Test-TargetResource { if ($CurrentValues.CreateDefaultGroups -ne $true) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Url", "QuotaTemplate", "OwnerAlias", "SecondaryOwnerAlias", "AdministrationSiteType") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSitePropertyBag/MSFT_SPSitePropertyBag.psm1 b/SharePointDsc/DSCResources/MSFT_SPSitePropertyBag/MSFT_SPSitePropertyBag.psm1 index 83aae3ca2..57822f819 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSitePropertyBag/MSFT_SPSitePropertyBag.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSitePropertyBag/MSFT_SPSitePropertyBag.psm1 @@ -170,18 +170,21 @@ function Test-TargetResource() if ($Ensure -eq 'Present') { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('Ensure', 'Key', 'Value') } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('Ensure', 'Key') } + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSiteUrl/MSFT_SPSiteUrl.psm1 b/SharePointDsc/DSCResources/MSFT_SPSiteUrl/MSFT_SPSiteUrl.psm1 index 83fcf0af9..5ffcc3c3c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSiteUrl/MSFT_SPSiteUrl.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSiteUrl/MSFT_SPSiteUrl.psm1 @@ -320,29 +320,35 @@ function Test-TargetResource $null -eq $CurrentValues.Extranet -and $null -eq $CurrentValues.Custom) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } if ([String]$CurrentValues.Intranet -ne $Intranet) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } if ([String]$CurrentValues.Internet -ne $Internet) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } if ([String]$CurrentValues.Extranet -ne $Extranet) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } if ([String]$CurrentValues.Custom -ne $Custom) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } + Write-Verbose -Message "Test-TargetResource returned true" return $true } diff --git a/SharePointDsc/DSCResources/MSFT_SPStateServiceApp/MSFT_SPStateServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPStateServiceApp/MSFT_SPStateServiceApp.psm1 index 0f74a8ee2..fe3f2cc6b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPStateServiceApp/MSFT_SPStateServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPStateServiceApp/MSFT_SPStateServiceApp.psm1 @@ -231,9 +231,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPSubscriptionSettingsServiceApp/MSFT_SPSubscriptionSettingsServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPSubscriptionSettingsServiceApp/MSFT_SPSubscriptionSettingsServiceApp.psm1 index 94d130df1..c2859fef2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSubscriptionSettingsServiceApp/MSFT_SPSubscriptionSettingsServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSubscriptionSettingsServiceApp/MSFT_SPSubscriptionSettingsServiceApp.psm1 @@ -276,6 +276,7 @@ function Test-TargetResource } if ($null -eq $serviceAppProxy) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -283,20 +284,25 @@ function Test-TargetResource if ($result -eq $false) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPTimerJobState/MSFT_SPTimerJobState.psm1 b/SharePointDsc/DSCResources/MSFT_SPTimerJobState/MSFT_SPTimerJobState.psm1 index 58f20337a..ef09f6b99 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTimerJobState/MSFT_SPTimerJobState.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTimerJobState/MSFT_SPTimerJobState.psm1 @@ -348,8 +348,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuer/MSFT_SPTrustedIdentityTokenIssuer.psm1 b/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuer/MSFT_SPTrustedIdentityTokenIssuer.psm1 index c6c4c2fce..a3b32362b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuer/MSFT_SPTrustedIdentityTokenIssuer.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuer/MSFT_SPTrustedIdentityTokenIssuer.psm1 @@ -428,7 +428,6 @@ function Test-TargetResource $PSBoundParameters.ContainsKey("SigningCertificateFilePath")) { throw ("Cannot use both parameters SigningCertificateThumbprint and SigningCertificateFilePath at the same time.") - return } if ($PSBoundParameters.ContainsKey("SigningCertificateThumbprint") -eq $false -and ` @@ -436,7 +435,6 @@ function Test-TargetResource { throw ("At least one of the following parameters must be specified: " + ` "SigningCertificateThumbprint, SigningCertificateFilePath.") - return } $CurrentValues = Get-TargetResource @PSBoundParameters @@ -444,9 +442,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuerProviderRealms/MSFT_SPTrustedIdentityTokenIssuerProviderRealms.psm1 b/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuerProviderRealms/MSFT_SPTrustedIdentityTokenIssuerProviderRealms.psm1 index 05c15034b..aaabd2a11 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuerProviderRealms/MSFT_SPTrustedIdentityTokenIssuerProviderRealms.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuerProviderRealms/MSFT_SPTrustedIdentityTokenIssuerProviderRealms.psm1 @@ -226,9 +226,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 b/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 index 278604d1d..339ad3cb5 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 @@ -320,16 +320,20 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "CertificateThumbprint", "Ensure") } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPTrustedSecurityTokenIssuer/MSFT_SPTrustedSecurityTokenIssuer.psm1 b/SharePointDsc/DSCResources/MSFT_SPTrustedSecurityTokenIssuer/MSFT_SPTrustedSecurityTokenIssuer.psm1 index 468b4d65d..7bd6e2e09 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTrustedSecurityTokenIssuer/MSFT_SPTrustedSecurityTokenIssuer.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTrustedSecurityTokenIssuer/MSFT_SPTrustedSecurityTokenIssuer.psm1 @@ -480,9 +480,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPUsageApplication/MSFT_SPUsageApplication.psm1 b/SharePointDsc/DSCResources/MSFT_SPUsageApplication/MSFT_SPUsageApplication.psm1 index 955610855..1be16a997 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUsageApplication/MSFT_SPUsageApplication.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUsageApplication/MSFT_SPUsageApplication.psm1 @@ -317,7 +317,7 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("UsageLogCutTime", "UsageLogLocation", @@ -327,10 +327,14 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileProperty/MSFT_SPUserProfileProperty.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileProperty/MSFT_SPUserProfileProperty.psm1 index e7bdcfbbf..8caf23086 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileProperty/MSFT_SPUserProfileProperty.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileProperty/MSFT_SPUserProfileProperty.psm1 @@ -825,7 +825,7 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "DisplayName", @@ -851,10 +851,14 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileSection/MSFT_SPUserProfileSection.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileSection/MSFT_SPUserProfileSection.psm1 index ba1a18a4e..d122e4ea4 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileSection/MSFT_SPUserProfileSection.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileSection/MSFT_SPUserProfileSection.psm1 @@ -226,7 +226,7 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "DisplayName", @@ -235,10 +235,14 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceApp/MSFT_SPUserProfileServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceApp/MSFT_SPUserProfileServiceApp.psm1 index f4c3cc651..1782318a8 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceApp/MSFT_SPUserProfileServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceApp/MSFT_SPUserProfileServiceApp.psm1 @@ -682,23 +682,29 @@ function Test-TargetResource if ($UpdateProxyGroup -eq $true -and ` $CurrentValues.UpdateProxyGroup -eq $true) { - return $false + $result = $false + } + else + { + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -DesiredValues $PSBoundParameters ` + -ValuesToCheck @("Name", + "EnableNetBIOS", + "NoILMUsed", + "SiteNamingConflictResolution", + "Ensure") } - - return Test-SPDscParameterState -CurrentValues $CurrentValues ` - -DesiredValues $PSBoundParameters ` - -ValuesToCheck @("Name", - "EnableNetBIOS", - "NoILMUsed", - "SiteNamingConflictResolution", - "Ensure") } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceAppPermissions/MSFT_SPUserProfileServiceAppPermissions.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceAppPermissions/MSFT_SPUserProfileServiceAppPermissions.psm1 index 22cceee1b..348ef23e6 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceAppPermissions/MSFT_SPUserProfileServiceAppPermissions.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceAppPermissions/MSFT_SPUserProfileServiceAppPermissions.psm1 @@ -341,11 +341,15 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("CreatePersonalSite", ` "FollowAndEditProfile", ` "UseTagsAndNotes") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } function Confirm-SPDscUpaPermissionsConfig() diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncConnection/MSFT_SPUserProfileSyncConnection.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncConnection/MSFT_SPUserProfileSyncConnection.psm1 index bed1da896..909eaf9c5 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncConnection/MSFT_SPUserProfileSyncConnection.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncConnection/MSFT_SPUserProfileSyncConnection.psm1 @@ -617,6 +617,7 @@ function Test-TargetResource { if ($Force -eq $true) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -624,9 +625,13 @@ function Test-TargetResource $valuesToCheck += "Server" } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } <# diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncService/MSFT_SPUserProfileSyncService.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncService/MSFT_SPUserProfileSyncService.psm1 index 47978e799..c63344e8f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncService/MSFT_SPUserProfileSyncService.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncService/MSFT_SPUserProfileSyncService.psm1 @@ -415,9 +415,13 @@ function Test-TargetResource } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } function Test-SPDscUserProfileDBReadOnly() diff --git a/SharePointDsc/DSCResources/MSFT_SPVisioServiceApp/MSFT_SPVisioServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPVisioServiceApp/MSFT_SPVisioServiceApp.psm1 index 7f60ce20c..fc0880ab7 100644 --- a/SharePointDsc/DSCResources/MSFT_SPVisioServiceApp/MSFT_SPVisioServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPVisioServiceApp/MSFT_SPVisioServiceApp.psm1 @@ -226,9 +226,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWeb/MSFT_SPWeb.psm1 b/SharePointDsc/DSCResources/MSFT_SPWeb/MSFT_SPWeb.psm1 index c5854c6cb..62bcabe99 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWeb/MSFT_SPWeb.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWeb/MSFT_SPWeb.psm1 @@ -336,9 +336,13 @@ function Test-TargetResource "Ensure") } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 index 6a9586ffe..cabad7655 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 @@ -501,6 +501,7 @@ function Test-TargetResource $null -eq $CurrentValues.Extranet -and ` $null -eq $CurrentValues.Custom) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -511,6 +512,7 @@ function Test-TargetResource if ($result -eq $false) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -527,6 +529,7 @@ function Test-TargetResource if ($result -eq $false) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -543,6 +546,7 @@ function Test-TargetResource if ($result -eq $false) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -559,6 +563,7 @@ function Test-TargetResource if ($result -eq $false) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -567,6 +572,7 @@ function Test-TargetResource { if ($CurrentValues.ContainsKey("Custom") -eq $false) { + Write-Verbose -Message "Test-TargetResource returned false" throw "Specified zone Custom does not exist" } @@ -575,10 +581,12 @@ function Test-TargetResource if ($result -eq $false) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } + Write-Verbose -Message "Test-TargetResource returned true" return $true } diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppBlockedFileTypes/MSFT_SPWebAppBlockedFileTypes.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppBlockedFileTypes/MSFT_SPWebAppBlockedFileTypes.psm1 index f8201508e..7c76964cb 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppBlockedFileTypes/MSFT_SPWebAppBlockedFileTypes.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppBlockedFileTypes/MSFT_SPWebAppBlockedFileTypes.psm1 @@ -147,8 +147,12 @@ function Test-TargetResource $modulePath = "..\..\Modules\SharePointDsc.WebApplication\SPWebApplication.BlockedFileTypes.psm1" Import-Module -Name (Join-Path -Path $PSScriptRoot -ChildPath $modulePath -Resolve) - return Test-SPDscWebApplicationBlockedFileTypeConfig -CurrentSettings $CurrentValues ` + $result = Test-SPDscWebApplicationBlockedFileTypeConfig -CurrentSettings $CurrentValues ` -DesiredSettings $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppClientCallableSettings/MSFT_SPWebAppClientCallableSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppClientCallableSettings/MSFT_SPWebAppClientCallableSettings.psm1 index 3ae2b3b64..a36fef0bf 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppClientCallableSettings/MSFT_SPWebAppClientCallableSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppClientCallableSettings/MSFT_SPWebAppClientCallableSettings.psm1 @@ -476,6 +476,7 @@ function Test-TargetResource if ($null -eq $CurrentValues.ProxyLibraries) { Write-Verbose -Message "Proxy library list does not have a valid value" + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -488,6 +489,7 @@ function Test-TargetResource if ($ProxyLibraries.Count -gt 0) { Write-Verbose -Message "Proxy library list does not match" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -496,6 +498,7 @@ function Test-TargetResource if ($ProxyLibraries.Count -eq 0) { Write-Verbose -Message "Proxy library list does not match" + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -512,7 +515,8 @@ function Test-TargetResource } | Select-Object -First 1).SupportAppAuthentication if ($currentProxyLibrary.SupportAppAuthentication -ne $supportAppAuth) { - Write-Verbose -Message "$($currentProxyLibrary.AssemblyName) has incorrect SupportAppAuthentication. Test failed." + Write-Verbose -Message "$($currentProxyLibrary.AssemblyName) has incorrect SupportAppAuthentication." + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -520,6 +524,7 @@ function Test-TargetResource else { Write-Verbose -Message "Proxy library list does not match" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -534,6 +539,7 @@ function Test-TargetResource if ($ProxyLibrariesToInclude.Count -gt 0) { Write-Verbose -Message "Proxy library list to include does not match" + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -543,7 +549,8 @@ function Test-TargetResource { if (-not($CurrentValues.ProxyLibraries.AssemblyName -contains $proxyLibrary.AssemblyName)) { - Write-Verbose -Message "$($proxyLibrary.AssemblyName) is not registered as a proxy library. Set result to false" + Write-Verbose -Message "$($proxyLibrary.AssemblyName) is not registered as a proxy library." + Write-Verbose -Message "Test-TargetResource returned false" return $false } else @@ -554,7 +561,8 @@ function Test-TargetResource } | Select-Object -First 1).SupportAppAuthentication if ($proxyLibrary.SupportAppAuthentication -ne $supportAppAuth) { - Write-Verbose -Message "$($proxyLibrary.AssemblyName) has incorrect SupportAppAuthentication. Test failed." + Write-Verbose -Message "$($proxyLibrary.AssemblyName) has incorrect SupportAppAuthentication." + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -571,7 +579,8 @@ function Test-TargetResource { if ($CurrentValues.ProxyLibraries.AssemblyName -contains $proxyLibrary) { - Write-Verbose -Message "$proxyLibrary is already registered as proxy library. Set result to false" + Write-Verbose -Message "$proxyLibrary is already registered as proxy library." + Write-Verbose -Message "Test-TargetResource returned false" return $false } else @@ -582,7 +591,7 @@ function Test-TargetResource } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("WebAppUrl", "MaxResourcesPerRequest", @@ -594,6 +603,10 @@ function Test-TargetResource "RequestUsageExecutionTimeThreshold", "LogActionsIfHasRequestException", "EnableRequestUsage") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppGeneralSettings/MSFT_SPWebAppGeneralSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppGeneralSettings/MSFT_SPWebAppGeneralSettings.psm1 index dc2d0f3fc..e6db15b15 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppGeneralSettings/MSFT_SPWebAppGeneralSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppGeneralSettings/MSFT_SPWebAppGeneralSettings.psm1 @@ -380,7 +380,11 @@ function Test-TargetResource $modulePath = "..\..\Modules\SharePointDsc.WebApplication\SPWebApplication.GeneralSettings.psm1" Import-Module -Name (Join-Path -Path $PSScriptRoot -ChildPath $modulePath -Resolve) - return Test-SPDscWebApplicationGeneralConfig -CurrentSettings $CurrentValues -DesiredSettings $PSBoundParameters + $result = Test-SPDscWebApplicationGeneralConfig -CurrentSettings $CurrentValues -DesiredSettings $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppPeoplePickerSettings/MSFT_SPWebAppPeoplePickerSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppPeoplePickerSettings/MSFT_SPWebAppPeoplePickerSettings.psm1 index 2305b6b10..1fb0adb18 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppPeoplePickerSettings/MSFT_SPWebAppPeoplePickerSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppPeoplePickerSettings/MSFT_SPWebAppPeoplePickerSettings.psm1 @@ -285,6 +285,7 @@ function Test-TargetResource } if ($null -eq $configuredDomain) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -299,16 +300,21 @@ function Test-TargetResource if ($null -eq $specifiedDomain) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ActiveDirectoryCustomFilter", ` "ActiveDirectoryCustomQuery", ` "ActiveDirectorySearchTimeout", ` "OnlySearchWithinSiteCollection") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppPermissions/MSFT_SPWebAppPermissions.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppPermissions/MSFT_SPWebAppPermissions.psm1 index b11d7a50a..6c5cce829 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppPermissions/MSFT_SPWebAppPermissions.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppPermissions/MSFT_SPWebAppPermissions.psm1 @@ -526,41 +526,45 @@ function Test-TargetResource { if ($CurrentValues.ContainsKey("AllPermissions")) { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AllPermissions") } else { - return $false + $result = $false } } else { if ($CurrentValues.ContainsKey("AllPermissions")) { - return $false + $result = $false } else { + $result = $true if ($null -ne (Compare-Object -ReferenceObject $ListPermissions ` -DifferenceObject $CurrentValues.ListPermissions)) { - return $false + $result = $false } if ($null -ne (Compare-Object -ReferenceObject $SitePermissions ` -DifferenceObject $CurrentValues.SitePermissions)) { - return $false + $result = $false } if ($null -ne (Compare-Object -ReferenceObject $PersonalPermissions ` -DifferenceObject $CurrentValues.PersonalPermissions)) { - return $false + $result = $false } - return $true } } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } function Test-SPDscInput() diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppPolicy/MSFT_SPWebAppPolicy.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppPolicy/MSFT_SPWebAppPolicy.psm1 index 93118727b..fb2265ade 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppPolicy/MSFT_SPWebAppPolicy.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppPolicy/MSFT_SPWebAppPolicy.psm1 @@ -649,6 +649,7 @@ function Test-TargetResource if ($null -eq $CurrentValues.WebAppUrl) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -730,13 +731,16 @@ function Test-TargetResource { if ($differences.Count -eq 0) { - return $true + $result = $true } else { Write-Verbose -Message "Differences in the policy were found, returning false" - return $false + $result = $false } + + Write-Verbose -Message "Test-TargetResource returned $result" + return $result } # If only checking members to include only differences or missing records count as a fail @@ -747,22 +751,27 @@ function Test-TargetResource }).Count if ($diffcount -eq 0) { - return $true + $result = $true } else { Write-Verbose -Message "Different or Missing policy was found, returning false" - return $false + $result = $false } + + Write-Verbose -Message "Test-TargetResource returned $result" + return $result } } - # If checking members to exlclude, simply compare the list of user names to the current + # If checking members to exclude, simply compare the list of user names to the current # membership list if ($MembersToExclude) { Write-Verbose -Message ("MembersToExclude property is set - checking for permissions " + ` "that need to be removed") + + $result = $true foreach ($member in $MembersToExclude) { if (($cacheAccounts.SuperUserAccount -eq $member.Username) -or ` @@ -775,11 +784,14 @@ function Test-TargetResource { if ($policy.Username -eq $member.Username) { - return $false + $result = $false } } } - return $true + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } } diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppPropertyBag/MSFT_SPWebAppPropertyBag.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppPropertyBag/MSFT_SPWebAppPropertyBag.psm1 index 9bde161d3..2fc665c2b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppPropertyBag/MSFT_SPWebAppPropertyBag.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppPropertyBag/MSFT_SPWebAppPropertyBag.psm1 @@ -160,18 +160,21 @@ function Test-TargetResource() if ($Ensure -eq 'Present') { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('Ensure', 'Key', 'Value') } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('Ensure', 'Key') } + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppProxyGroup/MSFT_SPWebAppProxyGroup.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppProxyGroup/MSFT_SPWebAppProxyGroup.psm1 index 6dfa2b7fc..7ba4d369f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppProxyGroup/MSFT_SPWebAppProxyGroup.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppProxyGroup/MSFT_SPWebAppProxyGroup.psm1 @@ -121,17 +121,23 @@ function Test-TargetResource if (($null -eq $CurrentValues.WebAppUrl) -or ($null -eq $CurrentValues.ServiceAppProxyGroup)) { - return $false - } - - if ($CurrentValues.ServiceAppProxyGroup -eq $ServiceAppProxyGroup) - { - return $true + $result = $false } else { - return $false + if ($CurrentValues.ServiceAppProxyGroup -eq $ServiceAppProxyGroup) + { + $result = $true + } + else + { + $result = $false + } } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppSiteUseAndDeletion/MSFT_SPWebAppSiteUseAndDeletion.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppSiteUseAndDeletion/MSFT_SPWebAppSiteUseAndDeletion.psm1 index 3bc3e33be..63dbcbe43 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppSiteUseAndDeletion/MSFT_SPWebAppSiteUseAndDeletion.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppSiteUseAndDeletion/MSFT_SPWebAppSiteUseAndDeletion.psm1 @@ -244,8 +244,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppSuiteBar/MSFT_SPWebAppSuiteBar.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppSuiteBar/MSFT_SPWebAppSuiteBar.psm1 index 1693b3429..3b55008d1 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppSuiteBar/MSFT_SPWebAppSuiteBar.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppSuiteBar/MSFT_SPWebAppSuiteBar.psm1 @@ -251,6 +251,7 @@ function Test-TargetResource if ($null -eq $CurrentValues.WebAppUrl) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -258,13 +259,13 @@ function Test-TargetResource if ($installedVersion.FileMajorPart -eq 15) { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SuiteBarBrandingElementHtml"); } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SuiteBarBrandingElementHtml", "SuiteNavBrandingLogoNavigationUrl", @@ -272,6 +273,10 @@ function Test-TargetResource "SuiteNavBrandingLogoUrl", "SuiteNavBrandingText") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppThrottlingSettings/MSFT_SPWebAppThrottlingSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppThrottlingSettings/MSFT_SPWebAppThrottlingSettings.psm1 index 7361cc580..8a2e23687 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppThrottlingSettings/MSFT_SPWebAppThrottlingSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppThrottlingSettings/MSFT_SPWebAppThrottlingSettings.psm1 @@ -256,8 +256,12 @@ function Test-TargetResource $relPath = "..\..\Modules\SharePointDsc.WebApplication\SPWebApplication.Throttling.psm1" Import-Module -Name (Join-Path -Path $PSScriptRoot -ChildPath $relPath -Resolve) - return Test-SPDscWebApplicationThrottlingConfig -CurrentSettings $CurrentValues ` + $result = Test-SPDscWebApplicationThrottlingConfig -CurrentSettings $CurrentValues ` -DesiredSettings $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppWorkflowSettings/MSFT_SPWebAppWorkflowSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppWorkflowSettings/MSFT_SPWebAppWorkflowSettings.psm1 index 536cf7e4a..4417ff4ea 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppWorkflowSettings/MSFT_SPWebAppWorkflowSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppWorkflowSettings/MSFT_SPWebAppWorkflowSettings.psm1 @@ -146,8 +146,12 @@ function Test-TargetResource $relPath = "..\..\Modules\SharePointDsc.WebApplication\SPWebApplication.Workflow.psm1" Import-Module (Join-Path $PSScriptRoot $relPath -Resolve) - return Test-SPDscWebApplicationWorkflowConfig -CurrentSettings $CurrentValues ` + $result = Test-SPDscWebApplicationWorkflowConfig -CurrentSettings $CurrentValues ` -DesiredSettings $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebApplication/MSFT_SPWebApplication.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebApplication/MSFT_SPWebApplication.psm1 index d8946bccc..3e5530c2e 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebApplication/MSFT_SPWebApplication.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebApplication/MSFT_SPWebApplication.psm1 @@ -351,10 +351,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - $testReturn = Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") - return $testReturn + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebApplicationAppDomain/MSFT_SPWebApplicationAppDomain.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebApplicationAppDomain/MSFT_SPWebApplicationAppDomain.psm1 index 8c90c1dfc..f669c27ce 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebApplicationAppDomain/MSFT_SPWebApplicationAppDomain.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebApplicationAppDomain/MSFT_SPWebApplicationAppDomain.psm1 @@ -174,9 +174,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AppDomain", "Port", "SSL") + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWebApplicationExtension/MSFT_SPWebApplicationExtension.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebApplicationExtension/MSFT_SPWebApplicationExtension.psm1 index 1bfb199d4..da72ffd1c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebApplicationExtension/MSFT_SPWebApplicationExtension.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebApplicationExtension/MSFT_SPWebApplicationExtension.psm1 @@ -327,10 +327,13 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - $testReturn = Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "AllowAnonymous") - return $testReturn + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWordAutomationServiceApp/MSFT_SPWordAutomationServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPWordAutomationServiceApp/MSFT_SPWordAutomationServiceApp.psm1 index 677e4d3d2..e1d9d4e9f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWordAutomationServiceApp/MSFT_SPWordAutomationServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWordAutomationServiceApp/MSFT_SPWordAutomationServiceApp.psm1 @@ -673,8 +673,12 @@ function Test-TargetResource Write-Verbose -Message "Current Values: $(Convert-SPDscHashtableToString -Hashtable $CurrentValues)" Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWorkManagementServiceApp/MSFT_SPWorkManagementServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPWorkManagementServiceApp/MSFT_SPWorkManagementServiceApp.psm1 index fea67f7cd..54bbb5ba5 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWorkManagementServiceApp/MSFT_SPWorkManagementServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWorkManagementServiceApp/MSFT_SPWorkManagementServiceApp.psm1 @@ -404,7 +404,7 @@ function Test-TargetResource if ($Ensure -eq "Present") { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "MinimumTimeBetweenEwsSyncSubscriptionSearches", @@ -418,10 +418,14 @@ function Test-TargetResource } else { - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource diff --git a/SharePointDsc/DSCResources/MSFT_SPWorkflowService/MSFT_SPWorkflowService.psm1 b/SharePointDsc/DSCResources/MSFT_SPWorkflowService/MSFT_SPWorkflowService.psm1 index 66a37596b..a08fb74ac 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWorkflowService/MSFT_SPWorkflowService.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWorkflowService/MSFT_SPWorkflowService.psm1 @@ -164,6 +164,7 @@ function Test-TargetResource if ($null -eq $CurrentValues.WorkflowHostUri) { + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -175,9 +176,13 @@ function Test-TargetResource $valuesToCheck += "ScopeName" } - return Test-SPDscParameterState -CurrentValues $CurrentValues ` + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck + + Write-Verbose -Message "Test-TargetResource returned $result" + + return $result } Export-ModuleMember -Function *-TargetResource From 17d3f2a044adb3998a6bba311c10efacbc4ecd38 Mon Sep 17 00:00:00 2001 From: Yorick Kuijs Date: Thu, 20 Feb 2020 21:52:58 +0100 Subject: [PATCH 2/5] Added Help generation --- CHANGELOG.md | 2 +- build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25c2cc11b..37933d803 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - SharePointDsc - Added automatic release with a new CI pipeline - Updated PULL_REQUEST_TEMPLATE.md to match DSC standard - - Prepared Conceptual Help and Wiki Content generation + - Added Conceptual Help generation - SPAzureAccessControlServiceAppProxy - Added new resource to create Azure Access Control Service Application Proxy - SPExcelServiceApp diff --git a/build.yaml b/build.yaml index 9227c86c6..aefbd1d71 100644 --- a/build.yaml +++ b/build.yaml @@ -45,7 +45,7 @@ BuildWorkflow: - Build_Module_ModuleBuilder - Build_NestedModules_ModuleBuilder - Create_changelog_release_output - #- Generate_Conceptual_Help + - Generate_Conceptual_Help pack: - build From 9d02a9a5fde710f8475ee3463773eacb82fc29e0 Mon Sep 17 00:00:00 2001 From: Yorick Kuijs Date: Fri, 21 Feb 2020 12:20:12 +0100 Subject: [PATCH 3/5] Prepared Wiki Content generation --- CHANGELOG.md | 2 +- build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37933d803..25c2cc11b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - SharePointDsc - Added automatic release with a new CI pipeline - Updated PULL_REQUEST_TEMPLATE.md to match DSC standard - - Added Conceptual Help generation + - Prepared Conceptual Help and Wiki Content generation - SPAzureAccessControlServiceAppProxy - Added new resource to create Azure Access Control Service Application Proxy - SPExcelServiceApp diff --git a/build.yaml b/build.yaml index aefbd1d71..9227c86c6 100644 --- a/build.yaml +++ b/build.yaml @@ -45,7 +45,7 @@ BuildWorkflow: - Build_Module_ModuleBuilder - Build_NestedModules_ModuleBuilder - Create_changelog_release_output - - Generate_Conceptual_Help + #- Generate_Conceptual_Help pack: - build From 62fc5f3be9e5e0d976f5d9b1c855267a6f4a551a Mon Sep 17 00:00:00 2001 From: Yorick Kuijs Date: Fri, 13 Mar 2020 09:37:03 +0100 Subject: [PATCH 4/5] Added SharePointDsc event log and logging of all test results --- CHANGELOG.md | 7 + .../MSFT_SPAccessServiceApp.psm1 | 10 +- .../MSFT_SPAccessServices2010.psm1 | 1 + .../MSFT_SPAlternateUrl.psm1 | 2 + .../MSFT_SPAntivirusSettings.psm1 | 1 + .../MSFT_SPAppCatalog/MSFT_SPAppCatalog.psm1 | 1 + .../MSFT_SPAppDomain/MSFT_SPAppDomain.psm1 | 1 + .../MSFT_SPAppManagementServiceApp.psm1 | 19 +- .../MSFT_SPAppStoreSettings.psm1 | 16 +- .../MSFT_SPAuthenticationRealm.psm1 | 1 + ...T_SPAzureAccessControlServiceAppProxy.psm1 | 2 + .../MSFT_SPBCSServiceApp.psm1 | 1 + .../MSFT_SPBlobCacheSettings.psm1 | 14 +- .../MSFT_SPCacheAccounts.psm1 | 2 + .../MSFT_SPConfigWizard.psm1 | 1 + .../MSFT_SPContentDatabase.psm1 | 10 +- .../MSFT_SPDatabaseAAG.psm1 | 1 + .../MSFT_SPDesignerSettings.psm1 | 1 + .../MSFT_SPDiagnosticLoggingSettings.psm1 | 1 + .../MSFT_SPDiagnosticsProvider.psm1 | 1 + ...MSFT_SPDistributedCacheClientSettings.psm1 | 91 +++--- .../MSFT_SPDistributedCacheService.psm1 | 9 +- .../MSFT_SPExcelServiceApp.psm1 | 66 +++-- .../DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 | 11 +- .../MSFT_SPFarmAdministrators.psm1 | 28 +- .../MSFT_SPFarmPropertyBag.psm1 | 1 + .../MSFT_SPFarmSolution.psm1 | 1 + .../MSFT_SPFeature/MSFT_SPFeature.psm1 | 1 + .../MSFT_SPHealthAnalyzerRuleState.psm1 | 1 + .../MSFT_SPIncomingEmailSettings.psm1 | 1 + .../MSFT_SPInfoPathFormsServiceConfig.psm1 | 29 +- .../MSFT_SPInstall/MSFT_SPInstall.psm1 | 1 + .../MSFT_SPInstallLanguagePack.psm1 | 1 + .../MSFT_SPInstallPrereqs.psm1 | 1 + .../MSFT_SPIrmSettings.psm1 | 1 + .../MSFT_SPLogLevel/MSFT_SPLogLevel.psm1 | 32 ++- .../MSFT_SPMachineTranslationServiceApp.psm1 | 9 +- .../MSFT_SPManagedAccount.psm1 | 9 +- .../MSFT_SPManagedMetaDataServiceApp.psm1 | 1 + ...FT_SPManagedMetadataServiceAppDefault.psm1 | 1 + .../MSFT_SPManagedPath.psm1 | 9 +- .../MSFT_SPMinRoleCompliance.psm1 | 1 + ...FT_SPOAppPrincipalMgmtServiceAppProxy.psm1 | 2 + .../MSFT_SPOfficeOnlineServerBinding.psm1 | 1 + .../MSFT_SPOutgoingEmailSettings.psm1 | 11 +- .../MSFT_SPPasswordChangeSettings.psm1 | 7 +- .../MSFT_SPPerformancePointServiceApp.psm1 | 1 + ...MSFT_SPPowerPointAutomationServiceApp.psm1 | 2 + .../MSFT_SPProductUpdate.psm1 | 1 + ...SFT_SPProjectServerADResourcePoolSync.psm1 | 1 + ...SFT_SPProjectServerAdditionalSettings.psm1 | 9 +- ...MSFT_SPProjectServerGlobalPermissions.psm1 | 7 +- .../MSFT_SPProjectServerGroup.psm1 | 23 +- .../MSFT_SPProjectServerLicense.psm1 | 1 + .../MSFT_SPProjectServerPermissionMode.psm1 | 1 + .../MSFT_SPProjectServerServiceApp.psm1 | 2 + ...MSFT_SPProjectServerTimeSheetSettings.psm1 | 1 + .../MSFT_SPProjectServerUserSyncSettings.psm1 | 1 + .../MSFT_SPProjectServerWssSettings.psm1 | 1 + .../MSFT_SPPublishServiceApplication.psm1 | 1 + .../MSFT_SPQuotaTemplate.psm1 | 12 +- .../MSFT_SPRemoteFarmTrust.psm1 | 1 + .../MSFT_SPSearchAuthoritativePage.psm1 | 21 +- .../MSFT_SPSearchContentSource.psm1 | 35 ++- .../MSFT_SPSearchCrawlMapping.psm1 | 2 + .../MSFT_SPSearchCrawlRule.psm1 | 21 +- .../MSFT_SPSearchCrawlerImpactRule.psm1 | 2 + .../MSFT_SPSearchFileType.psm1 | 11 +- .../MSFT_SPSearchIndexPartition.psm1 | 1 + .../MSFT_SPSearchManagedProperty.psm1 | 25 +- .../MSFT_SPSearchMetadataCategory.psm1 | 11 +- .../MSFT_SPSearchResultSource.psm1 | 1 + .../MSFT_SPSearchServiceApp.psm1 | 16 +- .../MSFT_SPSearchServiceSettings.psm1 | 9 +- .../MSFT_SPSearchTopology.psm1 | 15 +- .../MSFT_SPSecureStoreServiceApp.psm1 | 18 +- .../MSFT_SPSecurityTokenServiceConfig.psm1 | 9 +- .../MSFT_SPSelfServiceSiteCreation.psm1 | 2 + .../MSFT_SPServiceAppPool.psm1 | 2 + .../MSFT_SPServiceAppProxyGroup.psm1 | 33 ++- .../MSFT_SPServiceAppSecurity.psm1 | 45 ++- .../MSFT_SPServiceIdentity.psm1 | 8 + .../MSFT_SPServiceInstance.psm1 | 1 + .../MSFT_SPSessionStateService.psm1 | 2 + .../MSFT_SPShellAdmins.psm1 | 76 +++++- .../DSCResources/MSFT_SPSite/MSFT_SPSite.psm1 | 13 +- .../MSFT_SPSitePropertyBag.psm1 | 2 + .../MSFT_SPSiteUrl/MSFT_SPSiteUrl.psm1 | 20 ++ .../MSFT_SPStateServiceApp.psm1 | 1 + ...MSFT_SPSubscriptionSettingsServiceApp.psm1 | 7 +- .../MSFT_SPTimerJobState.psm1 | 1 + .../MSFT_SPTrustedIdentityTokenIssuer.psm1 | 1 + ...stedIdentityTokenIssuerProviderRealms.psm1 | 1 + .../MSFT_SPTrustedRootAuthority.psm1 | 2 + .../MSFT_SPTrustedSecurityTokenIssuer.psm1 | 1 + .../MSFT_SPUsageApplication.psm1 | 10 +- .../MSFT_SPUserProfileProperty.psm1 | 42 +-- .../MSFT_SPUserProfileSection.psm1 | 8 +- .../MSFT_SPUserProfileServiceApp.psm1 | 6 + ...FT_SPUserProfileServiceAppPermissions.psm1 | 1 + .../MSFT_SPUserProfileSyncConnection.psm1 | 1 + .../MSFT_SPUserProfileSyncService.psm1 | 1 + .../MSFT_SPVisioServiceApp.psm1 | 1 + .../DSCResources/MSFT_SPWeb/MSFT_SPWeb.psm1 | 1 + .../MSFT_SPWebAppAuthentication.psm1 | 105 ++++++- .../MSFT_SPWebAppBlockedFileTypes.psm1 | 1 + .../MSFT_SPWebAppClientCallableSettings.psm1 | 19 +- .../MSFT_SPWebAppGeneralSettings.psm1 | 3 +- .../MSFT_SPWebAppPeoplePickerSettings.psm1 | 9 + .../MSFT_SPWebAppPermissions.psm1 | 49 +++- .../MSFT_SPWebAppPolicy.psm1 | 106 ++++++- .../MSFT_SPWebAppPropertyBag.psm1 | 2 + .../MSFT_SPWebAppProxyGroup.psm1 | 10 +- .../MSFT_SPWebAppSiteUseAndDeletion.psm1 | 1 + .../MSFT_SPWebAppSuiteBar.psm1 | 9 +- .../MSFT_SPWebAppThrottlingSettings.psm1 | 1 + .../MSFT_SPWebAppWorkflowSettings.psm1 | 1 + .../MSFT_SPWebApplication.psm1 | 1 + .../MSFT_SPWebApplicationAppDomain.psm1 | 1 + .../MSFT_SPWebApplicationExtension.psm1 | 1 + .../MSFT_SPWordAutomationServiceApp.psm1 | 1 + .../MSFT_SPWorkManagementServiceApp.psm1 | 18 +- .../MSFT_SPWorkflowService.psm1 | 5 + .../SharePointDsc.Util.psm1 | 258 +++++++++++++++++- .../SPWebAppPolicy.psm1 | 8 +- .../SPWebApplication.BlockedFileTypes.psm1 | 24 +- .../SPWebApplication.GeneralSettings.psm1 | 1 + .../SPWebApplication.Throttling.psm1 | 30 +- .../SPWebApplication.Workflow.psm1 | 9 +- ...SharePointDsc.SPAccessServiceApp.Tests.ps1 | 6 + .../SharePointDsc.SPWebAppPolicy.Tests.ps1 | 6 + .../SharePointDsc.Util.Tests.ps1 | 6 + 132 files changed, 1323 insertions(+), 338 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25c2cc11b..b3010f6ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- SharePointDsc + - Added verbose logging of the test results in the Test method + - Added function to create SharePointDsc event log and add log entries + - Added the logging of all test results to the new SharePointDsc event log + ### Fixed - SPFarmSolution diff --git a/SharePointDsc/DSCResources/MSFT_SPAccessServiceApp/MSFT_SPAccessServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPAccessServiceApp/MSFT_SPAccessServiceApp.psm1 index 5fec153c2..87d2fc473 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAccessServiceApp/MSFT_SPAccessServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAccessServiceApp/MSFT_SPAccessServiceApp.psm1 @@ -188,14 +188,18 @@ function Test-TargetResource if ($CurrentValues.DatabaseServer -ne $DatabaseServer) { - Write-Verbose -Message ("Specified database server does not match the actual " + ` - "database server. This resource cannot move the database " + ` - "to a different SQL instance.") + $message = "Specified database server does not match the actual database " + ` + "server. This resource cannot move the database to a different " + ` + "SQL instance. Actual: $($CurrentValues.DatabaseServer), " + ` + "Desired: $DatabaseServer" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source $result = $false } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPAccessServices2010/MSFT_SPAccessServices2010.psm1 b/SharePointDsc/DSCResources/MSFT_SPAccessServices2010/MSFT_SPAccessServices2010.psm1 index 4ebfc75c9..7db713e07 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAccessServices2010/MSFT_SPAccessServices2010.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAccessServices2010/MSFT_SPAccessServices2010.psm1 @@ -192,6 +192,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "ApplicationPool", "Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPAlternateUrl/MSFT_SPAlternateUrl.psm1 b/SharePointDsc/DSCResources/MSFT_SPAlternateUrl/MSFT_SPAlternateUrl.psm1 index e413e30b6..5d60f0e0f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAlternateUrl/MSFT_SPAlternateUrl.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAlternateUrl/MSFT_SPAlternateUrl.psm1 @@ -284,6 +284,7 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("WebAppName", ` "Zone", ` @@ -294,6 +295,7 @@ function Test-TargetResource else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPAntivirusSettings/MSFT_SPAntivirusSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPAntivirusSettings/MSFT_SPAntivirusSettings.psm1 index 526037e0f..0538cecab 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAntivirusSettings/MSFT_SPAntivirusSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAntivirusSettings/MSFT_SPAntivirusSettings.psm1 @@ -227,6 +227,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPAppCatalog/MSFT_SPAppCatalog.psm1 b/SharePointDsc/DSCResources/MSFT_SPAppCatalog/MSFT_SPAppCatalog.psm1 index 6b5d2c1af..2e0300929 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAppCatalog/MSFT_SPAppCatalog.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAppCatalog/MSFT_SPAppCatalog.psm1 @@ -177,6 +177,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SiteUrl") diff --git a/SharePointDsc/DSCResources/MSFT_SPAppDomain/MSFT_SPAppDomain.psm1 b/SharePointDsc/DSCResources/MSFT_SPAppDomain/MSFT_SPAppDomain.psm1 index 3e23c751f..a58bd8ed5 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAppDomain/MSFT_SPAppDomain.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAppDomain/MSFT_SPAppDomain.psm1 @@ -97,6 +97,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AppDomain", "Prefix") diff --git a/SharePointDsc/DSCResources/MSFT_SPAppManagementServiceApp/MSFT_SPAppManagementServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPAppManagementServiceApp/MSFT_SPAppManagementServiceApp.psm1 index a672ad356..985e8ef94 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAppManagementServiceApp/MSFT_SPAppManagementServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAppManagementServiceApp/MSFT_SPAppManagementServiceApp.psm1 @@ -299,14 +299,19 @@ function Test-TargetResource if ($CurrentValues.ProxyName -eq "") { - return $false + $message = "The specified ProxyName is empty" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + $result = $false + } + else + { + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` + -DesiredValues $PSBoundParameters ` + -ValuesToCheck @("ApplicationPool", ` + "Ensure") } - - $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` - -DesiredValues $PSBoundParameters ` - -ValuesToCheck @("ApplicationPool", ` - "Ensure") - Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPAppStoreSettings/MSFT_SPAppStoreSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPAppStoreSettings/MSFT_SPAppStoreSettings.psm1 index 8726ca1d4..5565b2712 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAppStoreSettings/MSFT_SPAppStoreSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAppStoreSettings/MSFT_SPAppStoreSettings.psm1 @@ -150,7 +150,9 @@ function Test-TargetResource if ($null -eq $currentValues.WebAppUrl) { - Write-Verbose -Message "Specified web application does not exist." + $message = "Specified web application does not exist." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source Write-Verbose -Message "Test-TargetResource returned false" return $false @@ -160,6 +162,12 @@ function Test-TargetResource { if ($AllowAppPurchases -ne $CurrentValues.AllowAppPurchases) { + $message = ("The parameter AllowAppPurchases for web application $WebAppUrl "+ ` + "is not in the desired state. Actual: " + ` + "$($CurrentValues.AllowAppPurchases), Desired: $AllowAppPurchases") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -169,6 +177,12 @@ function Test-TargetResource { if ($AllowAppsForOffice -ne $CurrentValues.AllowAppsForOffice) { + $message = ("The parameter AllowAppsForOffice for web application $WebAppUrl "+ ` + "is not in the desired state. Actual: " + ` + "$($CurrentValues.AllowAppsForOffice), Desired: $AllowAppsForOffice") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } diff --git a/SharePointDsc/DSCResources/MSFT_SPAuthenticationRealm/MSFT_SPAuthenticationRealm.psm1 b/SharePointDsc/DSCResources/MSFT_SPAuthenticationRealm/MSFT_SPAuthenticationRealm.psm1 index c247b1c1d..436df03b2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAuthenticationRealm/MSFT_SPAuthenticationRealm.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAuthenticationRealm/MSFT_SPAuthenticationRealm.psm1 @@ -96,6 +96,7 @@ function Test-TargetResource() Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AuthenticationRealm") diff --git a/SharePointDsc/DSCResources/MSFT_SPAzureAccessControlServiceAppProxy/MSFT_SPAzureAccessControlServiceAppProxy.psm1 b/SharePointDsc/DSCResources/MSFT_SPAzureAccessControlServiceAppProxy/MSFT_SPAzureAccessControlServiceAppProxy.psm1 index 1a5e73d47..470f5ed0f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPAzureAccessControlServiceAppProxy/MSFT_SPAzureAccessControlServiceAppProxy.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPAzureAccessControlServiceAppProxy/MSFT_SPAzureAccessControlServiceAppProxy.psm1 @@ -185,12 +185,14 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("MetadataServiceEndpointUri", "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPBCSServiceApp/MSFT_SPBCSServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPBCSServiceApp/MSFT_SPBCSServiceApp.psm1 index 76e7aadf1..dd974b9d3 100644 --- a/SharePointDsc/DSCResources/MSFT_SPBCSServiceApp/MSFT_SPBCSServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPBCSServiceApp/MSFT_SPBCSServiceApp.psm1 @@ -270,6 +270,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPBlobCacheSettings/MSFT_SPBlobCacheSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPBlobCacheSettings/MSFT_SPBlobCacheSettings.psm1 index fac052507..74fe9f870 100644 --- a/SharePointDsc/DSCResources/MSFT_SPBlobCacheSettings/MSFT_SPBlobCacheSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPBlobCacheSettings/MSFT_SPBlobCacheSettings.psm1 @@ -374,19 +374,23 @@ function Test-TargetResource { if (-not (Test-Path -Path $Location)) { - Write-Verbose -Message "Blob Cache Folder $Location does not exist" + $message = "Blob Cache Folder $Location does not exist" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("EnableCache", - "Location", - "MaxSizeInGB", - "FileType", - "MaxAgeInSeconds") + "Location", + "MaxSizeInGB", + "FileType", + "MaxAgeInSeconds") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPCacheAccounts/MSFT_SPCacheAccounts.psm1 b/SharePointDsc/DSCResources/MSFT_SPCacheAccounts/MSFT_SPCacheAccounts.psm1 index 98fb07a77..fa811666a 100644 --- a/SharePointDsc/DSCResources/MSFT_SPCacheAccounts/MSFT_SPCacheAccounts.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPCacheAccounts/MSFT_SPCacheAccounts.psm1 @@ -283,6 +283,7 @@ function Test-TargetResource if ($SetWebAppPolicy -eq $true) { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SuperUserAlias", ` "SuperReaderAlias", ` @@ -291,6 +292,7 @@ function Test-TargetResource else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SuperUserAlias", ` "SuperReaderAlias") diff --git a/SharePointDsc/DSCResources/MSFT_SPConfigWizard/MSFT_SPConfigWizard.psm1 b/SharePointDsc/DSCResources/MSFT_SPConfigWizard/MSFT_SPConfigWizard.psm1 index 5c03bf0a2..d1fdee2e6 100644 --- a/SharePointDsc/DSCResources/MSFT_SPConfigWizard/MSFT_SPConfigWizard.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPConfigWizard/MSFT_SPConfigWizard.psm1 @@ -318,6 +318,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPContentDatabase/MSFT_SPContentDatabase.psm1 b/SharePointDsc/DSCResources/MSFT_SPContentDatabase/MSFT_SPContentDatabase.psm1 index 696a847ec..3f02cdffe 100644 --- a/SharePointDsc/DSCResources/MSFT_SPContentDatabase/MSFT_SPContentDatabase.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPContentDatabase/MSFT_SPContentDatabase.psm1 @@ -398,14 +398,18 @@ function Test-TargetResource if ($PSBoundParameters.ContainsKey('DatabaseServer') -and $PSBoundParameters.DatabaseServer -ne $null -and $CurrentValues.DatabaseServer -ne $PSBoundParameters.DatabaseServer) { - Write-Verbose -Message ("Specified database server does not match the actual " + ` - "database server. This resource cannot move the database " + ` - "to a different SQL instance.") + $message = ("Specified database server $DatabaseServer does not match the actual " + ` + "database server $($CurrentValues.DatabaseServer). This resource cannot move " + ` + "the database to a different SQL instance.") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPDatabaseAAG/MSFT_SPDatabaseAAG.psm1 b/SharePointDsc/DSCResources/MSFT_SPDatabaseAAG/MSFT_SPDatabaseAAG.psm1 index 26e1b8f6c..a086b53ea 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDatabaseAAG/MSFT_SPDatabaseAAG.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDatabaseAAG/MSFT_SPDatabaseAAG.psm1 @@ -296,6 +296,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "DatabaseName") diff --git a/SharePointDsc/DSCResources/MSFT_SPDesignerSettings/MSFT_SPDesignerSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPDesignerSettings/MSFT_SPDesignerSettings.psm1 index 46f66fc19..1ddb0dc88 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDesignerSettings/MSFT_SPDesignerSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDesignerSettings/MSFT_SPDesignerSettings.psm1 @@ -444,6 +444,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPDiagnosticLoggingSettings/MSFT_SPDiagnosticLoggingSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPDiagnosticLoggingSettings/MSFT_SPDiagnosticLoggingSettings.psm1 index 550b34e83..139d35f87 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDiagnosticLoggingSettings/MSFT_SPDiagnosticLoggingSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDiagnosticLoggingSettings/MSFT_SPDiagnosticLoggingSettings.psm1 @@ -362,6 +362,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPDiagnosticsProvider/MSFT_SPDiagnosticsProvider.psm1 b/SharePointDsc/DSCResources/MSFT_SPDiagnosticsProvider/MSFT_SPDiagnosticsProvider.psm1 index 3fff6f35a..fbeeb0840 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDiagnosticsProvider/MSFT_SPDiagnosticsProvider.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDiagnosticsProvider/MSFT_SPDiagnosticsProvider.psm1 @@ -182,6 +182,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "Name", diff --git a/SharePointDsc/DSCResources/MSFT_SPDistributedCacheClientSettings/MSFT_SPDistributedCacheClientSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPDistributedCacheClientSettings/MSFT_SPDistributedCacheClientSettings.psm1 index c9db8d2c9..7614bd38a 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDistributedCacheClientSettings/MSFT_SPDistributedCacheClientSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDistributedCacheClientSettings/MSFT_SPDistributedCacheClientSettings.psm1 @@ -1043,53 +1043,54 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("DLTCMaxConnectionsToServer", - "DLTCRequestTimeout", - "DLTCChannelOpenTimeOut", - "DVSCMaxConnectionsToServer", - "DVSCRequestTimeout", - "DVSCChannelOpenTimeOut", - "DACMaxConnectionsToServer", - "DACRequestTimeout", - "DACChannelOpenTimeOut", - "DAFMaxConnectionsToServer", - "DAFRequestTimeout", - "DAFChannelOpenTimeOut", - "DAFCMaxConnectionsToServer", - "DAFCRequestTimeout", - "DAFCChannelOpenTimeOut", - "DBCMaxConnectionsToServer", - "DBCRequestTimeout", - "DBCChannelOpenTimeOut", - "DDCMaxConnectionsToServer", - "DDCRequestTimeout", - "DDCChannelOpenTimeOut", - "DSCMaxConnectionsToServer", - "DSCRequestTimeout", - "DSCChannelOpenTimeOut", - "DTCMaxConnectionsToServer", - "DTCRequestTimeout", - "DTCChannelOpenTimeOut", - "DSTACMaxConnectionsToServer", - "DSTACRequestTimeout", - "DSTACChannelOpenTimeOut", - "DFLTCMaxConnectionsToServer", - "DFLTCRequestTimeout", - "DFLTCChannelOpenTimeOut", - "DSWUCMaxConnectionsToServer", - "DSWUCRequestTimeout", - "DSWUCChannelOpenTimeOut", - "DUGCMaxConnectionsToServer", - "DUGCRequestTimeout", - "DUGCChannelOpenTimeOut", - "DRTCMaxConnectionsToServer", - "DRTCRequestTimeout", - "DRTCChannelOpenTimeOut", - "DHSCMaxConnectionsToServer", - "DHSCRequestTimeout", - "DHSCChannelOpenTimeOut" - ) + "DLTCRequestTimeout", + "DLTCChannelOpenTimeOut", + "DVSCMaxConnectionsToServer", + "DVSCRequestTimeout", + "DVSCChannelOpenTimeOut", + "DACMaxConnectionsToServer", + "DACRequestTimeout", + "DACChannelOpenTimeOut", + "DAFMaxConnectionsToServer", + "DAFRequestTimeout", + "DAFChannelOpenTimeOut", + "DAFCMaxConnectionsToServer", + "DAFCRequestTimeout", + "DAFCChannelOpenTimeOut", + "DBCMaxConnectionsToServer", + "DBCRequestTimeout", + "DBCChannelOpenTimeOut", + "DDCMaxConnectionsToServer", + "DDCRequestTimeout", + "DDCChannelOpenTimeOut", + "DSCMaxConnectionsToServer", + "DSCRequestTimeout", + "DSCChannelOpenTimeOut", + "DTCMaxConnectionsToServer", + "DTCRequestTimeout", + "DTCChannelOpenTimeOut", + "DSTACMaxConnectionsToServer", + "DSTACRequestTimeout", + "DSTACChannelOpenTimeOut", + "DFLTCMaxConnectionsToServer", + "DFLTCRequestTimeout", + "DFLTCChannelOpenTimeOut", + "DSWUCMaxConnectionsToServer", + "DSWUCRequestTimeout", + "DSWUCChannelOpenTimeOut", + "DUGCMaxConnectionsToServer", + "DUGCRequestTimeout", + "DUGCChannelOpenTimeOut", + "DRTCMaxConnectionsToServer", + "DRTCRequestTimeout", + "DRTCChannelOpenTimeOut", + "DHSCMaxConnectionsToServer", + "DHSCRequestTimeout", + "DHSCChannelOpenTimeOut" + ) Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPDistributedCacheService/MSFT_SPDistributedCacheService.psm1 b/SharePointDsc/DSCResources/MSFT_SPDistributedCacheService/MSFT_SPDistributedCacheService.psm1 index 8d2054aff..6ddb7c239 100644 --- a/SharePointDsc/DSCResources/MSFT_SPDistributedCacheService/MSFT_SPDistributedCacheService.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPDistributedCacheService/MSFT_SPDistributedCacheService.psm1 @@ -525,13 +525,19 @@ function Test-TargetResource { if ($ServiceAccount -ne $CurrentValues.ServiceAccount) { - Write-Verbose -Message "Test-TargetResource returned false" + $message = ("The parameter ServiceAccount is not in the desired "+ ` + "state. Actual: $($CurrentValues.ServiceAccount), " + ` + "Desired: $ServiceAccount") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", ` "CreateFirewallRules", ` @@ -540,6 +546,7 @@ function Test-TargetResource else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPExcelServiceApp/MSFT_SPExcelServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPExcelServiceApp/MSFT_SPExcelServiceApp.psm1 index f51df4bf2..90bca0d20 100644 --- a/SharePointDsc/DSCResources/MSFT_SPExcelServiceApp/MSFT_SPExcelServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPExcelServiceApp/MSFT_SPExcelServiceApp.psm1 @@ -589,26 +589,27 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $mainCheck = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @( - "Ensure", - "CachingOfUnusedFilesEnable", - "CrossDomainAccessAllowed", - "EncryptedUserConnectionRequired", - "ExternalDataConnectionLifetime", - "FileAccessMethod", - "LoadBalancingScheme", - "MemoryCacheThreshold", - "PrivateBytesMax", - "SessionsPerUserMax", - "SiteCollectionAnonymousSessionsMax", - "TerminateProcessOnAccessViolation", - "ThrottleAccessViolationsPerSiteCollection", - "UnattendedAccountApplicationId", - "UnusedObjectAgeMax", - "WorkbookCache", - "WorkbookCacheSizeMax" - ) + "Ensure", + "CachingOfUnusedFilesEnable", + "CrossDomainAccessAllowed", + "EncryptedUserConnectionRequired", + "ExternalDataConnectionLifetime", + "FileAccessMethod", + "LoadBalancingScheme", + "MemoryCacheThreshold", + "PrivateBytesMax", + "SessionsPerUserMax", + "SiteCollectionAnonymousSessionsMax", + "TerminateProcessOnAccessViolation", + "ThrottleAccessViolationsPerSiteCollection", + "UnattendedAccountApplicationId", + "UnusedObjectAgeMax", + "WorkbookCache", + "WorkbookCacheSizeMax" + ) if ($Ensure -eq "Present" -and $mainCheck -eq $true -and $null -ne $TrustedFileLocations) @@ -621,8 +622,11 @@ function Test-TargetResource } if ($null -eq $matchingCurrentValue) { - Write-Verbose -Message ("Trusted file location '$($_.Address)' was not found " + ` - "in the Excel service app. Desired state is false.") + $message = ("Trusted file location '$($_.Address)' was not found " + ` + "in the Excel service app. Desired state is false.") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + return $false } else @@ -632,10 +636,13 @@ function Test-TargetResource { if ($desiredLocation.$_ -ne $matchingCurrentValue.$_) { - Write-Verbose -Message ("Trusted file location '$($desiredLocation.Address)' did not match " + ` - "desired property '$_'. Desired value is " + ` - "'$($desiredLocation.$_)' but the current value is " + ` - "'$($matchingCurrentValue.$_)'") + $message = ("Trusted file location '$($desiredLocation.Address)' did not match " + ` + "desired property '$_'. Desired value is " + ` + "'$($desiredLocation.$_)' but the current value is " + ` + "'$($matchingCurrentValue.$_)'") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + return $false } } @@ -645,7 +652,6 @@ function Test-TargetResource } if ($locationCheck -contains $false) { - Write-Verbose -Message "Test-TargetResource returned false" return $false @@ -659,9 +665,12 @@ function Test-TargetResource } if ($null -eq $matchingDesiredValue) { - Write-Verbose -Message ("Existing trusted file location '$($_.Address)' was not " + ` - "found in the desired state for this service " + ` - "application. Desired state is false.") + $message = ("Existing trusted file location '$($_.Address)' was not " + ` + "found in the desired state for this service " + ` + "application. Desired state is false.") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + return $false } return $true @@ -682,7 +691,6 @@ function Test-TargetResource else { Write-Verbose -Message "Test-TargetResource returned $mainCheck" - return $mainCheck } } diff --git a/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 index 26908a67f..689506a68 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 @@ -1138,13 +1138,14 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", - "RunCentralAdmin", - "CentralAdministrationUrl", - "CentralAdministrationPort", - "CentralAdministrationAuth", - "DeveloperDashboard") + "RunCentralAdmin", + "CentralAdministrationUrl", + "CentralAdministrationPort", + "CentralAdministrationAuth", + "DeveloperDashboard") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPFarmAdministrators/MSFT_SPFarmAdministrators.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarmAdministrators/MSFT_SPFarmAdministrators.psm1 index fd56214e5..9af6b6248 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarmAdministrators/MSFT_SPFarmAdministrators.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarmAdministrators/MSFT_SPFarmAdministrators.psm1 @@ -292,6 +292,11 @@ function Test-TargetResource if ($null -eq $CurrentValues.Members) { + $message = "There are no users configured as Farm Administrator" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -303,12 +308,19 @@ function Test-TargetResource if ($null -eq $differences) { - Write-Verbose "Farm Administrators group matches" + Write-Verbose -Message "Farm Administrators group matches the specified Members" + + Write-Verbose -Message "Test-TargetResource returned true" return $true } else { - Write-Verbose "Farm Administrators group does not match" + $message = ("Farm Administrators group does not match the specified Members" + ` + "Actual: $($CurrentValues.Members -join ", "). Desired: $($Members -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + + Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -321,7 +333,11 @@ function Test-TargetResource { if (-not($CurrentValues.Members -contains $member)) { - Write-Verbose "$member is not a Farm Administrator. Set result to false" + $message = ("$member is not a Farm Administrator, but is included in MembersToInclude: " + ` + "$($MembersToInclude -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + $result = $false } else @@ -338,7 +354,11 @@ function Test-TargetResource { if ($CurrentValues.Members -contains $member) { - Write-Verbose "$member is a Farm Administrator. Set result to false" + $message = ("$member is a Farm Administrator, but is included in MembersToExclude: " + ` + "$($MembersToExclude -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + $result = $false } else diff --git a/SharePointDsc/DSCResources/MSFT_SPFarmPropertyBag/MSFT_SPFarmPropertyBag.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarmPropertyBag/MSFT_SPFarmPropertyBag.psm1 index ab32bfdd1..a7fa1fdf1 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarmPropertyBag/MSFT_SPFarmPropertyBag.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarmPropertyBag/MSFT_SPFarmPropertyBag.psm1 @@ -173,6 +173,7 @@ function Test-TargetResource() Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('Ensure', 'Key', 'Value') diff --git a/SharePointDsc/DSCResources/MSFT_SPFarmSolution/MSFT_SPFarmSolution.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarmSolution/MSFT_SPFarmSolution.psm1 index 47be9403f..00249a821 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarmSolution/MSFT_SPFarmSolution.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarmSolution/MSFT_SPFarmSolution.psm1 @@ -429,6 +429,7 @@ function Test-TargetResource } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck diff --git a/SharePointDsc/DSCResources/MSFT_SPFeature/MSFT_SPFeature.psm1 b/SharePointDsc/DSCResources/MSFT_SPFeature/MSFT_SPFeature.psm1 index d822162e2..7f6589874 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFeature/MSFT_SPFeature.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFeature/MSFT_SPFeature.psm1 @@ -217,6 +217,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "Version") diff --git a/SharePointDsc/DSCResources/MSFT_SPHealthAnalyzerRuleState/MSFT_SPHealthAnalyzerRuleState.psm1 b/SharePointDsc/DSCResources/MSFT_SPHealthAnalyzerRuleState/MSFT_SPHealthAnalyzerRuleState.psm1 index c98c2c4f6..2e345d51f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPHealthAnalyzerRuleState/MSFT_SPHealthAnalyzerRuleState.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPHealthAnalyzerRuleState/MSFT_SPHealthAnalyzerRuleState.psm1 @@ -276,6 +276,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPIncomingEmailSettings/MSFT_SPIncomingEmailSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPIncomingEmailSettings/MSFT_SPIncomingEmailSettings.psm1 index 8681ffa84..8332c1da5 100644 --- a/SharePointDsc/DSCResources/MSFT_SPIncomingEmailSettings/MSFT_SPIncomingEmailSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPIncomingEmailSettings/MSFT_SPIncomingEmailSettings.psm1 @@ -382,6 +382,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPInfoPathFormsServiceConfig/MSFT_SPInfoPathFormsServiceConfig.psm1 b/SharePointDsc/DSCResources/MSFT_SPInfoPathFormsServiceConfig/MSFT_SPInfoPathFormsServiceConfig.psm1 index 281d396c8..55df9492e 100644 --- a/SharePointDsc/DSCResources/MSFT_SPInfoPathFormsServiceConfig/MSFT_SPInfoPathFormsServiceConfig.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPInfoPathFormsServiceConfig/MSFT_SPInfoPathFormsServiceConfig.psm1 @@ -386,22 +386,23 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", - "AllowUserFormBrowserEnabling", - "AllowUserFormBrowserRendering", - "MaxDataConnectionTimeout", - "DefaultDataConnectionTimeout", - "MaxDataConnectionResponseSize", - "RequireSslForDataConnections", - "AllowEmbeddedSqlForDataConnections", - "AllowUdcAuthenticationForDataConnections", - "AllowUserFormCrossDomainDataConnections", - "AllowEventPropagation", - "MaxPostbacksPerSession", - "MaxUserActionsPerPostback", - "ActiveSessionsTimeout", - "MaxSizeOfUserFormState") + "AllowUserFormBrowserEnabling", + "AllowUserFormBrowserRendering", + "MaxDataConnectionTimeout", + "DefaultDataConnectionTimeout", + "MaxDataConnectionResponseSize", + "RequireSslForDataConnections", + "AllowEmbeddedSqlForDataConnections", + "AllowUdcAuthenticationForDataConnections", + "AllowUserFormCrossDomainDataConnections", + "AllowEventPropagation", + "MaxPostbacksPerSession", + "MaxUserActionsPerPostback", + "ActiveSessionsTimeout", + "MaxSizeOfUserFormState") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPInstall/MSFT_SPInstall.psm1 b/SharePointDsc/DSCResources/MSFT_SPInstall/MSFT_SPInstall.psm1 index ffd437bc8..e6efdcdbe 100644 --- a/SharePointDsc/DSCResources/MSFT_SPInstall/MSFT_SPInstall.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPInstall/MSFT_SPInstall.psm1 @@ -439,6 +439,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPInstallLanguagePack/MSFT_SPInstallLanguagePack.psm1 b/SharePointDsc/DSCResources/MSFT_SPInstallLanguagePack/MSFT_SPInstallLanguagePack.psm1 index c185ef878..33e95d4b0 100644 --- a/SharePointDsc/DSCResources/MSFT_SPInstallLanguagePack/MSFT_SPInstallLanguagePack.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPInstallLanguagePack/MSFT_SPInstallLanguagePack.psm1 @@ -551,6 +551,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/MSFT_SPInstallPrereqs.psm1 b/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/MSFT_SPInstallPrereqs.psm1 index 2469cb639..0a36e749b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/MSFT_SPInstallPrereqs.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPInstallPrereqs/MSFT_SPInstallPrereqs.psm1 @@ -1069,6 +1069,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPIrmSettings/MSFT_SPIrmSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPIrmSettings/MSFT_SPIrmSettings.psm1 index 9d2721c0a..248e65f53 100644 --- a/SharePointDsc/DSCResources/MSFT_SPIrmSettings/MSFT_SPIrmSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPIrmSettings/MSFT_SPIrmSettings.psm1 @@ -193,6 +193,7 @@ function Test-TargetResource } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPLogLevel/MSFT_SPLogLevel.psm1 b/SharePointDsc/DSCResources/MSFT_SPLogLevel/MSFT_SPLogLevel.psm1 index 187de2d31..de75d62b3 100644 --- a/SharePointDsc/DSCResources/MSFT_SPLogLevel/MSFT_SPLogLevel.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPLogLevel/MSFT_SPLogLevel.psm1 @@ -292,12 +292,16 @@ function Test-TargetResource if ($null -eq $CurrentValues.SPLogLevelSetting) { - Write-Verbose -Message "Test-TargetResource returned false" + $message = "Error retrieving SPLogLevelSetting for $Name" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } $mismatchedSettingFound = $false + $mismatchedSettings = @() foreach ($DesiredSetting in $SPLogLevelSetting) { @@ -307,6 +311,11 @@ function Test-TargetResource if (($null -ne $DesiredSetting.TraceLevel -and $CurrentSetting.TraceLevel -ne $DesiredSetting.TraceLevel) -or ($null -ne $DesiredSetting.EventLevel -and $CurrentSetting.EventLevel -ne $DesiredSetting.EventLevel)) { + $mismatchedSettings += @{ + Name = $Name + DesiredSetting = $DesiredSetting + $CurrentSetting = $CurrentSetting + } Write-Verbose -Message "SP Log Level setting for $($DesiredSetting.Area):$($DesiredSetting.Name) is not in the desired state" $mismatchedSettingFound = $true } @@ -314,6 +323,27 @@ function Test-TargetResource if ($mismatchedSettingFound) { + $EventMessage = "`r`n" + $EventMessage += " `r`n" + + $EventMessage += " `r`n" + $driftedValue = '' + foreach ($setting in $mismatchedSettings) + { + $EventMessage += " TraceLevel: " + $setting.CurrentSetting.TraceLevel + " - EventLevel: " + $setting.CurrentSetting.EventLevel + "`r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + foreach ($setting in $mismatchedSettings) + { + $EventMessage += " TraceLevel: " + $setting.DesiredSetting.TraceLevel + " - EventLevel: " + $setting.DesiredSetting.EventLevel + "`r`n" + } + $EventMessage += " }" + $EventMessage += " `r`n" + $EventMessage += "" + Add-SPDscEvent -Message $EventMessage -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + $result = $false } else diff --git a/SharePointDsc/DSCResources/MSFT_SPMachineTranslationServiceApp/MSFT_SPMachineTranslationServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPMachineTranslationServiceApp/MSFT_SPMachineTranslationServiceApp.psm1 index 19f1939ce..73f9e972c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPMachineTranslationServiceApp/MSFT_SPMachineTranslationServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPMachineTranslationServiceApp/MSFT_SPMachineTranslationServiceApp.psm1 @@ -253,12 +253,13 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", - "ApplicationPool", - "DatabaseName", - "DatabaseServer", - "Ensure") + "ApplicationPool", + "DatabaseName", + "DatabaseServer", + "Ensure") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPManagedAccount/MSFT_SPManagedAccount.psm1 b/SharePointDsc/DSCResources/MSFT_SPManagedAccount/MSFT_SPManagedAccount.psm1 index e9a3a7d14..e45c9cc94 100644 --- a/SharePointDsc/DSCResources/MSFT_SPManagedAccount/MSFT_SPManagedAccount.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPManagedAccount/MSFT_SPManagedAccount.psm1 @@ -216,12 +216,13 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AccountName", - "Schedule", - "PreExpireDays", - "EmailNotification", - "Ensure") + "Schedule", + "PreExpireDays", + "EmailNotification", + "Ensure") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceApp/MSFT_SPManagedMetaDataServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceApp/MSFT_SPManagedMetaDataServiceApp.psm1 index fc4368292..8cb82dff2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceApp/MSFT_SPManagedMetaDataServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceApp/MSFT_SPManagedMetaDataServiceApp.psm1 @@ -772,6 +772,7 @@ function Test-TargetResource "ProxyName") $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck diff --git a/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceAppDefault/MSFT_SPManagedMetadataServiceAppDefault.psm1 b/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceAppDefault/MSFT_SPManagedMetadataServiceAppDefault.psm1 index cbcc980b2..e182152a1 100644 --- a/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceAppDefault/MSFT_SPManagedMetadataServiceAppDefault.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPManagedMetadataServiceAppDefault/MSFT_SPManagedMetadataServiceAppDefault.psm1 @@ -193,6 +193,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck diff --git a/SharePointDsc/DSCResources/MSFT_SPManagedPath/MSFT_SPManagedPath.psm1 b/SharePointDsc/DSCResources/MSFT_SPManagedPath/MSFT_SPManagedPath.psm1 index 4b91bf07b..f8bf61be6 100644 --- a/SharePointDsc/DSCResources/MSFT_SPManagedPath/MSFT_SPManagedPath.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPManagedPath/MSFT_SPManagedPath.psm1 @@ -204,12 +204,13 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("WebAppUrl", - "RelativeUrl", - "Explicit", - "HostHeader", - "Ensure") + "RelativeUrl", + "Explicit", + "HostHeader", + "Ensure") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPMinRoleCompliance/MSFT_SPMinRoleCompliance.psm1 b/SharePointDsc/DSCResources/MSFT_SPMinRoleCompliance/MSFT_SPMinRoleCompliance.psm1 index 14401b059..0733babc6 100644 --- a/SharePointDsc/DSCResources/MSFT_SPMinRoleCompliance/MSFT_SPMinRoleCompliance.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPMinRoleCompliance/MSFT_SPMinRoleCompliance.psm1 @@ -166,6 +166,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("State") diff --git a/SharePointDsc/DSCResources/MSFT_SPOAppPrincipalMgmtServiceAppProxy/MSFT_SPOAppPrincipalMgmtServiceAppProxy.psm1 b/SharePointDsc/DSCResources/MSFT_SPOAppPrincipalMgmtServiceAppProxy/MSFT_SPOAppPrincipalMgmtServiceAppProxy.psm1 index d2c265db0..de382a0d4 100644 --- a/SharePointDsc/DSCResources/MSFT_SPOAppPrincipalMgmtServiceAppProxy/MSFT_SPOAppPrincipalMgmtServiceAppProxy.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPOAppPrincipalMgmtServiceAppProxy/MSFT_SPOAppPrincipalMgmtServiceAppProxy.psm1 @@ -185,12 +185,14 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("OnlineTenantUri", "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPOfficeOnlineServerBinding/MSFT_SPOfficeOnlineServerBinding.psm1 b/SharePointDsc/DSCResources/MSFT_SPOfficeOnlineServerBinding/MSFT_SPOfficeOnlineServerBinding.psm1 index a6ab6c460..0ca556fa8 100644 --- a/SharePointDsc/DSCResources/MSFT_SPOfficeOnlineServerBinding/MSFT_SPOfficeOnlineServerBinding.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPOfficeOnlineServerBinding/MSFT_SPOfficeOnlineServerBinding.psm1 @@ -175,6 +175,7 @@ function Test-TargetResource $paramsToCheck += @("Zone", "DnsName") } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $paramsToCheck diff --git a/SharePointDsc/DSCResources/MSFT_SPOutgoingEmailSettings/MSFT_SPOutgoingEmailSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPOutgoingEmailSettings/MSFT_SPOutgoingEmailSettings.psm1 index 73a39ff09..9d391f350 100644 --- a/SharePointDsc/DSCResources/MSFT_SPOutgoingEmailSettings/MSFT_SPOutgoingEmailSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPOutgoingEmailSettings/MSFT_SPOutgoingEmailSettings.psm1 @@ -258,13 +258,14 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SMTPServer", - "FromAddress", - "ReplyToAddress", - "CharacterSet", - "UseTLS", - "SMTPPort") + "FromAddress", + "ReplyToAddress", + "CharacterSet", + "UseTLS", + "SMTPPort") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPPasswordChangeSettings/MSFT_SPPasswordChangeSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPPasswordChangeSettings/MSFT_SPPasswordChangeSettings.psm1 index c48acfeca..e5ce6c92a 100644 --- a/SharePointDsc/DSCResources/MSFT_SPPasswordChangeSettings/MSFT_SPPasswordChangeSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPPasswordChangeSettings/MSFT_SPPasswordChangeSettings.psm1 @@ -173,11 +173,12 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("MailAddress", - "DaysBeforeExpiry", - "PasswordChangeWaitTimeSeconds", - "NumberOfRetries") + "DaysBeforeExpiry", + "PasswordChangeWaitTimeSeconds", + "NumberOfRetries") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPPerformancePointServiceApp/MSFT_SPPerformancePointServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPPerformancePointServiceApp/MSFT_SPPerformancePointServiceApp.psm1 index f9699318e..730e8bc6c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPPerformancePointServiceApp/MSFT_SPPerformancePointServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPPerformancePointServiceApp/MSFT_SPPerformancePointServiceApp.psm1 @@ -257,6 +257,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPPowerPointAutomationServiceApp/MSFT_SPPowerPointAutomationServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPPowerPointAutomationServiceApp/MSFT_SPPowerPointAutomationServiceApp.psm1 index 2ff75dc98..80ecd944a 100644 --- a/SharePointDsc/DSCResources/MSFT_SPPowerPointAutomationServiceApp/MSFT_SPPowerPointAutomationServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPPowerPointAutomationServiceApp/MSFT_SPPowerPointAutomationServiceApp.psm1 @@ -415,12 +415,14 @@ function Test-TargetResource if ($Ensure -eq "Absent") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters } diff --git a/SharePointDsc/DSCResources/MSFT_SPProductUpdate/MSFT_SPProductUpdate.psm1 b/SharePointDsc/DSCResources/MSFT_SPProductUpdate/MSFT_SPProductUpdate.psm1 index f90ee5d32..5e2999738 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProductUpdate/MSFT_SPProductUpdate.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProductUpdate/MSFT_SPProductUpdate.psm1 @@ -665,6 +665,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerADResourcePoolSync/MSFT_SPProjectServerADResourcePoolSync.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerADResourcePoolSync/MSFT_SPProjectServerADResourcePoolSync.psm1 index 07f41a2d7..1ace7173c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerADResourcePoolSync/MSFT_SPProjectServerADResourcePoolSync.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerADResourcePoolSync/MSFT_SPProjectServerADResourcePoolSync.psm1 @@ -238,6 +238,7 @@ function Test-TargetResource } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $paramsToCheck diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerAdditionalSettings/MSFT_SPProjectServerAdditionalSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerAdditionalSettings/MSFT_SPProjectServerAdditionalSettings.psm1 index e4bcc84b1..19ad5ff94 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerAdditionalSettings/MSFT_SPProjectServerAdditionalSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerAdditionalSettings/MSFT_SPProjectServerAdditionalSettings.psm1 @@ -185,12 +185,13 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @( - "ProjectProfessionalMinBuildNumber" - "ServerCurrency", - "EnforceServerCurrency" - ) + "ProjectProfessionalMinBuildNumber" + "ServerCurrency", + "EnforceServerCurrency" + ) Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerGlobalPermissions/MSFT_SPProjectServerGlobalPermissions.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerGlobalPermissions/MSFT_SPProjectServerGlobalPermissions.psm1 index 9758f87ac..becc91d4b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerGlobalPermissions/MSFT_SPProjectServerGlobalPermissions.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerGlobalPermissions/MSFT_SPProjectServerGlobalPermissions.psm1 @@ -354,11 +354,12 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @( - "AllowPermissions", - "DenyPermissions" - ) + "AllowPermissions", + "DenyPermissions" + ) Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerGroup/MSFT_SPProjectServerGroup.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerGroup/MSFT_SPProjectServerGroup.psm1 index eb76744b4..7ae63a894 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerGroup/MSFT_SPProjectServerGroup.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerGroup/MSFT_SPProjectServerGroup.psm1 @@ -405,8 +405,10 @@ function Test-TargetResource if ($PSBoundParameters.ContainsKey("Members") -eq $true) { $membersMatch = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Members") + if ($membersMatch -eq $false) { Write-Verbose -Message "Test-TargetResource returned false" @@ -426,7 +428,10 @@ function Test-TargetResource } if ($missingMembers -eq $true) { - Write-Verbose -Message "Users from the MembersToInclude property are not included" + $message = "Users from the MembersToInclude property are not included" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -444,20 +449,24 @@ function Test-TargetResource } if ($extraMembers -eq $true) { - Write-Verbose -Message "Users from the MembersToExclude property are included" + $message = "Users from the MembersToExclude property are included" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @( - "Name", - "Description", - "ADGroup", - "Ensure" - ) + "Name", + "Description", + "ADGroup", + "Ensure" + ) Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerLicense/MSFT_SPProjectServerLicense.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerLicense/MSFT_SPProjectServerLicense.psm1 index c8e085c0d..1a8f3f412 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerLicense/MSFT_SPProjectServerLicense.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerLicense/MSFT_SPProjectServerLicense.psm1 @@ -201,6 +201,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerPermissionMode/MSFT_SPProjectServerPermissionMode.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerPermissionMode/MSFT_SPProjectServerPermissionMode.psm1 index 91474003a..e7e0c9f77 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerPermissionMode/MSFT_SPProjectServerPermissionMode.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerPermissionMode/MSFT_SPProjectServerPermissionMode.psm1 @@ -118,6 +118,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("PermissionMode") diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerServiceApp/MSFT_SPProjectServerServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerServiceApp/MSFT_SPProjectServerServiceApp.psm1 index 2f9853672..86798950f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerServiceApp/MSFT_SPProjectServerServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerServiceApp/MSFT_SPProjectServerServiceApp.psm1 @@ -240,12 +240,14 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerTimeSheetSettings/MSFT_SPProjectServerTimeSheetSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerTimeSheetSettings/MSFT_SPProjectServerTimeSheetSettings.psm1 index c00d6c5c3..8bb8ed266 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerTimeSheetSettings/MSFT_SPProjectServerTimeSheetSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerTimeSheetSettings/MSFT_SPProjectServerTimeSheetSettings.psm1 @@ -625,6 +625,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerUserSyncSettings/MSFT_SPProjectServerUserSyncSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerUserSyncSettings/MSFT_SPProjectServerUserSyncSettings.psm1 index a6d6fd2dc..36582be58 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerUserSyncSettings/MSFT_SPProjectServerUserSyncSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerUserSyncSettings/MSFT_SPProjectServerUserSyncSettings.psm1 @@ -186,6 +186,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPProjectServerWssSettings/MSFT_SPProjectServerWssSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPProjectServerWssSettings/MSFT_SPProjectServerWssSettings.psm1 index b71ede24d..9a40a8ce6 100644 --- a/SharePointDsc/DSCResources/MSFT_SPProjectServerWssSettings/MSFT_SPProjectServerWssSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPProjectServerWssSettings/MSFT_SPProjectServerWssSettings.psm1 @@ -173,6 +173,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPPublishServiceApplication/MSFT_SPPublishServiceApplication.psm1 b/SharePointDsc/DSCResources/MSFT_SPPublishServiceApplication/MSFT_SPPublishServiceApplication.psm1 index a8b548ee8..4850e1472 100644 --- a/SharePointDsc/DSCResources/MSFT_SPPublishServiceApplication/MSFT_SPPublishServiceApplication.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPPublishServiceApplication/MSFT_SPPublishServiceApplication.psm1 @@ -147,6 +147,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPQuotaTemplate/MSFT_SPQuotaTemplate.psm1 b/SharePointDsc/DSCResources/MSFT_SPQuotaTemplate/MSFT_SPQuotaTemplate.psm1 index dadbbaa5e..25a12d3ba 100644 --- a/SharePointDsc/DSCResources/MSFT_SPQuotaTemplate/MSFT_SPQuotaTemplate.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPQuotaTemplate/MSFT_SPQuotaTemplate.psm1 @@ -330,11 +330,17 @@ function Test-TargetResource { if ($CurrentValues.Ensure -eq "Absent") { + $message = "Ensure {$($CurrentValues.Ensure)} does not match the desired state {$Ensure}" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + $result = $false } else { - $result = Test-SPDscParameterState -CurrentValues $CurrentValues -DesiredValues $PSBoundParameters + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` + -DesiredValues $PSBoundParameters } } "Absent" @@ -352,6 +358,10 @@ function Test-TargetResource if ($CurrentValues.Ensure -eq "Present") { # Error occured in Get method or template exists, which is not supposed to be. Return false + $message = "Ensure {$($CurrentValues.Ensure)} does not match the desired state {$Ensure}" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + $result = $false } else diff --git a/SharePointDsc/DSCResources/MSFT_SPRemoteFarmTrust/MSFT_SPRemoteFarmTrust.psm1 b/SharePointDsc/DSCResources/MSFT_SPRemoteFarmTrust/MSFT_SPRemoteFarmTrust.psm1 index 0d7933a0f..268761e3d 100644 --- a/SharePointDsc/DSCResources/MSFT_SPRemoteFarmTrust/MSFT_SPRemoteFarmTrust.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPRemoteFarmTrust/MSFT_SPRemoteFarmTrust.psm1 @@ -220,6 +220,7 @@ function Test-TargetResource() Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchAuthoritativePage/MSFT_SPSearchAuthoritativePage.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchAuthoritativePage/MSFT_SPSearchAuthoritativePage.psm1 index 230109c77..8c11fba5c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchAuthoritativePage/MSFT_SPSearchAuthoritativePage.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchAuthoritativePage/MSFT_SPSearchAuthoritativePage.psm1 @@ -284,30 +284,33 @@ function Test-TargetResource if ($Action -eq "Authoratative") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", - "Path", - "Level", - "Action", - "Ensure") + "Path", + "Level", + "Action", + "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", - "Path", - "Action", - "Ensure") + "Path", + "Action", + "Ensure") } } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", - "Action", - "Ensure") + "Action", + "Ensure") } Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 index cc0098d85..2afe1be74 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 @@ -877,6 +877,7 @@ function Test-TargetResource if ($Ensure -eq "Absent" -or $CurrentValues.Ensure -eq "Absent") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") @@ -894,9 +895,13 @@ function Test-TargetResource if (($PSBoundParameters.ContainsKey("IncrementalSchedule") -eq $true) -and ($null -ne $IncrementalSchedule)) { $propertyTest = Test-SPDscSearchCrawlSchedule -CurrentSchedule $CurrentValues.IncrementalSchedule ` - -DesiredSchedule $IncrementalSchedule + -DesiredSchedule $IncrementalSchedule if ($propertyTest -eq $false) { + $message = ("Specified IncrementalSchedule does not match desired state.") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -905,9 +910,13 @@ function Test-TargetResource if (($PSBoundParameters.ContainsKey("FullSchedule") -eq $true) -and ($null -ne $FullSchedule)) { $propertyTest = Test-SPDscSearchCrawlSchedule -CurrentSchedule $CurrentValues.FullSchedule ` - -DesiredSchedule $FullSchedule + -DesiredSchedule $FullSchedule if ($propertyTest -eq $false) { + $message = ("Specified FullSchedule does not match desired state.") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -928,20 +937,28 @@ function Test-TargetResource if ($null -ne (Compare-Object -ReferenceObject $currentAddresses ` -DifferenceObject $desiredAddresses)) { + $message = ("Specified addresses do not match desired state: " + ` + "Actual: $($currentAddresses -join ", ") Desired: " + ` + "$($desiredAddresses -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + + Write-Verbose -Message "Test-TargetResource returned false" return $false } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ContentSourceType", - "CrawlSetting", - "ContinuousCrawl", - "Priority", - "LimitPageDepth", - "LimitServerHops", - "LOBSystemSet", - "Ensure") + "CrawlSetting", + "ContinuousCrawl", + "Priority", + "LimitPageDepth", + "LimitServerHops", + "LOBSystemSet", + "Ensure") } Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlMapping/MSFT_SPSearchCrawlMapping.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlMapping/MSFT_SPSearchCrawlMapping.psm1 index a0f096982..d4a3511f0 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlMapping/MSFT_SPSearchCrawlMapping.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlMapping/MSFT_SPSearchCrawlMapping.psm1 @@ -220,12 +220,14 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", "Url", "Target", "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlRule/MSFT_SPSearchCrawlRule.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlRule/MSFT_SPSearchCrawlRule.psm1 index 373f542e6..20ec8e818 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlRule/MSFT_SPSearchCrawlRule.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlRule/MSFT_SPSearchCrawlRule.psm1 @@ -534,12 +534,20 @@ function Test-TargetResource -DifferenceObject $CurrentValues.CrawlConfigurationRules if ($null -ne $compareObject) { + $message = ("Specified CrawlConfigurationRules does not match the actual value." + ` + "Actual: $($CurrentValues.CrawlConfigurationRules -join ", ") Desired: " + ` + "$($CrawlConfigurationRules -join ", ")") + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } } else { + $message = "No CrawlConfigurationRules are currently configured" + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -549,21 +557,28 @@ function Test-TargetResource { if ($AuthenticationCredentials.UserName -ne $CurrentValues.AuthenticationCredentials) { + $message = ("Specified AuthenticationCredentials does not match the actual value." + ` + "Actual: $($CurrentValues.AuthenticationCredentials) Desired: " + ` + "$($AuthenticationCredentials.UserName)") + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", - "AuthenticationType", - "RuleType", - "CertificateName") + "AuthenticationType", + "RuleType", + "CertificateName") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlerImpactRule/MSFT_SPSearchCrawlerImpactRule.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlerImpactRule/MSFT_SPSearchCrawlerImpactRule.psm1 index 571f92c5c..6c5436754 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchCrawlerImpactRule/MSFT_SPSearchCrawlerImpactRule.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchCrawlerImpactRule/MSFT_SPSearchCrawlerImpactRule.psm1 @@ -287,6 +287,7 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", "Name", @@ -295,6 +296,7 @@ function Test-TargetResource else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAppName", "Name", diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchFileType/MSFT_SPSearchFileType.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchFileType/MSFT_SPSearchFileType.psm1 index b1eadfd96..425073b3c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchFileType/MSFT_SPSearchFileType.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchFileType/MSFT_SPSearchFileType.psm1 @@ -329,20 +329,27 @@ function Test-TargetResource { if ($Enabled -ne $CurrentValues.Enabled) { + $message = ("Specified Enabled does not match the actual value." + ` + "Actual: $($CurrentValues.Enabled) Desired: " + ` + "$($Enabled)") + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", - "Description", - "MimeType") + "Description", + "MimeType") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchIndexPartition/MSFT_SPSearchIndexPartition.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchIndexPartition/MSFT_SPSearchIndexPartition.psm1 index 05b708b36..1fe50a5a4 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchIndexPartition/MSFT_SPSearchIndexPartition.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchIndexPartition/MSFT_SPSearchIndexPartition.psm1 @@ -272,6 +272,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Servers") diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchManagedProperty/MSFT_SPSearchManagedProperty.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchManagedProperty/MSFT_SPSearchManagedProperty.psm1 index c59e39bd8..11449abf2 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchManagedProperty/MSFT_SPSearchManagedProperty.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchManagedProperty/MSFT_SPSearchManagedProperty.psm1 @@ -448,20 +448,21 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", - "PropertyType", - "Ensure", - "HasMultipleValues", - "Retrievable", - "Searchable", - "Refinable", - "Searchable", - "NoWordBreaker", - "IncludeAllCrawledProperties", - "Aliases", - "Sortable", - "SafeForAnonymous") + "PropertyType", + "Ensure", + "HasMultipleValues", + "Retrievable", + "Searchable", + "Refinable", + "Searchable", + "NoWordBreaker", + "IncludeAllCrawledProperties", + "Aliases", + "Sortable", + "SafeForAnonymous") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchMetadataCategory/MSFT_SPSearchMetadataCategory.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchMetadataCategory/MSFT_SPSearchMetadataCategory.psm1 index 7f72cfc73..11df30fc5 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchMetadataCategory/MSFT_SPSearchMetadataCategory.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchMetadataCategory/MSFT_SPSearchMetadataCategory.psm1 @@ -210,13 +210,14 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", - "PropertyType", - "Ensure", - "AutoCreateNewManagedProperties", - "DiscoverNewProperties", - "MapToContents") + "PropertyType", + "Ensure", + "AutoCreateNewManagedProperties", + "DiscoverNewProperties", + "MapToContents") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchResultSource/MSFT_SPSearchResultSource.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchResultSource/MSFT_SPSearchResultSource.psm1 index 05c2fa98c..fd3775bef 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchResultSource/MSFT_SPSearchResultSource.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchResultSource/MSFT_SPSearchResultSource.psm1 @@ -319,6 +319,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchServiceApp/MSFT_SPSearchServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchServiceApp/MSFT_SPSearchServiceApp.psm1 index 5b95bdc4d..b6b89bc3e 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchServiceApp/MSFT_SPSearchServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchServiceApp/MSFT_SPSearchServiceApp.psm1 @@ -535,7 +535,11 @@ function Test-TargetResource if ($desired -ne $current) { - Write-Verbose -Message "Default content access account is different, returning false" + $message = ("Specified Default content access account is not in the desired state" + ` + "Actual: $current Desired: $desired") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Desired: $desired. Current: $current." return $false } @@ -544,16 +548,18 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", - "ApplicationPool", - "SearchCenterUrl", - "ProxyName", - "AlertsEnabled") + "ApplicationPool", + "SearchCenterUrl", + "ProxyName", + "AlertsEnabled") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchServiceSettings/MSFT_SPSearchServiceSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchServiceSettings/MSFT_SPSearchServiceSettings.psm1 index be2193d7f..539cc0856 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchServiceSettings/MSFT_SPSearchServiceSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchServiceSettings/MSFT_SPSearchServiceSettings.psm1 @@ -214,7 +214,7 @@ function Test-TargetResource if ($PSBoundParameters.ContainsKey("PerformanceLevel") -eq $false -and $PSBoundParameters.ContainsKey("ContactEmail") -eq $false -and ` - $PSBoundParameters.ContainsKey("WindowsServiceAccount") -eq $false) + $PSBoundParameters.ContainsKey("WindowsServiceAccount") -eq $false) { Write-Verbose -Message ("You have to specify at least one of the following parameters: " + ` "PerformanceLevel, ContactEmail or WindowsServiceAccount") @@ -233,13 +233,18 @@ function Test-TargetResource if ($desired -ne $current) { - Write-Verbose -Message "Windows service account is different, returning false" + $message = ("Specified Windows service account is not in the desired state" + ` + "Actual: $current Desired: $desired") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Desired: $desired. Current: $current." return $false } } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("PerformanceLevel", "ContactEmail") diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchTopology/MSFT_SPSearchTopology.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchTopology/MSFT_SPSearchTopology.psm1 index de9837d9b..4e4c5cddf 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSearchTopology/MSFT_SPSearchTopology.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSearchTopology/MSFT_SPSearchTopology.psm1 @@ -535,15 +535,16 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @( - "Admin", - "Crawler", - "ContentProcessing", - "AnalyticsProcessing", - "QueryProcessing", - "IndexPartition" - ) + "Admin", + "Crawler", + "ContentProcessing", + "AnalyticsProcessing", + "QueryProcessing", + "IndexPartition" + ) Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPSecureStoreServiceApp/MSFT_SPSecureStoreServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPSecureStoreServiceApp/MSFT_SPSecureStoreServiceApp.psm1 index f624b383b..90e34bf4b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSecureStoreServiceApp/MSFT_SPSecureStoreServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSecureStoreServiceApp/MSFT_SPSecureStoreServiceApp.psm1 @@ -401,9 +401,12 @@ function Test-TargetResource ($null -ne $CurrentValues.DatabaseServer) -and ` ($CurrentValues.DatabaseServer -ne $DatabaseServer)) { - Write-Verbose -Message ("Specified database server does not match the actual " + ` - "database server. This resource cannot move the database " + ` - "to a different SQL instance.") + $message = ("Specified database server {$DatabaseServer} does not match the actual " + ` + "database server {$($CurrentValues.DatabaseServer)}. This resource " + ` + "cannot move the database to a different SQL instance.") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -412,13 +415,18 @@ function Test-TargetResource ($null -ne $CurrentValues.DatabaseName) -and ` ($CurrentValues.DatabaseName -ne $DatabaseName)) { - Write-Verbose -Message ("Specified database name does not match the actual " + ` - "database name. This resource cannot rename the database.") + $message = ("Specified database name {$DatabaseName} does not match the " + ` + "actual database name {$($($CurrentValues.DatabaseName))}. This " + ` + "resource cannot rename the database.") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPSecurityTokenServiceConfig/MSFT_SPSecurityTokenServiceConfig.psm1 b/SharePointDsc/DSCResources/MSFT_SPSecurityTokenServiceConfig/MSFT_SPSecurityTokenServiceConfig.psm1 index 45b0bc947..d509c8ec0 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSecurityTokenServiceConfig/MSFT_SPSecurityTokenServiceConfig.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSecurityTokenServiceConfig/MSFT_SPSecurityTokenServiceConfig.psm1 @@ -211,12 +211,13 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", - "NameIdentifier", - "UseSessionCookies", - "AllowOAuthOverHttp", - "AllowMetadataOverHttp") + "NameIdentifier", + "UseSessionCookies", + "AllowOAuthOverHttp", + "AllowMetadataOverHttp") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPSelfServiceSiteCreation/MSFT_SPSelfServiceSiteCreation.psm1 b/SharePointDsc/DSCResources/MSFT_SPSelfServiceSiteCreation/MSFT_SPSelfServiceSiteCreation.psm1 index 501dbe6a1..28d5c9504 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSelfServiceSiteCreation/MSFT_SPSelfServiceSiteCreation.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSelfServiceSiteCreation/MSFT_SPSelfServiceSiteCreation.psm1 @@ -520,6 +520,7 @@ function Test-TargetResource if ($Enabled) { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("WebAppUrl", ` "Enabled", ` @@ -537,6 +538,7 @@ function Test-TargetResource else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("WebAppUrl", ` "Enabled", ` diff --git a/SharePointDsc/DSCResources/MSFT_SPServiceAppPool/MSFT_SPServiceAppPool.psm1 b/SharePointDsc/DSCResources/MSFT_SPServiceAppPool/MSFT_SPServiceAppPool.psm1 index ea0690efb..84dfab59e 100644 --- a/SharePointDsc/DSCResources/MSFT_SPServiceAppPool/MSFT_SPServiceAppPool.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPServiceAppPool/MSFT_SPServiceAppPool.psm1 @@ -170,12 +170,14 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ServiceAccount", "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPServiceAppProxyGroup/MSFT_SPServiceAppProxyGroup.psm1 b/SharePointDsc/DSCResources/MSFT_SPServiceAppProxyGroup/MSFT_SPServiceAppProxyGroup.psm1 index 04d08e93f..6969f342f 100644 --- a/SharePointDsc/DSCResources/MSFT_SPServiceAppProxyGroup/MSFT_SPServiceAppProxyGroup.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPServiceAppProxyGroup/MSFT_SPServiceAppProxyGroup.psm1 @@ -391,6 +391,10 @@ function Test-TargetResource if ($CurrentValues.Ensure -ne $Ensure) { + $message = "Ensure {$($CurrentValues.Ensure)} does not match the desired value {$Ensure}" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -401,6 +405,10 @@ function Test-TargetResource if (-not $CurrentValues.ServiceAppProxies) { + $message = "Proxy Group $Name does not contain any proxies" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -414,7 +422,12 @@ function Test-TargetResource } else { - Write-Verbose -Message "ServiceAppProxies do not match" + $message = ("Proxies in proxy Group $Name does not match. Actual: " + ` + "$($CurrentValues.$ServiceAppProxies -join ", "). Desired: " + ` + "$($ServiceAppProxies -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -426,6 +439,10 @@ function Test-TargetResource if (-not $CurrentValues.ServiceAppProxies) { + $message = "Proxy Group $Name does not contain any proxies" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -439,7 +456,12 @@ function Test-TargetResource } elseif ($differences.sideindicator -contains "=>") { - Write-Verbose -Message "ServiceAppProxiesToInclude does not match" + $message = ("Included proxies in proxy Group $Name does not match. Actual: " + ` + "$($CurrentValues.ServiceAppProxies -join ", "). Desired: " + ` + "$($ServiceAppProxiesToInclude -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -466,7 +488,12 @@ function Test-TargetResource } elseif ($differences.sideindicator -contains "==") { - Write-Verbose -Message "ServiceAppProxiesToExclude does not match" + $message = ("Excluded proxies in proxy Group $Name does not match. Actual: " + ` + "$($CurrentValues.ServiceAppProxies -join ", "). Desired: " + ` + "$($ServiceAppProxiesToExclude -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } diff --git a/SharePointDsc/DSCResources/MSFT_SPServiceAppSecurity/MSFT_SPServiceAppSecurity.psm1 b/SharePointDsc/DSCResources/MSFT_SPServiceAppSecurity/MSFT_SPServiceAppSecurity.psm1 index b503712be..ca038f890 100644 --- a/SharePointDsc/DSCResources/MSFT_SPServiceAppSecurity/MSFT_SPServiceAppSecurity.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPServiceAppSecurity/MSFT_SPServiceAppSecurity.psm1 @@ -532,16 +532,21 @@ function Test-TargetResource if ([System.String]::IsNullOrEmpty($CurrentValues.ServiceAppName) -eq $true) { + $message = "ServiceAppName is currently not configured in the environment." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } $result = Invoke-SPDscCommand -Credential $InstallAccount ` - -Arguments @($PSBoundParameters, $CurrentValues, $PSScriptRoot) ` + -Arguments @($PSBoundParameters, $CurrentValues, $PSScriptRoot, $MyInvocation.MyCommand.Source) ` -ScriptBlock { $params = $args[0] $CurrentValues = $args[1] $ScriptRoot = $args[2] + $Source = $args[3] $relPath = "..\..\Modules\SharePointDsc.ServiceAppSecurity\SPServiceAppSecurity.psm1" Import-Module (Join-Path -Path $ScriptRoot -ChildPath $relPath -Resolve) @@ -567,7 +572,11 @@ function Test-TargetResource { if ($params.Members.Count -gt 0) { - Write-Verbose -Message "Security list does not match" + $message = ("Security list does not match. Actual: $($CurrentValues.Members.Username -join ", "). " + ` + "Desired: $($params.Members.Username -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $Source + return $false } else @@ -578,7 +587,11 @@ function Test-TargetResource } elseif ($params.Members.Count -eq 0) { - Write-Verbose -Message "Security list does not match" + $message = ("Security list does not match. Actual: $($CurrentValues.Members.Username -join ", "). " + ` + "Desired: $($params.Members.Username -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $Source + return $false } @@ -595,7 +608,10 @@ function Test-TargetResource } | Select-Object -First 1).AccessLevels if ($null -ne (Compare-Object -DifferenceObject $currentMember.AccessLevels -ReferenceObject $expandedAccessLevels)) { - Write-Verbose -Message "$($currentMember.Username) has incorrect permission level. Test failed." + $message = "$($currentMember.Username) has incorrect permission level. Test failed." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $Source + return $false } } @@ -603,7 +619,11 @@ function Test-TargetResource } else { - Write-Verbose -Message "Security list does not match" + $message = ("Security list does not match. Actual: $($CurrentValues.Members.Username -join ", "). " + ` + "Desired: $($params.Members.Username -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $Source + return $false } } @@ -616,7 +636,10 @@ function Test-TargetResource { if (-not($CurrentValues.Members.Username -contains $member.Username)) { - Write-Verbose -Message "$($member.Username) does not have access. Set result to false" + $message = "$($member.Username) does not have access. Test failed." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $Source + $result = $false } else @@ -629,7 +652,10 @@ function Test-TargetResource } | Select-Object -First 1).AccessLevels if ($null -ne $compare) { - Write-Verbose -Message "$($member.Username) has incorrect permission level. Test failed." + $message = "$($member.Username) has incorrect permission level. Test failed." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $Source + return $false } } @@ -643,7 +669,10 @@ function Test-TargetResource { if ($CurrentValues.Members.Username -contains $member) { - Write-Verbose -Message "$member already has access. Set result to false" + $message = "$member already has access. Set result to false" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $Source + $result = $false } else diff --git a/SharePointDsc/DSCResources/MSFT_SPServiceIdentity/MSFT_SPServiceIdentity.psm1 b/SharePointDsc/DSCResources/MSFT_SPServiceIdentity/MSFT_SPServiceIdentity.psm1 index 454dc6802..669ce8401 100644 --- a/SharePointDsc/DSCResources/MSFT_SPServiceIdentity/MSFT_SPServiceIdentity.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPServiceIdentity/MSFT_SPServiceIdentity.psm1 @@ -167,6 +167,14 @@ function Test-TargetResource $result = ($CurrentValues.ManagedAccount -eq $ManagedAccount) + if ($result -eq $false) + { + $message = ("Specfied ManagedAccount {$($CurrentValues.ManagedAccount)} is not in the " + ` + "desired state {$ManagedAccount}.") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + } + Write-Verbose -Message "Test-TargetResource returned $result" return $result diff --git a/SharePointDsc/DSCResources/MSFT_SPServiceInstance/MSFT_SPServiceInstance.psm1 b/SharePointDsc/DSCResources/MSFT_SPServiceInstance/MSFT_SPServiceInstance.psm1 index 1388022f2..86a1dc7b9 100644 --- a/SharePointDsc/DSCResources/MSFT_SPServiceInstance/MSFT_SPServiceInstance.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPServiceInstance/MSFT_SPServiceInstance.psm1 @@ -199,6 +199,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPSessionStateService/MSFT_SPSessionStateService.psm1 b/SharePointDsc/DSCResources/MSFT_SPSessionStateService/MSFT_SPSessionStateService.psm1 index f25fd4040..e3037a75b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSessionStateService/MSFT_SPSessionStateService.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSessionStateService/MSFT_SPSessionStateService.psm1 @@ -170,12 +170,14 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "SessionTimeout") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPShellAdmins/MSFT_SPShellAdmins.psm1 b/SharePointDsc/DSCResources/MSFT_SPShellAdmins/MSFT_SPShellAdmins.psm1 index 4da48d544..054201883 100644 --- a/SharePointDsc/DSCResources/MSFT_SPShellAdmins/MSFT_SPShellAdmins.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPShellAdmins/MSFT_SPShellAdmins.psm1 @@ -778,6 +778,10 @@ function Test-TargetResource $null -eq $CurrentValues.MembersToInclude -and ` $null -eq $CurrentValues.MembersToExclude) { + $message = "Members, MembersToInclude or MembersToExclude not specified." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -787,6 +791,10 @@ function Test-TargetResource Write-Verbose -Message "Processing Members parameter" if (-not $CurrentValues.Members) { + $message = "No members currently configured." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -800,7 +808,11 @@ function Test-TargetResource } else { - Write-Verbose -Message "Shell Admins group does not match" + $message = ("Shell Admins group does not match. Actual: $($CurrentValues.Members -join ", "). " + ` + "Desired: $($Members -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -811,6 +823,10 @@ function Test-TargetResource Write-Verbose -Message "Processing MembersToInclude parameter" if (-not $CurrentValues.Members) { + $message = "No members currently configured." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -819,7 +835,10 @@ function Test-TargetResource { if (-not($CurrentValues.Members.Contains($member))) { - Write-Verbose -Message "$member is not a Shell Admin." + $message = "$member is not a Shell Admin." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -839,7 +858,10 @@ function Test-TargetResource { if ($CurrentValues.Members.Contains($member)) { - Write-Verbose -Message "$member is a Shell Admin." + $message = "$member is a Shell Admin." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -866,6 +888,10 @@ function Test-TargetResource { if (-not $database.Members) { + $message = "No members currently configured." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -879,7 +905,11 @@ function Test-TargetResource } else { - Write-Verbose -Message "Shell Admins group does not match" + $message = ("Shell Admins group does not match. Actual: $($database.Members -join ", "). " + ` + "Desired: $($Members -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -889,6 +919,10 @@ function Test-TargetResource { if (-not $database.Members) { + $message = "No members currently configured." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -897,7 +931,10 @@ function Test-TargetResource { if (-not($database.Members.Contains($member))) { - Write-Verbose -Message "$member is not a Shell Admin." + $message = "$member is not a Shell Admin." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -916,7 +953,10 @@ function Test-TargetResource { if ($database.Members.Contains($member)) { - Write-Verbose -Message "$member is a Shell Admin." + $message = "$member is a Shell Admin." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -952,6 +992,10 @@ function Test-TargetResource Write-Verbose -Message "Processing Members parameter" if (-not $currentCDB.Members) { + $message = "No members currently configured." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -965,7 +1009,11 @@ function Test-TargetResource } else { - Write-Verbose -Message "Shell Admins group does not match" + $message = ("Shell Admins group does not match. Actual: $($currentCDB.Members -join ", "). " + ` + "Desired: $($database.Members -join ", ")") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -976,6 +1024,10 @@ function Test-TargetResource Write-Verbose -Message "Processing MembersToInclude parameter" if (-not $currentCDB.Members) { + $message = "No members currently configured." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -984,7 +1036,10 @@ function Test-TargetResource { if (-not($currentCDB.Members.Contains($member))) { - Write-Verbose -Message "$member is not a Shell Admin." + $message = "$member is not a Shell Admin." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -1004,7 +1059,10 @@ function Test-TargetResource { if ($currentCDB.Members.Contains($member)) { - Write-Verbose -Message "$member is a Shell Admin." + $message = "$member is a Shell Admin." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } diff --git a/SharePointDsc/DSCResources/MSFT_SPSite/MSFT_SPSite.psm1 b/SharePointDsc/DSCResources/MSFT_SPSite/MSFT_SPSite.psm1 index 7fd23228f..d32f8c418 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSite/MSFT_SPSite.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSite/MSFT_SPSite.psm1 @@ -488,18 +488,23 @@ function Test-TargetResource { if ($CurrentValues.CreateDefaultGroups -ne $true) { + $message = "The default site groups are not configured as desired." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Url", - "QuotaTemplate", - "OwnerAlias", - "SecondaryOwnerAlias", - "AdministrationSiteType") + "QuotaTemplate", + "OwnerAlias", + "SecondaryOwnerAlias", + "AdministrationSiteType") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPSitePropertyBag/MSFT_SPSitePropertyBag.psm1 b/SharePointDsc/DSCResources/MSFT_SPSitePropertyBag/MSFT_SPSitePropertyBag.psm1 index 57822f819..4c7433754 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSitePropertyBag/MSFT_SPSitePropertyBag.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSitePropertyBag/MSFT_SPSitePropertyBag.psm1 @@ -171,12 +171,14 @@ function Test-TargetResource() if ($Ensure -eq 'Present') { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('Ensure', 'Key', 'Value') } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('Ensure', 'Key') diff --git a/SharePointDsc/DSCResources/MSFT_SPSiteUrl/MSFT_SPSiteUrl.psm1 b/SharePointDsc/DSCResources/MSFT_SPSiteUrl/MSFT_SPSiteUrl.psm1 index 5ffcc3c3c..df686f4a7 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSiteUrl/MSFT_SPSiteUrl.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSiteUrl/MSFT_SPSiteUrl.psm1 @@ -320,30 +320,50 @@ function Test-TargetResource $null -eq $CurrentValues.Extranet -and $null -eq $CurrentValues.Custom) { + $message = "All zones do not have a SiteUrl configured" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } if ([String]$CurrentValues.Intranet -ne $Intranet) { + $message = "The Intranet zone {$($CurrentValues.Intranet)} is not configured as desired $Intranet" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } if ([String]$CurrentValues.Internet -ne $Internet) { + $message = "The Internet zone {$($CurrentValues.Internet)} is not configured as desired $Internet" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } if ([String]$CurrentValues.Extranet -ne $Extranet) { + $message = "The Extranet zone {$($CurrentValues.Extranet)} is not configured as desired $Extranet" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } if ([String]$CurrentValues.Custom -ne $Custom) { + $message = "The Custom zone {$($CurrentValues.Custom)} is not configured as desired $Custom" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } diff --git a/SharePointDsc/DSCResources/MSFT_SPStateServiceApp/MSFT_SPStateServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPStateServiceApp/MSFT_SPStateServiceApp.psm1 index fe3f2cc6b..151a31b3d 100644 --- a/SharePointDsc/DSCResources/MSFT_SPStateServiceApp/MSFT_SPStateServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPStateServiceApp/MSFT_SPStateServiceApp.psm1 @@ -232,6 +232,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPSubscriptionSettingsServiceApp/MSFT_SPSubscriptionSettingsServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPSubscriptionSettingsServiceApp/MSFT_SPSubscriptionSettingsServiceApp.psm1 index c2859fef2..c2ea2912e 100644 --- a/SharePointDsc/DSCResources/MSFT_SPSubscriptionSettingsServiceApp/MSFT_SPSubscriptionSettingsServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPSubscriptionSettingsServiceApp/MSFT_SPSubscriptionSettingsServiceApp.psm1 @@ -276,7 +276,6 @@ function Test-TargetResource } if ($null -eq $serviceAppProxy) { - Write-Verbose -Message "Test-TargetResource returned false" return $false } } @@ -284,18 +283,24 @@ function Test-TargetResource if ($result -eq $false) { + $message = "The service application is not configured to a proxy" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPTimerJobState/MSFT_SPTimerJobState.psm1 b/SharePointDsc/DSCResources/MSFT_SPTimerJobState/MSFT_SPTimerJobState.psm1 index ef09f6b99..cf2b2da3a 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTimerJobState/MSFT_SPTimerJobState.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTimerJobState/MSFT_SPTimerJobState.psm1 @@ -349,6 +349,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuer/MSFT_SPTrustedIdentityTokenIssuer.psm1 b/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuer/MSFT_SPTrustedIdentityTokenIssuer.psm1 index a3b32362b..5e51bc14b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuer/MSFT_SPTrustedIdentityTokenIssuer.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuer/MSFT_SPTrustedIdentityTokenIssuer.psm1 @@ -443,6 +443,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuerProviderRealms/MSFT_SPTrustedIdentityTokenIssuerProviderRealms.psm1 b/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuerProviderRealms/MSFT_SPTrustedIdentityTokenIssuerProviderRealms.psm1 index aaabd2a11..b314898fb 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuerProviderRealms/MSFT_SPTrustedIdentityTokenIssuerProviderRealms.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuerProviderRealms/MSFT_SPTrustedIdentityTokenIssuerProviderRealms.psm1 @@ -227,6 +227,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 b/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 index 339ad3cb5..6c69da152 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTrustedRootAuthority/MSFT_SPTrustedRootAuthority.psm1 @@ -321,12 +321,14 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "CertificateThumbprint", "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPTrustedSecurityTokenIssuer/MSFT_SPTrustedSecurityTokenIssuer.psm1 b/SharePointDsc/DSCResources/MSFT_SPTrustedSecurityTokenIssuer/MSFT_SPTrustedSecurityTokenIssuer.psm1 index 7bd6e2e09..001a18809 100644 --- a/SharePointDsc/DSCResources/MSFT_SPTrustedSecurityTokenIssuer/MSFT_SPTrustedSecurityTokenIssuer.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPTrustedSecurityTokenIssuer/MSFT_SPTrustedSecurityTokenIssuer.psm1 @@ -481,6 +481,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck diff --git a/SharePointDsc/DSCResources/MSFT_SPUsageApplication/MSFT_SPUsageApplication.psm1 b/SharePointDsc/DSCResources/MSFT_SPUsageApplication/MSFT_SPUsageApplication.psm1 index 1be16a997..334a0d447 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUsageApplication/MSFT_SPUsageApplication.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUsageApplication/MSFT_SPUsageApplication.psm1 @@ -318,16 +318,18 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("UsageLogCutTime", - "UsageLogLocation", - "UsageLogMaxFileSizeKB", - "UsageLogMaxSpaceGB", - "Ensure") + "UsageLogLocation", + "UsageLogMaxFileSizeKB", + "UsageLogMaxSpaceGB", + "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileProperty/MSFT_SPUserProfileProperty.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileProperty/MSFT_SPUserProfileProperty.psm1 index 8caf23086..9ea9f0dfe 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileProperty/MSFT_SPUserProfileProperty.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileProperty/MSFT_SPUserProfileProperty.psm1 @@ -826,32 +826,34 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", - "DisplayName", - "Type", - "Description", - "PolicySetting", - "PrivacySetting", - "PropertyMappings", - "Length", - "DisplayOrder", - "IsEventLog", - "IsVisibleOnEditor", - "IsVisibleOnViewer", - "IsUserEditable", - "IsAlias", - "IsSearchable", - "IsReplicable", - "UserOverridePrivacy", - "TermGroup", - "TermStore", - "TermSet", - "Ensure") + "DisplayName", + "Type", + "Description", + "PolicySetting", + "PrivacySetting", + "PropertyMappings", + "Length", + "DisplayOrder", + "IsEventLog", + "IsVisibleOnEditor", + "IsVisibleOnViewer", + "IsUserEditable", + "IsAlias", + "IsSearchable", + "IsReplicable", + "UserOverridePrivacy", + "TermGroup", + "TermStore", + "TermSet", + "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileSection/MSFT_SPUserProfileSection.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileSection/MSFT_SPUserProfileSection.psm1 index d122e4ea4..ddcafab5c 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileSection/MSFT_SPUserProfileSection.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileSection/MSFT_SPUserProfileSection.psm1 @@ -227,15 +227,17 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", - "DisplayName", - "DisplayOrder", - "Ensure") + "DisplayName", + "DisplayOrder", + "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceApp/MSFT_SPUserProfileServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceApp/MSFT_SPUserProfileServiceApp.psm1 index 1782318a8..427c92dea 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceApp/MSFT_SPUserProfileServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceApp/MSFT_SPUserProfileServiceApp.psm1 @@ -682,11 +682,16 @@ function Test-TargetResource if ($UpdateProxyGroup -eq $true -and ` $CurrentValues.UpdateProxyGroup -eq $true) { + $message = "ProxyGroup fix is not implemented" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + $result = $false } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "EnableNetBIOS", @@ -698,6 +703,7 @@ function Test-TargetResource else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", "Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceAppPermissions/MSFT_SPUserProfileServiceAppPermissions.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceAppPermissions/MSFT_SPUserProfileServiceAppPermissions.psm1 index 348ef23e6..945e1d122 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceAppPermissions/MSFT_SPUserProfileServiceAppPermissions.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileServiceAppPermissions/MSFT_SPUserProfileServiceAppPermissions.psm1 @@ -342,6 +342,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("CreatePersonalSite", ` "FollowAndEditProfile", ` diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncConnection/MSFT_SPUserProfileSyncConnection.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncConnection/MSFT_SPUserProfileSyncConnection.psm1 index 909eaf9c5..541806df9 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncConnection/MSFT_SPUserProfileSyncConnection.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncConnection/MSFT_SPUserProfileSyncConnection.psm1 @@ -626,6 +626,7 @@ function Test-TargetResource } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck diff --git a/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncService/MSFT_SPUserProfileSyncService.psm1 b/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncService/MSFT_SPUserProfileSyncService.psm1 index c63344e8f..4f0eb12ba 100644 --- a/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncService/MSFT_SPUserProfileSyncService.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPUserProfileSyncService/MSFT_SPUserProfileSyncService.psm1 @@ -416,6 +416,7 @@ function Test-TargetResource } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPVisioServiceApp/MSFT_SPVisioServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPVisioServiceApp/MSFT_SPVisioServiceApp.psm1 index fc0880ab7..472079f01 100644 --- a/SharePointDsc/DSCResources/MSFT_SPVisioServiceApp/MSFT_SPVisioServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPVisioServiceApp/MSFT_SPVisioServiceApp.psm1 @@ -227,6 +227,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", "Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPWeb/MSFT_SPWeb.psm1 b/SharePointDsc/DSCResources/MSFT_SPWeb/MSFT_SPWeb.psm1 index 62bcabe99..b74231218 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWeb/MSFT_SPWeb.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWeb/MSFT_SPWeb.psm1 @@ -337,6 +337,7 @@ function Test-TargetResource } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 index cabad7655..bd69e2a99 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 @@ -508,7 +508,8 @@ function Test-TargetResource if ($PSBoundParameters.ContainsKey("Default")) { $result = Test-ZoneConfiguration -DesiredConfig $Default ` - -CurrentConfig $CurrentValues.Default + -CurrentConfig $CurrentValues.Default ` + -ZoneName "Default" if ($result -eq $false) { @@ -525,7 +526,8 @@ function Test-TargetResource } $result = Test-ZoneConfiguration -DesiredConfig $Intranet ` - -CurrentConfig $CurrentValues.Intranet + -CurrentConfig $CurrentValues.Intranet ` + -ZoneName "Intranet" if ($result -eq $false) { @@ -542,7 +544,8 @@ function Test-TargetResource } $result = Test-ZoneConfiguration -DesiredConfig $Internet ` - -CurrentConfig $CurrentValues.Internet + -CurrentConfig $CurrentValues.Internet ` + -ZoneName "Internet" if ($result -eq $false) { @@ -559,7 +562,8 @@ function Test-TargetResource } $result = Test-ZoneConfiguration -DesiredConfig $Extranet ` - -CurrentConfig $CurrentValues.Extranet + -CurrentConfig $CurrentValues.Extranet ` + -ZoneName "Extranet" if ($result -eq $false) { @@ -577,7 +581,8 @@ function Test-TargetResource } $result = Test-ZoneConfiguration -DesiredConfig $Custom ` - -CurrentConfig $CurrentValues.Custom + -CurrentConfig $CurrentValues.Custom ` + -ZoneName "Custom" if ($result -eq $false) { @@ -856,7 +861,11 @@ function Test-ZoneConfiguration() [Parameter(Mandatory = $true)] [System.Collections.Hashtable[]] - $CurrentConfig + $CurrentConfig, + + [Parameter()] + [System.String] + $ZoneName ) # Testing specified configuration against configured values @@ -892,6 +901,48 @@ function Test-ZoneConfiguration() if ($null -eq $configuredMethod) { + if ($PSBoundParameters.ContainsKey('ZoneName') -eq $true) + { + $source = $MyInvocation.MyCommand.Source + + $EventMessage = "`r`n" + $EventMessage += " `r`n" + + $EventMessage += " `r`n" + foreach ($item in $CurrentConfig) + { + $EventMessage += " `r`n" + foreach ($key in $item.Keys) + { + if (-not ([String]::IsNullOrEmpty($item.$key))) + { + $EventMessage += " " + $item.$key + "`r`n" + } + } + $EventMessage += " `r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " $ZoneName`r`n" + foreach ($desired in $DesiredConfig) + { + $EventMessage += " `r`n" + foreach ($prop in $desired.CimInstanceProperties) + { + $EventMessage += " " + $prop.Value + "`r`n" + + } + $EventMessage += " `r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += "" + + Add-SPDscEvent -Message $EventMessage -EntryType 'Error' -EventID 1 -Source $source + } + return $false } } @@ -929,6 +980,48 @@ function Test-ZoneConfiguration() if ($null -eq $specifiedMethod) { + if ($PSBoundParameters.ContainsKey('ZoneName') -eq $true) + { + $source = $MyInvocation.MyCommand.Source + + $EventMessage = "`r`n" + $EventMessage += " `r`n" + + $EventMessage += " `r`n" + foreach ($item in $CurrentConfig) + { + $EventMessage += " `r`n" + foreach ($key in $item.Keys) + { + if (-not ([String]::IsNullOrEmpty($item.$key))) + { + $EventMessage += " " + $item.$key + "`r`n" + } + } + $EventMessage += " `r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " $ZoneName`r`n" + foreach ($desired in $DesiredConfig) + { + $EventMessage += " `r`n" + foreach ($prop in $desired.CimInstanceProperties) + { + $EventMessage += " " + $prop.Value + "`r`n" + + } + $EventMessage += " `r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += "" + + Add-SPDscEvent -Message $EventMessage -EntryType 'Error' -EventID 1 -Source $source + } + return $false } } diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppBlockedFileTypes/MSFT_SPWebAppBlockedFileTypes.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppBlockedFileTypes/MSFT_SPWebAppBlockedFileTypes.psm1 index 7c76964cb..dc0ab4fcf 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppBlockedFileTypes/MSFT_SPWebAppBlockedFileTypes.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppBlockedFileTypes/MSFT_SPWebAppBlockedFileTypes.psm1 @@ -148,6 +148,7 @@ function Test-TargetResource Import-Module -Name (Join-Path -Path $PSScriptRoot -ChildPath $modulePath -Resolve) $result = Test-SPDscWebApplicationBlockedFileTypeConfig -CurrentSettings $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredSettings $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppClientCallableSettings/MSFT_SPWebAppClientCallableSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppClientCallableSettings/MSFT_SPWebAppClientCallableSettings.psm1 index a36fef0bf..cd33eca64 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppClientCallableSettings/MSFT_SPWebAppClientCallableSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppClientCallableSettings/MSFT_SPWebAppClientCallableSettings.psm1 @@ -592,17 +592,18 @@ function Test-TargetResource } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("WebAppUrl", - "MaxResourcesPerRequest", - "MaxObjectPaths", - "ExecutionTimeout", - "RequestXmlMaxDepth", - "EnableXsdValidation", - "EnableStackTrace", - "RequestUsageExecutionTimeThreshold", - "LogActionsIfHasRequestException", - "EnableRequestUsage") + "MaxResourcesPerRequest", + "MaxObjectPaths", + "ExecutionTimeout", + "RequestXmlMaxDepth", + "EnableXsdValidation", + "EnableStackTrace", + "RequestUsageExecutionTimeThreshold", + "LogActionsIfHasRequestException", + "EnableRequestUsage") Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppGeneralSettings/MSFT_SPWebAppGeneralSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppGeneralSettings/MSFT_SPWebAppGeneralSettings.psm1 index e6db15b15..2e8feb521 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppGeneralSettings/MSFT_SPWebAppGeneralSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppGeneralSettings/MSFT_SPWebAppGeneralSettings.psm1 @@ -380,7 +380,8 @@ function Test-TargetResource $modulePath = "..\..\Modules\SharePointDsc.WebApplication\SPWebApplication.GeneralSettings.psm1" Import-Module -Name (Join-Path -Path $PSScriptRoot -ChildPath $modulePath -Resolve) - $result = Test-SPDscWebApplicationGeneralConfig -CurrentSettings $CurrentValues -DesiredSettings $PSBoundParameters + $result = Test-SPDscWebApplicationGeneralConfig -CurrentSettings $CurrentValues ` + -DesiredSettings $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppPeoplePickerSettings/MSFT_SPWebAppPeoplePickerSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppPeoplePickerSettings/MSFT_SPWebAppPeoplePickerSettings.psm1 index 1fb0adb18..08b43000b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppPeoplePickerSettings/MSFT_SPWebAppPeoplePickerSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppPeoplePickerSettings/MSFT_SPWebAppPeoplePickerSettings.psm1 @@ -285,6 +285,10 @@ function Test-TargetResource } if ($null -eq $configuredDomain) { + $message = "Current SearchActiveDirectoryDomains does not match the desired state." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -300,12 +304,17 @@ function Test-TargetResource if ($null -eq $specifiedDomain) { + $message = "Current SearchActiveDirectoryDomains does not match the desired state." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ActiveDirectoryCustomFilter", ` "ActiveDirectoryCustomQuery", ` diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppPermissions/MSFT_SPWebAppPermissions.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppPermissions/MSFT_SPWebAppPermissions.psm1 index 6c5cce829..c6e8dabf7 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppPermissions/MSFT_SPWebAppPermissions.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppPermissions/MSFT_SPWebAppPermissions.psm1 @@ -527,6 +527,7 @@ function Test-TargetResource if ($CurrentValues.ContainsKey("AllPermissions")) { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AllPermissions") } @@ -539,26 +540,46 @@ function Test-TargetResource { if ($CurrentValues.ContainsKey("AllPermissions")) { - $result = $false - } - else - { - $result = $true - if ($null -ne (Compare-Object -ReferenceObject $ListPermissions ` - -DifferenceObject $CurrentValues.ListPermissions)) + $source = $MyInvocation.MyCommand.Source + $EventMessage = "`r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " AllPermissions is configured, but Desired State has individual permissions specified.`r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " $WebAppUrl`r`n" + if ($PSBoundParameters.ContainsKey('ListPermissions')) { - $result = $false + $EventMessage += " $($ListPermissions -join ", ")`r`n" + } - if ($null -ne (Compare-Object -ReferenceObject $SitePermissions ` - -DifferenceObject $CurrentValues.SitePermissions)) + if ($PSBoundParameters.ContainsKey('SitePermissions')) { - $result = $false + $EventMessage += " $($SitePermissions -join ", ")`r`n" + } - if ($null -ne (Compare-Object -ReferenceObject $PersonalPermissions ` - -DifferenceObject $CurrentValues.PersonalPermissions)) + if ($PSBoundParameters.ContainsKey('PersonalPermissions')) { - $result = $false + $EventMessage += " $($PersonalPermissions -join ", ")`r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += "" + + Add-SPDscEvent -Message $EventMessage -EntryType 'Error' -EventID 1 -Source $source + + $result = $false + } + else + { + $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` + -DesiredValues $PSBoundParameters ` + -ValuesToCheck @("ListPermissions", + "SitePermissions", + "PersonalPermissions" + ) } } diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppPolicy/MSFT_SPWebAppPolicy.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppPolicy/MSFT_SPWebAppPolicy.psm1 index fb2265ade..3defb1b8b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppPolicy/MSFT_SPWebAppPolicy.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppPolicy/MSFT_SPWebAppPolicy.psm1 @@ -649,6 +649,10 @@ function Test-TargetResource if ($null -eq $CurrentValues.WebAppUrl) { + $message = "One of the specified parameters is incorrect. Please check if these are correct." + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -722,7 +726,7 @@ function Test-TargetResource } # Get the list of differences from the current configuration - $differences = Compare-SPDscWebAppPolicy -WAPolicies $CurrentValues.Members ` + [Array]$differences = Compare-SPDscWebAppPolicy -WAPolicies $CurrentValues.Members ` -DSCSettings $allMembers ` -DefaultIdentityType $defaultIdentityType @@ -735,6 +739,37 @@ function Test-TargetResource } else { + $source = $MyInvocation.MyCommand.Source + + $EventMessage = "`r`n" + $EventMessage += " `r`n" + + $EventMessage += " `r`n" + $driftedValue = '' + foreach ($item in $differences) + { + $EventMessage += " " + $item.Username + " is " + $item.Status + "`r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " $WebAppUrl`r`n" + $EventMessage += " `r`n" + foreach ($member in $Members) + { + $EventMessage += " `r`n" + $EventMessage += " $($member.UserName)`r`n" + $EventMessage += " $($member.PermissionLevel)`r`n" + $EventMessage += " $($member.IdentityType)`r`n" + $EventMessage += " $($member.ActAsSystemAccount)`r`n" + $EventMessage += " `r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += "" + + Add-SPDscEvent -Message $EventMessage -EntryType 'Error' -EventID 1 -Source $source + Write-Verbose -Message "Differences in the policy were found, returning false" $result = $false } @@ -746,15 +781,47 @@ function Test-TargetResource # If only checking members to include only differences or missing records count as a fail if ($MembersToInclude) { - $diffcount = ($differences | Where-Object -FilterScript { - $_.Status -eq "Different" -or $_.Status -eq "Missing" - }).Count + $diffs = $differences | Where-Object -FilterScript { + $_.Status -eq "Different" -or $_.Status -eq "Missing" + } + $diffcount = $diffs.Count if ($diffcount -eq 0) { $result = $true } else { + $source = $MyInvocation.MyCommand.Source + + $EventMessage = "`r`n" + $EventMessage += " `r`n" + + $EventMessage += " `r`n" + $driftedValue = '' + foreach ($item in $diffs) + { + $EventMessage += " " + $item.Username + " is " + $item.Status + "`r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " $WebAppUrl`r`n" + $EventMessage += " `r`n" + foreach ($member in $MembersToInclude) + { + $EventMessage += " `r`n" + $EventMessage += " $($member.UserName)`r`n" + $EventMessage += " $($member.PermissionLevel)`r`n" + $EventMessage += " $($member.IdentityType)`r`n" + $EventMessage += " $($member.ActAsSystemAccount)`r`n" + $EventMessage += " `r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += "" + + Add-SPDscEvent -Message $EventMessage -EntryType 'Error' -EventID 1 -Source $source + Write-Verbose -Message "Different or Missing policy was found, returning false" $result = $false } @@ -772,6 +839,7 @@ function Test-TargetResource "that need to be removed") $result = $true + $presentAccounts = @() foreach ($member in $MembersToExclude) { if (($cacheAccounts.SuperUserAccount -eq $member.Username) -or ` @@ -784,11 +852,41 @@ function Test-TargetResource { if ($policy.Username -eq $member.Username) { + $presentAccounts += $member.Username $result = $false } } } + if ($result -eq $false) + { + $source = $MyInvocation.MyCommand.Source + + $EventMessage = "`r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " " + ($presentAccounts -join ", ") + " is/are added to the policy`r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " $WebAppUrl`r`n" + $EventMessage += " `r`n" + foreach ($member in $MembersToExclude) + { + $EventMessage += " `r`n" + $EventMessage += " $($member.UserName)`r`n" + $EventMessage += " $($member.PermissionLevel)`r`n" + $EventMessage += " $($member.IdentityType)`r`n" + $EventMessage += " $($member.ActAsSystemAccount)`r`n" + $EventMessage += " `r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += "" + + Add-SPDscEvent -Message $EventMessage -EntryType 'Error' -EventID 1 -Source $source + } + Write-Verbose -Message "Test-TargetResource returned $result" return $result diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppPropertyBag/MSFT_SPWebAppPropertyBag.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppPropertyBag/MSFT_SPWebAppPropertyBag.psm1 index 2fc665c2b..6481f32c8 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppPropertyBag/MSFT_SPWebAppPropertyBag.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppPropertyBag/MSFT_SPWebAppPropertyBag.psm1 @@ -161,12 +161,14 @@ function Test-TargetResource() if ($Ensure -eq 'Present') { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('Ensure', 'Key', 'Value') } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('Ensure', 'Key') diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppProxyGroup/MSFT_SPWebAppProxyGroup.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppProxyGroup/MSFT_SPWebAppProxyGroup.psm1 index 7ba4d369f..3c76b6a90 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppProxyGroup/MSFT_SPWebAppProxyGroup.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppProxyGroup/MSFT_SPWebAppProxyGroup.psm1 @@ -29,7 +29,7 @@ function Get-TargetResource -ScriptBlock { $params = $args[0] - $WebApp = get-spwebapplication $params.WebAppUrl + $WebApp = Get-SPWebApplication $params.WebAppUrl if (!$WebApp) { return @{ @@ -121,6 +121,9 @@ function Test-TargetResource if (($null -eq $CurrentValues.WebAppUrl) -or ($null -eq $CurrentValues.ServiceAppProxyGroup)) { + $message = "Specified web application {$WebAppUrl} does not exist." + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + $result = $false } else @@ -131,6 +134,11 @@ function Test-TargetResource } else { + $message = ("Current ServiceAppProxyGroup {$($CurrentValues.ServiceAppProxyGroup)} " + ` + "is not in the desired state {$ServiceAppProxyGroup}.") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + $result = $false } } diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppSiteUseAndDeletion/MSFT_SPWebAppSiteUseAndDeletion.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppSiteUseAndDeletion/MSFT_SPWebAppSiteUseAndDeletion.psm1 index 63dbcbe43..47935e8c1 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppSiteUseAndDeletion/MSFT_SPWebAppSiteUseAndDeletion.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppSiteUseAndDeletion/MSFT_SPWebAppSiteUseAndDeletion.psm1 @@ -245,6 +245,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppSuiteBar/MSFT_SPWebAppSuiteBar.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppSuiteBar/MSFT_SPWebAppSuiteBar.psm1 index 3b55008d1..63589df37 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppSuiteBar/MSFT_SPWebAppSuiteBar.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppSuiteBar/MSFT_SPWebAppSuiteBar.psm1 @@ -260,6 +260,7 @@ function Test-TargetResource if ($installedVersion.FileMajorPart -eq 15) { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SuiteBarBrandingElementHtml"); } @@ -268,10 +269,10 @@ function Test-TargetResource $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("SuiteBarBrandingElementHtml", - "SuiteNavBrandingLogoNavigationUrl", - "SuiteNavBrandingLogoTitle", - "SuiteNavBrandingLogoUrl", - "SuiteNavBrandingText") + "SuiteNavBrandingLogoNavigationUrl", + "SuiteNavBrandingLogoTitle", + "SuiteNavBrandingLogoUrl", + "SuiteNavBrandingText") } Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppThrottlingSettings/MSFT_SPWebAppThrottlingSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppThrottlingSettings/MSFT_SPWebAppThrottlingSettings.psm1 index 8a2e23687..c2eaef44b 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppThrottlingSettings/MSFT_SPWebAppThrottlingSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppThrottlingSettings/MSFT_SPWebAppThrottlingSettings.psm1 @@ -257,6 +257,7 @@ function Test-TargetResource $relPath = "..\..\Modules\SharePointDsc.WebApplication\SPWebApplication.Throttling.psm1" Import-Module -Name (Join-Path -Path $PSScriptRoot -ChildPath $relPath -Resolve) $result = Test-SPDscWebApplicationThrottlingConfig -CurrentSettings $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredSettings $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppWorkflowSettings/MSFT_SPWebAppWorkflowSettings.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppWorkflowSettings/MSFT_SPWebAppWorkflowSettings.psm1 index 4417ff4ea..02f366ba1 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppWorkflowSettings/MSFT_SPWebAppWorkflowSettings.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppWorkflowSettings/MSFT_SPWebAppWorkflowSettings.psm1 @@ -147,6 +147,7 @@ function Test-TargetResource $relPath = "..\..\Modules\SharePointDsc.WebApplication\SPWebApplication.Workflow.psm1" Import-Module (Join-Path $PSScriptRoot $relPath -Resolve) $result = Test-SPDscWebApplicationWorkflowConfig -CurrentSettings $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredSettings $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPWebApplication/MSFT_SPWebApplication.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebApplication/MSFT_SPWebApplication.psm1 index 3e5530c2e..a02e8e4e3 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebApplication/MSFT_SPWebApplication.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebApplication/MSFT_SPWebApplication.psm1 @@ -352,6 +352,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") diff --git a/SharePointDsc/DSCResources/MSFT_SPWebApplicationAppDomain/MSFT_SPWebApplicationAppDomain.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebApplicationAppDomain/MSFT_SPWebApplicationAppDomain.psm1 index f669c27ce..46e392516 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebApplicationAppDomain/MSFT_SPWebApplicationAppDomain.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebApplicationAppDomain/MSFT_SPWebApplicationAppDomain.psm1 @@ -175,6 +175,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AppDomain", "Port", "SSL") diff --git a/SharePointDsc/DSCResources/MSFT_SPWebApplicationExtension/MSFT_SPWebApplicationExtension.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebApplicationExtension/MSFT_SPWebApplicationExtension.psm1 index da72ffd1c..50c13db3a 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebApplicationExtension/MSFT_SPWebApplicationExtension.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebApplicationExtension/MSFT_SPWebApplicationExtension.psm1 @@ -328,6 +328,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", "AllowAnonymous") diff --git a/SharePointDsc/DSCResources/MSFT_SPWordAutomationServiceApp/MSFT_SPWordAutomationServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPWordAutomationServiceApp/MSFT_SPWordAutomationServiceApp.psm1 index e1d9d4e9f..45d47672e 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWordAutomationServiceApp/MSFT_SPWordAutomationServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWordAutomationServiceApp/MSFT_SPWordAutomationServiceApp.psm1 @@ -674,6 +674,7 @@ function Test-TargetResource Write-Verbose -Message "Target Values: $(Convert-SPDscHashtableToString -Hashtable $PSBoundParameters)" $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters Write-Verbose -Message "Test-TargetResource returned $result" diff --git a/SharePointDsc/DSCResources/MSFT_SPWorkManagementServiceApp/MSFT_SPWorkManagementServiceApp.psm1 b/SharePointDsc/DSCResources/MSFT_SPWorkManagementServiceApp/MSFT_SPWorkManagementServiceApp.psm1 index 54bbb5ba5..363c9203a 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWorkManagementServiceApp/MSFT_SPWorkManagementServiceApp.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWorkManagementServiceApp/MSFT_SPWorkManagementServiceApp.psm1 @@ -405,20 +405,22 @@ function Test-TargetResource if ($Ensure -eq "Present") { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("ApplicationPool", - "MinimumTimeBetweenEwsSyncSubscriptionSearches", - "MinimumTimeBetweenProviderRefreshes", - "MinimumTimeBetweenSearchQueries", - "Name", - "NumberOfSubscriptionSyncsPerEwsSyncRun", - "NumberOfUsersEwsSyncWillProcessAtOnce", - "NumberOfUsersPerEwsSyncBatch", - "Ensure") + "MinimumTimeBetweenEwsSyncSubscriptionSearches", + "MinimumTimeBetweenProviderRefreshes", + "MinimumTimeBetweenSearchQueries", + "Name", + "NumberOfSubscriptionSyncsPerEwsSyncRun", + "NumberOfUsersEwsSyncWillProcessAtOnce", + "NumberOfUsersPerEwsSyncBatch", + "Ensure") } else { $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") } diff --git a/SharePointDsc/DSCResources/MSFT_SPWorkflowService/MSFT_SPWorkflowService.psm1 b/SharePointDsc/DSCResources/MSFT_SPWorkflowService/MSFT_SPWorkflowService.psm1 index a08fb74ac..1c106cc71 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWorkflowService/MSFT_SPWorkflowService.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWorkflowService/MSFT_SPWorkflowService.psm1 @@ -164,6 +164,10 @@ function Test-TargetResource if ($null -eq $CurrentValues.WorkflowHostUri) { + $message = "WorkflowHostUri is not configured" + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $MyInvocation.MyCommand.Source + Write-Verbose -Message "Test-TargetResource returned false" return $false } @@ -177,6 +181,7 @@ function Test-TargetResource } $result = Test-SPDscParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck diff --git a/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 b/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 index b94ba27aa..8e60bb9b9 100644 --- a/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 +++ b/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 @@ -1,3 +1,51 @@ +function Add-SPDscEvent +{ + [CmdletBinding()] + param( + [Parameter(Mandatory = $true)] + [System.String] + $Message, + + [Parameter(Mandatory = $true)] + [System.String] + $Source = 'Generic', + + [Parameter()] + [ValidateSet('Error', 'Information', 'FailureAudit', 'SuccessAudit', 'Warning')] + [System.String] + $EntryType = 'Information', + + [Parameter()] + [System.UInt32] + $EventID = 1 + ) + + try + { + $CurrentLog = Get-EventLog -LogName 'SharePointDsc' -Source $Source -ErrorAction SilentlyContinue + if ($null -eq $CurrentLog) + { + $CurrentLog = New-EventLog -LogName 'SharePointDsc' -Source $Source -ErrorAction SilentlyContinue + } + [System.Diagnostics.EventLog]::CreateEventSource($Source, "SharePointDsc") + } + catch + { + Write-Verbose $_ + } + + try + { + Write-EventLog -LogName 'SharePointDsc' -Source $Source ` + -EventID $EventID -Message $Message -EntryType $EntryType ` + -ErrorAction SilentlyContinue + } + catch + { + Write-Verbose $_ + } +} + function Add-SPDscUserToLocalAdmin { [CmdletBinding()] @@ -42,6 +90,63 @@ function Clear-SPDscKerberosToken } } +function Compare-PSCustomObjectArrays +{ + [CmdletBinding()] + [OutputType([System.Object[]])] + param + ( + [Parameter(Mandatory = $true)] + [AllowEmptyCollection()] + [System.Object[]] + $DesiredValues, + + [Parameter(Mandatory = $true)] + [AllowEmptyCollection()] + [System.Object[]] + $CurrentValues + ) + + $DriftedProperties = @() + foreach ($DesiredEntry in $DesiredValues) + { + $Properties = $DesiredEntry.PSObject.Properties + $KeyProperty = $Properties.Name[0] + + $EquivalentEntryInCurrent = $CurrentValues | Where-Object -FilterScript { $_.$KeyProperty -eq $DesiredEntry.$KeyProperty } + if ($null -eq $EquivalentEntryInCurrent) + { + $result = @{ + Property = $DesiredEntry + PropertyName = $KeyProperty + Desired = $DesiredEntry.$KeyProperty + Current = $null + } + $DriftedProperties += $DesiredEntry + } + else + { + foreach ($property in $Properties) + { + $propertyName = $property.Name + + if ($DesiredEntry.$PropertyName -ne $EquivalentEntryInCurrent.$PropertyName) + { + $result = @{ + Property = $DesiredEntry + PropertyName = $PropertyName + Desired = $DesiredEntry.$PropertyName + Current = $EquivalentEntryInCurrent.$PropertyName + } + $DriftedProperties += $result + } + } + } + } + + return $DriftedProperties +} + function Convert-SPDscADGroupIDToName { param @@ -801,13 +906,19 @@ function Test-SPDscParameterState [Object] $DesiredValues, - [Parameter(, Position = 3)] + [Parameter(Position = 3)] [Array] - $ValuesToCheck + $ValuesToCheck, + + [Parameter(Position = 4)] + [System.String] + $Source = 'Generic' ) $returnValue = $true + $DriftedParameters = @{} + if (($DesiredValues.GetType().Name -ne "HashTable") -and ` ($DesiredValues.GetType().Name -ne "CimInstance") -and ` ($DesiredValues.GetType().Name -ne "PSBoundParametersDictionary")) @@ -864,13 +975,47 @@ function Test-SPDscParameterState "values, but it was either not present or " + ` "was null. This has caused the test method " + ` "to return false.") + $DriftedParameters.Add($fieldName, '') $returnValue = $false } + elseif ($desiredType.Name -eq 'ciminstance[]') + { + Write-Verbose "The current property {$_} is a CimInstance[]" + $AllDesiredValuesAsArray = @() + foreach ($item in $DesiredValues.$_) + { + $currentEntry = @{ } + foreach ($prop in $item.CIMInstanceProperties) + { + $value = $prop.Value + if ([System.String]::IsNullOrEmpty($value)) + { + $value = $null + } + $currentEntry.Add($prop.Name, $value) + } + $AllDesiredValuesAsArray += [PSCustomObject]$currentEntry + } + + $arrayCompare = Compare-PSCustomObjectArrays -CurrentValues $CurrentValues.$fieldName ` + -DesiredValues $AllDesiredValuesAsArray + if ($null -ne $arrayCompare) + { + foreach ($item in $arrayCompare) + { + $EventValue = "[$($item.PropertyName)]$($item.CurrentValue)" + $EventValue += "[$($item.PropertyName)]$($item.DesiredValue)" + $DriftedParameters.Add($fieldName, $EventValue) + } + $returnValue = $false + } + } else { $arrayCompare = Compare-Object -ReferenceObject $CurrentValues.$fieldName ` -DifferenceObject $DesiredValues.$fieldName - if ($null -ne $arrayCompare) + if ($null -ne $arrayCompare -and ` + -not [System.String]::IsNullOrEmpty($arrayCompare.InputObject)) { Write-Verbose -Message ("Found an array for property $fieldName " + ` "in the current values, but this array " + ` @@ -879,6 +1024,10 @@ function Test-SPDscParameterState $arrayCompare | ForEach-Object -Process { Write-Verbose -Message "$($_.InputObject) - $($_.SideIndicator)" } + + $EventValue = "$($CurrentValues.$fieldName -join ", ")" + $EventValue += "$($DesiredValues.$fieldName -join ", ")" + $DriftedParameters.Add($fieldName, $EventValue) $returnValue = $false } } @@ -901,6 +1050,9 @@ function Test-SPDscParameterState "'$($CurrentValues.$fieldName)' " + ` "and desired state is " + ` "'$($DesiredValues.$fieldName)'") + $EventValue = "$($CurrentValues.$fieldName)" + $EventValue += "$($DesiredValues.$fieldName)" + $DriftedParameters.Add($fieldName, $EventValue) $returnValue = $false } } @@ -918,6 +1070,9 @@ function Test-SPDscParameterState "'$($CurrentValues.$fieldName)' " + ` "and desired state is " + ` "'$($DesiredValues.$fieldName)'") + $EventValue = "$($CurrentValues.$fieldName)" + $EventValue += "$($DesiredValues.$fieldName)" + $DriftedParameters.Add($fieldName, $EventValue) $returnValue = $false } } @@ -935,6 +1090,9 @@ function Test-SPDscParameterState "'$($CurrentValues.$fieldName)' " + ` "and desired state is " + ` "'$($DesiredValues.$fieldName)'") + $EventValue = "$($CurrentValues.$fieldName)" + $EventValue += "$($DesiredValues.$fieldName)" + $DriftedParameters.Add($fieldName, $EventValue) $returnValue = $false } } @@ -948,6 +1106,9 @@ function Test-SPDscParameterState "'$($CurrentValues.$fieldName)' " + ` "and desired state is " + ` "'$($DesiredValues.$fieldName)'") + $EventValue = "$($CurrentValues.$fieldName)" + $EventValue += "$($DesiredValues.$fieldName)" + $DriftedParameters.Add($fieldName, $EventValue) $returnValue = $false } } @@ -965,8 +1126,65 @@ function Test-SPDscParameterState "'$($CurrentValues.$fieldName)' " + ` "and desired state is " + ` "'$($DesiredValues.$fieldName)'") + $EventValue = "$($CurrentValues.$fieldName)" + $EventValue += "$($DesiredValues.$fieldName)" + $DriftedParameters.Add($fieldName, $EventValue) + $returnValue = $false + } + } + "Hashtable" + { + Write-Verbose -Message "The current property {$fieldName} is a Hashtable" + $AllDesiredValuesAsArray = @() + foreach ($item in $DesiredValues.$fieldName) + { + $currentEntry = @{ } + foreach ($key in $item.Keys) + { + $value = $item.$key + if ([System.String]::IsNullOrEmpty($value)) + { + $value = $null + } + $currentEntry.Add($key, $value) + } + $AllDesiredValuesAsArray += [PSCustomObject]$currentEntry + } + + if ($null -ne $DesiredValues.$fieldName -and $null -eq $CurrentValues.$fieldName) + { $returnValue = $false } + else + { + $AllCurrentValuesAsArray = @() + foreach ($item in $CurrentValues.$fieldName) + { + $currentEntry = @{ } + foreach ($key in $item.Keys) + { + $value = $item.$key + if ([System.String]::IsNullOrEmpty($value)) + { + $value = $null + } + $currentEntry.Add($key, $value) + } + $AllCurrentValuesAsArray += [PSCustomObject]$currentEntry + } + $arrayCompare = Compare-PSCustomObjectArrays -CurrentValues $AllCurrentValuesAsArray ` + -DesiredValues $AllCurrentValuesAsArray + if ($null -ne $arrayCompare) + { + foreach ($item in $arrayCompare) + { + $EventValue = "[$($item.PropertyName)]$($item.CurrentValue)" + $EventValue += "[$($item.PropertyName)]$($item.DesiredValue)" + $DriftedParameters.Add($fieldName, $EventValue) + } + $returnValue = $false + } + } } default { @@ -974,6 +1192,9 @@ function Test-SPDscParameterState "as the type ($($desiredType.Name)) is " + ` "not handled by the " + ` "Test-SPDscParameterState cmdlet") + $EventValue = "$($CurrentValues.$fieldName)" + $EventValue += "$($DesiredValues.$fieldName)" + $DriftedParameters.Add($fieldName, $EventValue) $returnValue = $false } } @@ -982,6 +1203,37 @@ function Test-SPDscParameterState } } } + + if ($returnValue -eq $false) + { + $EventMessage = "`r`n" + $EventMessage += " `r`n" + + $EventMessage += " `r`n" + $driftedValue = '' + foreach ($key in $DriftedParameters.Keys) + { + Write-Verbose -Message "Detected Drifted Parameter [$Source]$key" + $EventMessage += " " + $DriftedParameters.$key + "`r`n" + } + $EventMessage += " `r`n" + $EventMessage += " `r`n" + $EventMessage += " `r`n" + foreach ($Key in $DesiredValues.Keys) + { + $Value = $DesiredValues.$Key -join ", " + if ([System.String]::IsNullOrEmpty($Value)) + { + $Value = "`$null" + } + $EventMessage += " $Value`r`n" + } + $EventMessage += " `r`n" + $EventMessage += "" + + Add-SPDscEvent -Message $EventMessage -EntryType 'Error' -EventID 1 -Source $Source + } + return $returnValue } diff --git a/SharePointDsc/Modules/SharePointDsc.WebAppPolicy/SPWebAppPolicy.psm1 b/SharePointDsc/Modules/SharePointDsc.WebAppPolicy/SPWebAppPolicy.psm1 index 745092f58..8b78996bc 100644 --- a/SharePointDsc/Modules/SharePointDsc.WebAppPolicy/SPWebAppPolicy.psm1 +++ b/SharePointDsc/Modules/SharePointDsc.WebAppPolicy/SPWebAppPolicy.psm1 @@ -11,12 +11,10 @@ function Assert-SPDscPolicyUser() $UsernameToCheck ) - foreach ($difference in $CurrentDifferences) + $diffcol = $CurrentDifferences | Where { $_.Username -eq $UsernameToCheck } + if ($diffcol.Count -gt 0) { - if ($difference.ContainsKey($UsernameToCheck)) - { - return $true - } + return $true } return $false } diff --git a/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.BlockedFileTypes.psm1 b/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.BlockedFileTypes.psm1 index c3b954cfb..aee0d0668 100644 --- a/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.BlockedFileTypes.psm1 +++ b/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.BlockedFileTypes.psm1 @@ -85,9 +85,16 @@ function Test-SPDscWebApplicationBlockedFileTypeConfig $CurrentSettings, [Parameter(Mandatory = $true)] - $DesiredSettings + $DesiredSettings, + + [Parameter(Mandatory = $true)] + [System.String] + $Source ) + $relPath = "..\..\Modules\SharePointDsc.Util\SharePointDsc.Util.psm1" + Import-Module (Join-Path $PSScriptRoot $relPath -Resolve) + if (($DesiredSettings.ContainsKey("Blocked") -eq $true) ` -and (($DesiredSettings.ContainsKey("EnsureBlocked") -eq $true) ` -or ($DesiredSettings.ContainsKey("EnsureAllowed") -eq $true))) @@ -114,6 +121,11 @@ function Test-SPDscWebApplicationBlockedFileTypeConfig } else { + $message = ("The parameter Blocked does not match the desired state. " + ` + "Actual: $($CurrentSettings.Blocked). Desired: $($DesiredSettings.Blocked)") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $Source + return $false } } @@ -126,6 +138,11 @@ function Test-SPDscWebApplicationBlockedFileTypeConfig } if ($null -ne $itemsToAdd) { + $message = ("The parameter EnsureBlocked does not match the desired state. " + ` + "Actual: $($CurrentSettings.Blocked). Desired: $($DesiredSettings.EnsureBlocked)") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $Source + return $false } } @@ -137,6 +154,11 @@ function Test-SPDscWebApplicationBlockedFileTypeConfig -ExcludeDifferent -IncludeEqual if ($null -ne $itemsToRemove) { + $message = ("The parameter EnsureAllowed does not match the desired state. " + ` + "Actual: $($CurrentSettings.Blocked). Desired: $($DesiredSettings.EnsureAllowed)") + Write-Verbose -Message $message + Add-SPDscEvent -Message $message -EntryType 'Error' -EventID 1 -Source $Source + return $false } } diff --git a/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.GeneralSettings.psm1 b/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.GeneralSettings.psm1 index 31dc107a7..26decac17 100644 --- a/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.GeneralSettings.psm1 +++ b/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.GeneralSettings.psm1 @@ -141,6 +141,7 @@ function Test-SPDscWebApplicationGeneralConfig "DefaultQuotaTemplate" ) $testReturn = Test-SPDscParameterState -CurrentValues $CurrentSettings ` + -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $DesiredSettings ` -ValuesToCheck $valuesToCheck return $testReturn diff --git a/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.Throttling.psm1 b/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.Throttling.psm1 index 1a82ed57f..a89d28c8a 100644 --- a/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.Throttling.psm1 +++ b/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.Throttling.psm1 @@ -120,25 +120,30 @@ function Test-SPDscWebApplicationThrottlingConfig $CurrentSettings, [Parameter(Mandatory = $true)] - $DesiredSettings + $DesiredSettings, + + [Parameter(Mandatory = $true)] + [System.String] + $Source ) $relPath = "..\..\Modules\SharePointDsc.Util\SharePointDsc.Util.psm1" Import-Module -Name (Join-Path -Path $PSScriptRoot -ChildPath $relPath -Resolve) $testReturn = Test-SPDscParameterState -CurrentValues $CurrentSettings ` + -Source $Source ` -DesiredValues $DesiredSettings ` -ValuesToCheck @( - "ListViewThreshold", - "AllowObjectModelOverride", - "AdminThreshold", - "ListViewLookupThreshold", - "HappyHourEnabled", - "UniquePermissionThreshold", - "RequestThrottling", - "ChangeLogEnabled", - "ChangeLogExpiryDays", - "EventHandlersEnabled" - ) + "ListViewThreshold", + "AllowObjectModelOverride", + "AdminThreshold", + "ListViewLookupThreshold", + "HappyHourEnabled", + "UniquePermissionThreshold", + "RequestThrottling", + "ChangeLogEnabled", + "ChangeLogExpiryDays", + "EventHandlersEnabled" + ) if ($testReturn -eq $true) { if ($null -ne $DesiredSettings.HappyHour) @@ -170,6 +175,7 @@ function Test-SPDscWebApplicationThrottlingConfig } $testReturn = Test-SPDscParameterState -CurrentValues $CurrentSettings.HappyHour ` + -Source $Source ` -DesiredValues $DesiredHappyHour ` -ValuesToCheck @("Hour", "Minute", "Duration") } diff --git a/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.Workflow.psm1 b/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.Workflow.psm1 index 98d21451d..5b32e8169 100644 --- a/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.Workflow.psm1 +++ b/SharePointDsc/Modules/SharePointDsc.WebApplication/SPWebApplication.Workflow.psm1 @@ -56,7 +56,11 @@ function Test-SPDscWebApplicationWorkflowConfig $CurrentSettings, [Parameter(Mandatory = $true)] - $DesiredSettings + $DesiredSettings, + + [Parameter(Mandatory = $true)] + [System.String] + $Source ) $relPath = "..\..\Modules\SharePointDsc.Util\SharePointDsc.Util.psm1" @@ -66,7 +70,8 @@ function Test-SPDscWebApplicationWorkflowConfig "ExternalWorkflowParticipantsEnabled") $testReturn = Test-SPDscParameterState -CurrentValues $CurrentSettings ` -DesiredValues $DesiredSettings ` - -ValuesToCheck $valuesTocheck + -ValuesToCheck $valuesTocheck ` + -Source $Source return $testReturn } diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPAccessServiceApp.Tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPAccessServiceApp.Tests.ps1 index 5cb4cee9b..dc89c53df 100644 --- a/tests/Unit/SharePointDsc/SharePointDsc.SPAccessServiceApp.Tests.ps1 +++ b/tests/Unit/SharePointDsc/SharePointDsc.SPAccessServiceApp.Tests.ps1 @@ -194,6 +194,12 @@ public class SPServiceContext { return $spServiceApp } + Mock -CommandName Get-SPAccessServicesDatabaseServer -MockWith { + return @{ + ServerName = $testParams.DatabaseServer + } + } + It "Should return present from the Get method" { (Get-TargetResource @testParams).Ensure | Should Be "Present" } diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPWebAppPolicy.Tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPWebAppPolicy.Tests.ps1 index 5635f8ca2..998e95fe3 100644 --- a/tests/Unit/SharePointDsc/SharePointDsc.SPWebAppPolicy.Tests.ps1 +++ b/tests/Unit/SharePointDsc/SharePointDsc.SPWebAppPolicy.Tests.ps1 @@ -795,6 +795,12 @@ try IdentityType = "Native" ActAsSystemAccount = $false } -ClientOnly) + (New-CimInstance -ClassName MSFT_SPWebAppPolicy -Property @{ + Username = "contoso\user3" + PermissionLevel = "Full Control" + IdentityType = "Native" + ActAsSystemAccount = $false + } -ClientOnly) ) } Mock -CommandName Get-SPWebapplication -MockWith { diff --git a/tests/Unit/SharePointDsc/SharePointDsc.Util.Tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.Util.Tests.ps1 index d97892f68..40bf04fbb 100644 --- a/tests/Unit/SharePointDsc/SharePointDsc.Util.Tests.ps1 +++ b/tests/Unit/SharePointDsc/SharePointDsc.Util.Tests.ps1 @@ -148,6 +148,7 @@ try It "Should return true for two identical tables" { $desired = @{ Example = "test" } Test-SPDscParameterState -CurrentValues $desired ` + -Source 'SharePointDsc.Util' ` -DesiredValues $desired | Should Be $true } @@ -155,6 +156,7 @@ try $current = @{ Example = "something" } $desired = @{ Example = "test" } Test-SPDscParameterState -CurrentValues $current ` + -Source 'SharePointDsc.Util' ` -DesiredValues $desired | Should Be $false } @@ -162,6 +164,7 @@ try $current = @{ } $desired = @{ Example = "test" } Test-SPDscParameterState -CurrentValues $current ` + -Source 'SharePointDsc.Util' ` -DesiredValues $desired | Should Be $false } @@ -169,6 +172,7 @@ try $current = @{ Example = "test"; SecondExample = "true" } $desired = @{ Example = "test"; SecondExample = "false" } Test-SPDscParameterState -CurrentValues $current ` + -Source 'SharePointDsc.Util' ` -DesiredValues $desired ` -ValuesToCheck @("Example") | Should Be $true } @@ -177,6 +181,7 @@ try $current = @{ Example = "test"; SecondExample = "true" } $desired = @{ Example = "test"; SecondExample = "false" } Test-SPDscParameterState -CurrentValues $current ` + -Source 'SharePointDsc.Util' ` -DesiredValues $desired ` -ValuesToCheck @("SecondExample") | Should Be $false } @@ -185,6 +190,7 @@ try $current = @{ } $desired = @{ Example = "test"; SecondExample = "false" } Test-SPDscParameterState -CurrentValues $current ` + -Source 'SharePointDsc.Util' ` -DesiredValues $desired | Should Be $false } } From 9fff7017b67876539e04855a324e2f560bf1b5ff Mon Sep 17 00:00:00 2001 From: Yorick Kuijs Date: Tue, 17 Mar 2020 16:18:56 +0100 Subject: [PATCH 5/5] Corrected HQRM issue --- .../Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 b/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 index 8e60bb9b9..88440dfec 100644 --- a/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 +++ b/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 @@ -1,7 +1,8 @@ function Add-SPDscEvent { [CmdletBinding()] - param( + param + ( [Parameter(Mandatory = $true)] [System.String] $Message, @@ -917,7 +918,7 @@ function Test-SPDscParameterState $returnValue = $true - $DriftedParameters = @{} + $DriftedParameters = @{ } if (($DesiredValues.GetType().Name -ne "HashTable") -and ` ($DesiredValues.GetType().Name -ne "CimInstance") -and ` @@ -1015,7 +1016,7 @@ function Test-SPDscParameterState $arrayCompare = Compare-Object -ReferenceObject $CurrentValues.$fieldName ` -DifferenceObject $DesiredValues.$fieldName if ($null -ne $arrayCompare -and ` - -not [System.String]::IsNullOrEmpty($arrayCompare.InputObject)) + -not [System.String]::IsNullOrEmpty($arrayCompare.InputObject)) { Write-Verbose -Message ("Found an array for property $fieldName " + ` "in the current values, but this array " + ` @@ -1173,7 +1174,7 @@ function Test-SPDscParameterState $AllCurrentValuesAsArray += [PSCustomObject]$currentEntry } $arrayCompare = Compare-PSCustomObjectArrays -CurrentValues $AllCurrentValuesAsArray ` - -DesiredValues $AllCurrentValuesAsArray + -DesiredValues $AllCurrentValuesAsArray if ($null -ne $arrayCompare) { foreach ($item in $arrayCompare)