Adding Options parameter to Computer resource

CHANGELOG.md

@@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Computer
+  - Support Options Parameter for domain join - Fixes [Issue #234](https://github.com/dsccommunity/ComputerManagementDsc/issues/234).
+
 ## [8.5.0] - 2021-09-13
 
 ### Added

source/DSCResources/DSC_Computer/DSC_Computer.psm1

@@ -84,7 +84,11 @@ function Get-TargetResource
 
         [Parameter()]
         [System.String]
-        $Server
+        $Server,
+
+        [Parameter()]
+        [System.String()]
+        $Options
     )
 
     Write-Verbose -Message ($script:localizedData.GettingComputerStateMessage -f $Name)
@@ -188,7 +192,11 @@ function Set-TargetResource
 
         [Parameter()]
         [System.String]
-        $Server
+        $Server,
+
+        [Parameter()]
+        [System.String()]
+        $Options
     )
 
     Write-Verbose -Message ($script:localizedData.SettingComputerStateMessage -f $Name)
@@ -247,6 +255,30 @@ function Set-TargetResource
                     $addComputerParameters.Add("Server", $Server)
                 }
 
+                if (-not [System.String]::IsNullOrEmpty($Options)){
+                    <#
+                        See https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.management/add-computer?view=powershell-5.1#parameters for available options and their description
+                    #>
+                    $joinOptions = New-Object System.Collections.Generic.List[string]
+                    $available_options = @("AccountCreate","Win9XUpgrade","UnsecuredJoin","PasswordPass","JoinWithNewName","JoinReadOnly","InstallInvoke")
+                    foreach ($option in $Options) {
+                        if ($option -in $available_options) {
+                            if ($option -eq 'PasswordPass') {
+                                if ('UnsecuredJoin' -in $Options) {
+                                    # PasswordPass must be used in conjunction with UnsecuredJoin
+                                    if ([System.String]::IsNullOrEmpty($Credential.UserName)){
+                                        $joinOptions.Add($option)
+                                    }
+                                } else {
+                                    New-InvalidOperationException -Message "PasswordPass is valid only when teh UnsecuredJoin option is specified"
+                                }
+                            }
+                            $joinOptions.Add($option)
+                        }
+                    }
+                    $addComputerParameters.Add("Options", $joinOptions)
+                }
+
                 # Rename the computer, and join it to the domain.
                 try
                 {
@@ -461,7 +493,11 @@ function Test-TargetResource
 
         [Parameter()]
         [System.String]
-        $Server
+        $Server,
+
+        [Parameter()]
+        [System.String()]
+        $Options
     )
 
     Write-Verbose -Message ($script:localizedData.TestingComputerStateMessage -f $Name)

source/DSCResources/DSC_Computer/DSC_Computer.schema.mof

@@ -9,5 +9,7 @@ class DSC_Computer : OMI_BaseResource
     [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;
+    [Write, Description("Specifies advanced options for the Add-Computer join operation")] String Options;
     [Read, Description("A read-only property that specifies the organizational unit that the computer account is currently in.")] String CurrentOU;
 };
+