From e80b6c9eee7ce2b36a7e39eacc5ce55615a175ab Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 13 Apr 2020 15:23:45 -0700
Subject: [PATCH] pkg/destroy/ovirt: Cleanup VM logging

Fixing some of the logging from 05177839ab (ovirt: Implement destroy,
2019-10-28, #1948) to avoid things like:

  $ openshift-install destroy cluster --dir one
  INFO searching VMs by tag=one-6xlb7
  INFO Found %!s(int=3) VMs
  INFO Stopping VM one-6xlb7-master-1 : errors: %s%!(EXTRA <nil>)
  ...

because the final 'err' had no %s in the template string to consume
it.  This commit fixes the two cases which had an 'errors: %s' using
up the final template %s, but leaves a lot of other potential logging
cleanup in this package alone.
---
 pkg/destroy/ovirt/destroyer.go | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkg/destroy/ovirt/destroyer.go b/pkg/destroy/ovirt/destroyer.go
index a2f201c22d2..96d4eb14ef9 100644
--- a/pkg/destroy/ovirt/destroyer.go
+++ b/pkg/destroy/ovirt/destroyer.go
@@ -93,23 +93,27 @@ func (uninstaller *ClusterUninstaller) stopVM(vmsService *ovirtsdk.VmsService, v
 	vmService := vmsService.VmService(vm.MustId())
 	// this is a teardown, stopping instead of shutting down.
 	_, err := vmService.Stop().Send()
-	uninstaller.Logger.Infof("Stopping VM %s : %s", vm.MustName(), "errors: %s", err)
-	if err != nil {
-		uninstaller.Logger.Debugf("Failed stopping VM %s : %s", vm.MustName(), err)
+	if err == nil {
+		uninstaller.Logger.Infof("Stopping VM %s", vm.MustName())
+	} else {
+		uninstaller.Logger.Debugf("Failed to stop VM %s : %s", vm.MustName(), err)
 	}
 	waitForDownDuration := time.Minute * 10
 	err = vmService.Connection().WaitForVM(vm.MustId(), ovirtsdk.VMSTATUS_DOWN, waitForDownDuration)
-	if err != nil {
-		uninstaller.Logger.Warnf("Waiting %d for VM %s to power-off", waitForDownDuration, vm.MustName())
+	if err == nil {
+		uninstaller.Logger.Infof("VM %s powered off", vm.MustName())
+	} else {
+		uninstaller.Logger.Warnf("Waited %d for VM %s to power-off: %s", waitForDownDuration, vm.MustName(), err)
 	}
 }
 
 func (uninstaller *ClusterUninstaller) removeVM(vmsService *ovirtsdk.VmsService, vm *ovirtsdk.Vm) {
 	vmService := vmsService.VmService(vm.MustId())
 	_, err := vmService.Remove().Send()
-	uninstaller.Logger.Infof("Removing VM %s : %s", vm.MustName(), "errors: %s", err)
-	if err != nil {
-		uninstaller.Logger.Debugf("Failed removing VM %s : %s", vm.MustName(), err)
+	if err == nil {
+		uninstaller.Logger.Infof("Removing VM %s", vm.MustName())
+	} else {
+		uninstaller.Logger.Debugf("Failed to remove VM %s : %s", vm.MustName(), err)
 	}
 }