Improve Windows Update Completion Handling with Extended Validation and Optional Reboot Delay

README.md

@@ -64,6 +64,8 @@ build {
       "include:$true",
     ]
     update_limit = 25
+    reboot_delay = 900
+    use_extended_validation = true
   }
 }
 ```
@@ -72,6 +74,10 @@ build {
 
 **NB** If the `update_limit` attribute is not declared, it defaults to `1000`.
 
+**NB** If the `reboot_delay` attribute is not declared, it defaults to `0`.  reboot_delay is in seconds.  It delays reboots after windows updates have completed.
+
+**NB** If the `use_extended_validation` attribute is not declared, it defaults to 'false'.  use_extended_validation accepts boolean values (true/false).  If set to true, windows update completion is validated by either the exiting of the windows installer process or event logs / CBS logs that validate the completion.  Some Windows updates complete, but do not exit the TiWorker.exe process to validate the completion.  This parameter handles those types of scenarios, ensuring this windows update module finalizes successfully.
+
 The general filter syntax is:
 
     ACTION:EXPRESSION

update/provisioner.go

@@ -63,6 +63,14 @@ type Config struct {
 	// Adds a limit to how many updates are installed at a time
 	UpdateLimit int `mapstructure:"update_limit"`
 
+	// Adds the ability to delay the reboot command after updates are installed
+	// Default is 0 seconds
+	RebootDelay int `mapstructure:"reboot_delay"`
+
+	// Adds the ability to use additional logs for validation of windows installations
+	// Default is false
+	UseExtendedValidation bool `mapstructure:"use_extended_validation"`
+
 	// Max times the provisioner will try install the updates
 	// in case of failure.
 	UpdateMaxRetries int `mapstructure:"update_max_retries"`
@@ -322,15 +330,23 @@ func (p *Provisioner) retryable(ctx context.Context, f func(ctx context.Context)
 }
 
 func (p *Provisioner) windowsUpdateCommand() string {
+	// Build the inner PowerShell command
+	innerCmd := fmt.Sprintf(
+		"%s%s%s -UpdateLimit %d -RebootDelay %d",
+		windowsUpdatePath,
+		searchCriteriaArgument(p.config.SearchCriteria),
+		filtersArgument(p.config.Filters),
+		p.config.UpdateLimit,
+		p.config.RebootDelay)
+
+	// If UseExtendedValidation was requested, add it to the inner command
+	if p.config.UseExtendedValidation {
+		innerCmd += " -UseExtendedValidation"
+	}
+
 	return fmt.Sprintf(
 		"PowerShell -ExecutionPolicy Bypass -OutputFormat Text -EncodedCommand %s",
-		base64.StdEncoding.EncodeToString(
-			encodeUtf16Le(fmt.Sprintf(
-				"%s%s%s -UpdateLimit %d",
-				windowsUpdatePath,
-				searchCriteriaArgument(p.config.SearchCriteria),
-				filtersArgument(p.config.Filters),
-				p.config.UpdateLimit))))
+		base64.StdEncoding.EncodeToString(encodeUtf16Le(innerCmd)))
 }
 
 func (p *Provisioner) windowsUpdateCheckForRebootRequiredCommand() string {
@@ -389,4 +405,4 @@ func escapePowerShellString(value string) string {
 		"'%s'",
 		// escape single quotes with another single quote.
 		strings.ReplaceAll(value, "'", "''"))
-}
+}