DomainName check validates child without FQDN

The condition for verifying we're in the correct domain throws a non-terminating error if a child domain was used as input without FQDN. All other functions worked correctly in that scenario except validating the computer is in the correct domain. This change allows lacking FQDN to still return true value.

Author: BristleBeard

DSCResources/MSFT_xComputer/MSFT_xComputer.psm1

@@ -234,11 +234,23 @@ function Test-TargetResource
         {
             throw "Need to specify credentials with domain"
         }
-        
+
         try
         {
             Write-Verbose "Checking if the machine is a member of $DomainName."
-            return ($DomainName.ToLower() -eq (GetComputerDomain).ToLower())
+            if ($DomainName.Contains('.'))
+            {
+                $getComputerDomainSplat = @{
+                    netbios = $false
+                }
+            }
+            else
+            {
+                $getComputerDomainSplat = @{
+                    netbios = $true
+                }
+            }
+            return ($DomainName -eq (GetComputerDomain @getComputerDomainSplat ))
         }
         catch
         {
@@ -268,9 +280,25 @@ function ValidateDomainOrWorkGroup($DomainName, $WorkGroupName)
 
 function GetComputerDomain
 {
-  try
+    [CmdletBinding()]
+    param
+    (
+        [Parameter()]
+        [Switch]
+        $NetBios
+    )
+
+    try
     {
-        return ([System.DirectoryServices.ActiveDirectory.Domain]::GetComputerDomain()).Name
+        if ($NetBios)
+        {
+            $domainName = $ENV:USERDOMAIN
+        }
+        else
+        {
+            $domainName = ([System.DirectoryServices.ActiveDirectory.Domain]::GetComputerDomain()).Name
+        }
+        return $domainName
     }
     catch [System.Management.Automation.MethodInvocationException]
     {

README.md

@@ -90,6 +90,7 @@ xVirtualMemory has the following properties:
 ## Versions
 
 ### Unreleased
+* xComputer: Changed comparision that validates if we are in the correct AD Domain to work correctly if FQDN wasn't used
 
 ### 1.10.0.0
 * Added resources