Merge pull request #172 from PowerShell/dev

Release of version 5.2.0.0 of ComputerManagementDsc

Author: kwirkykat

.github/stale.yml

@@ -0,0 +1,44 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+limitPerRun: 30
+
+pulls:
+  daysUntilStale: 14
+  daysUntilClose: false
+  exemptProjects: true
+  exemptMilestones: true
+  staleLabel: abandoned
+  exemptLabels:
+    - needs review
+    - on hold
+    - waiting for CLA pass
+
+  markComment: >
+    Labeling this pull request (PR) as abandoned since it has gone 14 days or more
+    since the last update. An abandoned PR can be continued by another contributor.
+    The abandoned label will be removed if work on this PR is taken up again.
+
+issues:
+  daysUntilStale: 30
+  daysUntilClose: 40
+  exemptProjects: true
+  exemptMilestones: true
+  staleLabel: stale
+  exemptLabels:
+    - bug
+    - enhancement
+    - tests
+    - documentation
+    - resource proposal
+    - on hold
+
+  markComment: >
+    This issue has been automatically marked as stale because
+    it has not had activity from the community in the last 30 days. It will be
+    closed if no further activity occurs within 10 days. If the issue is labelled
+    with any of the work labels (e.g bug, enhancement, documentation, or tests)
+    then the issue will not auto-close.
+
+  closeComment: >
+    This issue has been automatically closed because it is has not had activity
+    from the community in the last 40 days.

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## Unreleased
 
