Merge pull request #4186 from NikCharlebois/Integration

Integration Fixes
microsoft · Jan 18, 2024 · 451f77a · 451f77a
2 parents 3970f03 + 1ea6ecb
commit 451f77a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/...SFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 b/...SFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1
@@ -111,9 +111,12 @@ function Get-TargetResource
                 -ErrorAction SilentlyContinue
         }
 
-        if ($null -eq $getValue -and -not [System.String]::IsNullOrEmpty($id))
+        if ($null -eq $getValue)
         {
-            Write-Verbose -Message "Nothing with id {$id} was found"
+            if(-not [System.String]::IsNullOrEmpty($id))
+            {
+                Write-Verbose -Message "Nothing with id {$id} was found"
+            }
 
             if (-Not [string]::IsNullOrEmpty($DisplayName))
             {

diff --git a/...mentManagementAccessPackageCatalog/MSFT_AADEntitlementManagementAccessPackageCatalog.psm1 b/...mentManagementAccessPackageCatalog/MSFT_AADEntitlementManagementAccessPackageCatalog.psm1
@@ -93,9 +93,12 @@ function Get-TargetResource
             $getValue = Get-MgBetaEntitlementManagementAccessPackageCatalog -AccessPackageCatalogId $id -ErrorAction SilentlyContinue
         }
 
-        if ($null -eq $getValue -and -not [System.String]::IsNullOrEmpty($Id))
+        if ($null -eq $getValue)
         {
-            Write-Verbose -Message "Nothing with id {$id} was found"
+            if (-not [System.String]::IsNullOrEmpty($Id))
+            {
+                Write-Verbose -Message "Nothing with id {$id} was found"
+            }
 
             if (-Not [string]::IsNullOrEmpty($DisplayName))
             {

diff --git a/...ntManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1 b/...ntManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1
@@ -93,7 +93,10 @@ function Get-TargetResource
 
         if ($null -eq $getValue)
         {
-            Write-Verbose -Message "Entitlement Management Connected Organization with id {$id} was not found."
+            if (-not [System.String]::IsNullOrEmpty($id))
+            {
+                Write-Verbose -Message "Entitlement Management Connected Organization with id {$id} was not found."
+            }
 
             if (-Not [string]::IsNullOrEmpty($DisplayName))
             {