Merge branch 'dcrreynolds-master' into dev

Author: tysonjhayes

DSCResources/MSFT_xComputer/MSFT_xComputer.psm1

@@ -9,6 +9,8 @@ function Get-TargetResource
     param
     (
         [parameter(Mandatory)]
+        [ValidateLength(1,15)]
+        [ValidateScript({$_ -inotmatch'[\/\\:*?"<>|]' })]
         [string] $Name,
 
         [string] $DomainName,
@@ -43,6 +45,8 @@ function Set-TargetResource
     param
     (
         [parameter(Mandatory)]
+        [ValidateLength(1,15)]
+        [ValidateScript({$_ -inotmatch'[\/\\:*?"<>|]' })]
         [string] $Name,
 
         [string] $DomainName,
@@ -197,6 +201,8 @@ function Test-TargetResource
     param
     (
         [parameter(Mandatory)]
+        [ValidateLength(1,15)]
+        [ValidateScript({$_ -inotmatch'[\/\\:*?"<>|]' })]
         [string] $Name,
 
         [string] $JoinOU,
@@ -209,6 +215,8 @@ function Test-TargetResource
 
         [string] $WorkGroupName
     )
+
+    Write-Verbose -Message "Validate desired Name is a valid name"
 
     Write-Verbose -Message "Checking if computer name is $Name"
     if ($Name -ne $env:COMPUTERNAME) {return $false}

Tests/xComputermanagement.Tests.ps1

@@ -82,6 +82,12 @@ InModuleScope MSFT_xComputer {
                 Mock GetComputerDomain {'contoso.com'}
                 Test-TargetResource -Name $Env:ComputerName -WorkGroupName 'Contoso' -Credential $Credential -UnjoinCredential $Credential | Should Be $false
             }
+            It 'Throws if name is to long' {
+                {Test-TargetResource -Name "ThisNameIsTooLong"} | Should Throw
+            }
+            It 'Throws if name contains illigal characters' {
+                {Test-TargetResource -Name "ThisIsBad<>"} | Should Throw
+            }
 
         }
         Context Get-TargetResource {
@@ -93,6 +99,12 @@ InModuleScope MSFT_xComputer {
                 $Result.GetType().Fullname | Should Be 'System.Collections.Hashtable'
                 $Result.Keys | Should Be @('Name', 'DomainName', 'JoinOU', 'CurrentOU', 'Credential', 'UnjoinCredential', 'WorkGroupName')
             }
+            It 'Throws if name is to long' {
+                {Get-TargetResource -Name "ThisNameIsTooLong"} | Should Throw
+            }
+            It 'Throws if name contains illigal characters' {
+                {Get-TargetResource -Name "ThisIsBad<>"} | Should Throw
+            }
         }
         Context Set-TargetResource {
             Mock Rename-Computer {}
@@ -196,6 +208,12 @@ InModuleScope MSFT_xComputer {
                 Assert-MockCalled -CommandName Rename-Computer -Exactly 1 -Scope It
                 Assert-MockCalled -CommandName Add-Computer -Exactly 0 -Scope It
             }
+            It 'Throws if name is to long' {
+                {Set-TargetResource -Name "ThisNameIsTooLong"} | Should Throw
+            }
+            It 'Throws if name contains illigal characters' {
+                {Set-TargetResource -Name "ThisIsBad<>"} | Should Throw
+            }
         }
     }
 }