Get-WmiObject - Invalid class "Win32_Service" - Workaround (#33322)

* Get-WmiObject - Invalid class "Win32_Service" - Workaround * try/catch replace + changelog documentation * Changelog fix Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co> Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
elastic · Nov 3, 2022 · 4e58e31 · 4e58e31
1 parent 82cb594
commit 4e58e31
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -43,6 +43,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 - Fix concurrent map writes when system/process code called from reporter code {pull}32491[32491]
 - Fix in AWS related services initialisation relying on custom endpoint resolver. {issue}32888[32888] {pull}32921[32921]
 - Keep `orchestrator.cluster.name` if `kubeconfig` is not returned in GKE metadata. {pull}33418[33418]
+- Fix Windows service install/uninstall when Win32_Service returns error, add logic to wait until the Windows Service is stopped before proceeding. {pull}33322[33322]
 - Support for multiline zookeeper logs {issue}2496[2496]
 
 *Auditbeat*

diff --git a/dev-tools/packaging/templates/windows/install-service.ps1.tmpl b/dev-tools/packaging/templates/windows/install-service.ps1.tmpl
@@ -1,9 +1,9 @@
 # Delete and stop the service if it already exists.
 if (Get-Service {{.BeatName}} -ErrorAction SilentlyContinue) {
-  $service = Get-WmiObject -Class Win32_Service -Filter "name='{{.BeatName}}'"
-  $service.StopService()
+  Stop-Service {{.BeatName}}
+  (Get-Service {{.BeatName}}).WaitForStatus('Stopped')
   Start-Sleep -s 1
-  $service.delete()
+  sc.exe delete {{.BeatName}}
 }
 
 $workdir = Split-Path $MyInvocation.MyCommand.Path

diff --git a/dev-tools/packaging/templates/windows/uninstall-service.ps1.tmpl b/dev-tools/packaging/templates/windows/uninstall-service.ps1.tmpl
@@ -1,7 +1,7 @@
 # Delete and stop the service if it already exists.
 if (Get-Service {{.BeatName}} -ErrorAction SilentlyContinue) {
-  $service = Get-WmiObject -Class Win32_Service -Filter "name='{{.BeatName}}'"
-  $service.StopService()
+  Stop-Service {{.BeatName}}
+  (Get-Service {{.BeatName}}).WaitForStatus('Stopped')
   Start-Sleep -s 1
-  $service.delete()
+  sc.exe delete {{.BeatName}}
 }