+## 5.2.0.0
+
+- PowershellExecutionPolicy:
+  - Updated to meet HQRM guidelines.
+  - Migrated the xPowershellExecutionPolicy from [xPowershellExecutionPolicy](https://github.com/PowerShell/xPowerShellExecutionPolicy)
+    and renamed to PowershellExecutionPolicy.
+  - Moved strings to localization file.
+- Changed the scope from Global to Script in MSFT_ScheduledTask.Integration.Tests.ps1
+- Changed the scope from Global to Script ComputerManagementDsc.Common.Tests.ps1
+- ScheduledTask:
+  - Added support for event based triggers, implemented using the ScheduleType OnEvent
+    fixes [Issue #167](https://github.com/PowerShell/ComputerManagementDsc/issues/167)
+
 ## 5.1.0.0
 
 - TimeZone:
@@ -11,6 +24,7 @@
   ComputerManagementDsc.Common module to match what TimeZone requires.
   It was not exported in ComputerManagementDsc.ResourceHelper and not
   used.
+- Add `server` parameter to `Computer` resource - fixes [Issue #161](https://github.com/PowerShell/ComputerManagementDsc/issues/161)
 
 ## 5.0.0.0
 

Modules/ComputerManagementDsc/ComputerManagementDsc.psd1

@@ -1,6 +1,6 @@
 @{
 # Version number of this module.
-moduleVersion = '5.1.0.0'
+moduleVersion = '5.2.0.0'
 
 # ID used to uniquely identify this module
 GUID = 'B5004952-489E-43EA-999C-F16A25355B89'
@@ -49,13 +49,16 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '- TimeZone:
-  - Migrated xTimeZone resource from [xTimeZone](https://github.com/PowerShell/xTimeZone)
-    and renamed to TimeZone - fixes [Issue 157](https://github.com/PowerShell/ComputerManagementDsc/issues/157).
-- Moved Test-Command from ComputerManagementDsc.ResourceHelper to
-  ComputerManagementDsc.Common module to match what TimeZone requires.
-  It was not exported in ComputerManagementDsc.ResourceHelper and not
-  used.
+        ReleaseNotes = '- PowershellExecutionPolicy:
+  - Updated to meet HQRM guidelines.
+  - Migrated the xPowershellExecutionPolicy from [xPowershellExecutionPolicy](https://github.com/PowerShell/xPowerShellExecutionPolicy)
+    and renamed to PowershellExecutionPolicy.
+  - Moved strings to localization file.
+- Changed the scope from Global to Script in MSFT_ScheduledTask.Integration.Tests.ps1
+- Changed the scope from Global to Script ComputerManagementDsc.Common.Tests.ps1
+- ScheduledTask:
+  - Added support for event based triggers, implemented using the ScheduleType OnEvent
+    fixes [Issue 167](https://github.com/PowerShell/ComputerManagementDsc/issues/167)
 
 '
 
@@ -65,3 +68,4 @@ PrivateData = @{
 }
 
 
+

Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.psm1

@@ -45,6 +45,9 @@ $script:localizedData = Get-LocalizedData `
 
     .PARAMETER Description
         The value assigned here will be set as the local computer description.
+
+    .PARAMETER Server
+        The Active Directory Domain Controller to use to join the domain.
 #>
 function Get-TargetResource
 {
@@ -80,7 +83,11 @@ function Get-TargetResource
 
         [Parameter()]
         [System.String]
-        $Description
+        $Description,
+
+        [Parameter()]
+        [System.String]
+        $Server
     )
 
     Write-Verbose -Message ($script:localizedData.GettingComputerStateMessage -f $Name)
@@ -112,6 +119,7 @@ function Get-TargetResource
         UnjoinCredential = [ciminstance] $convertToCimUnjoinCredential
         WorkGroupName    = (Get-CimInstance -Class 'Win32_ComputerSystem').Workgroup
         Description      = (Get-CimInstance -Class 'Win32_OperatingSystem').Description
+        Server           = Get-LogonServer
     }
 
     return $returnValue
@@ -142,6 +150,9 @@ function Get-TargetResource
 
     .PARAMETER Description
         The value assigned here will be set as the local computer description.
+
+    .PARAMETER Server
+        The Active Directory Domain Controller to use to join the domain.
 #>
 function Set-TargetResource
 {
@@ -176,7 +187,11 @@ function Set-TargetResource
 
         [Parameter()]
         [System.String]
-        $Description
+        $Description,
+
+        [Parameter()]
+        [System.String]
+        $Server
     )
 
     Write-Verbose -Message ($script:localizedData.SettingComputerStateMessage -f $Name)
@@ -208,71 +223,42 @@ function Set-TargetResource
             }
             else
             {
+                $addComputerParameters = @{
+                    DomainName = $DomainName
+                    Credential = $Credential
+                    Force = $true
+                }
+                $rename = $false
                 if ($Name -ne $env:COMPUTERNAME)
                 {
-                    # Rename the computer, and join it to the domain.
-                    if ($UnjoinCredential)
-                    {
-                        Add-Computer `
-                            -DomainName $DomainName `
-                            -Credential $Credential `
-                            -NewName $Name `
-                            -UnjoinDomainCredential $UnjoinCredential `
-                            -Force
-                    }
-                    else
-                    {
-                        if ($JoinOU)
-                        {
-                            Add-Computer `
-                                -DomainName $DomainName `
-                                -Credential $Credential `
-                                -NewName $Name `
-                                -OUPath $JoinOU `
-                                -Force
-                        }
-                        else
-                        {
-                            Add-Computer `
-                                -DomainName $DomainName `
-                                -Credential $Credential `
-                                -NewName $Name `
-                                -Force
-                        }
-                    }
+                    $addComputerParameters.Add("NewName", $Name)
+                    $rename = $true
+                }
+
+                if ($UnjoinCredential)
+                {
+                    $addComputerParameters.Add("UnjoinDomainCredential", $UnjoinCredential)
+                }
+
+                if ($JoinOU)
+                {
+                    $addComputerParameters.Add("OUPath", $JoinOU)
+                }
+
+                if ($Server)
+                {
+                    $addComputerParameters.Add("Server", $Server)
+                }
+
+                # Rename the computer, and join it to the domain.
+                Add-Computer @addComputerParameters
 
+                if ($rename)
+                {
                     Write-Verbose -Message ($script:localizedData.RenamedComputerAndJoinedDomainMessage -f $Name,$DomainName)
                 }
                 else
                 {
-                    # Same computer name, and join it to the domain.
-                    if ($UnjoinCredential)
-                    {
-                        Add-Computer `
-                            -DomainName $DomainName `
-                            -Credential $Credential `
-                            -UnjoinDomainCredential $UnjoinCredential `
-                            -Force
-                    }
-                    else
-                    {
-                        if ($JoinOU)
-                        {
-                            Add-Computer `
-                                -DomainName $DomainName `
-                                -Credential $Credential `
-                                -OUPath $JoinOU `
-                                -Force
-                        }
-                        else
-                        {
-                            Add-Computer `
-                                -DomainName $DomainName `
-                                -Credential $Credential `
-                                -Force
-                        }
-                    }
-
                     Write-Verbose -Message ($script:localizedData.JoinedDomainMessage -f $DomainName)
                 }
             }
@@ -449,7 +435,11 @@ function Test-TargetResource
 
         [Parameter()]
         [System.String]
-        $Description
+        $Description,
+
+        [Parameter()]
+        [System.String]
+        $Server
     )
 
     Write-Verbose -Message ($script:localizedData.TestingComputerStateMessage -f $Name)
@@ -621,4 +611,18 @@ function Get-ComputerOU
     return $ou
 }
 
+<#
+    .SYNOPSIS
+        Returns the logon server.
+#>
+function Get-LogonServer
+{
+    [CmdletBinding()]
+    [OutputType([System.String])]
+    param()
+
+    $logonserver = $env:LOGONSERVER -replace "\\",""
+    return $logonserver
+}
+
 Export-ModuleMember -Function *-TargetResource

Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.schema.mof

@@ -8,5 +8,6 @@ class MSFT_Computer : OMI_BaseResource
     [Write, Description("Credential to be used to leave a domain."), EmbeddedInstance("MSFT_Credential")] String UnjoinCredential;
     [Write, Description("The name of the workgroup.")] String WorkGroupName;
     [Write, Description("The value assigned here will be set as the local computer description.")] String Description;
+    [Write, Description("The Active Directory Domain Controller to use to join the domain")] String Server;
     [Read, Description("A read-only property that specifies the organizational unit that the computer account is currently in.")] String CurrentOU;
 };