From f2b09794e4c36b90b11234717d2c1b1415c9953f Mon Sep 17 00:00:00 2001
From: niusmallnan <niusmallnan@gmail.com>
Date: Mon, 30 Jul 2018 17:40:58 +0800
Subject: [PATCH] Fix error format in cloudinit

---
 config/cloudinit/datasource/configdrive/configdrive.go  | 2 +-
 config/cloudinit/datasource/file/file.go                | 2 +-
 config/cloudinit/datasource/metadata/metadata.go        | 4 ++--
 config/cloudinit/datasource/proccmdline/proc_cmdline.go | 2 +-
 config/cloudinit/datasource/url/url.go                  | 2 +-
 config/cloudinit/datasource/vmware/vmware.go            | 2 +-
 config/cloudinit/datasource/waagent/waagent.go          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/cloudinit/datasource/configdrive/configdrive.go b/config/cloudinit/datasource/configdrive/configdrive.go
index fa6ce056..a42b197e 100644
--- a/config/cloudinit/datasource/configdrive/configdrive.go
+++ b/config/cloudinit/datasource/configdrive/configdrive.go
@@ -70,7 +70,7 @@ func (cd *ConfigDrive) Finish() error {
 
 func (cd *ConfigDrive) String() string {
 	if cd.lastError != nil {
-		return fmt.Sprintf("%s: %s (lastError: %s)", cd.Type(), cd.root, cd.lastError)
+		return fmt.Sprintf("%s: %s (lastError: %v)", cd.Type(), cd.root, cd.lastError)
 	}
 	return fmt.Sprintf("%s: %s", cd.Type(), cd.root)
 }
diff --git a/config/cloudinit/datasource/file/file.go b/config/cloudinit/datasource/file/file.go
index 9478c7f7..43d8aa38 100644
--- a/config/cloudinit/datasource/file/file.go
+++ b/config/cloudinit/datasource/file/file.go
@@ -41,7 +41,7 @@ func (f *LocalFile) Finish() error {
 }
 
 func (f *LocalFile) String() string {
-	return fmt.Sprintf("%s: %s (lastError: %s)", f.Type(), f.path, f.lastError)
+	return fmt.Sprintf("%s: %s (lastError: %v)", f.Type(), f.path, f.lastError)
 }
 
 func (f *LocalFile) AvailabilityChanges() bool {
diff --git a/config/cloudinit/datasource/metadata/metadata.go b/config/cloudinit/datasource/metadata/metadata.go
index 6a5fd152..023d6d20 100644
--- a/config/cloudinit/datasource/metadata/metadata.go
+++ b/config/cloudinit/datasource/metadata/metadata.go
@@ -53,7 +53,7 @@ func (ms Service) IsAvailable() bool {
 	checkURL := ms.Root + ms.IsAvailableCheckPath
 	_, ms.lastError = ms.Client.Get(checkURL)
 	if ms.lastError != nil {
-		log.Errorf("%s: %s (lastError: %s)", "IsAvailable", checkURL, ms.lastError)
+		log.Errorf("%s: %s (lastError: %v)", "IsAvailable", checkURL, ms.lastError)
 	}
 	return (ms.lastError == nil)
 }
@@ -63,7 +63,7 @@ func (ms *Service) Finish() error {
 }
 
 func (ms *Service) String() string {
-	return fmt.Sprintf("%s: %s (lastError: %s)", "metadata", ms.UserdataURL(), ms.lastError)
+	return fmt.Sprintf("%s: %s (lastError: %v)", "metadata", ms.UserdataURL(), ms.lastError)
 }
 
 func (ms Service) AvailabilityChanges() bool {
diff --git a/config/cloudinit/datasource/proccmdline/proc_cmdline.go b/config/cloudinit/datasource/proccmdline/proc_cmdline.go
index 805b2a94..cc7cd4bb 100644
--- a/config/cloudinit/datasource/proccmdline/proc_cmdline.go
+++ b/config/cloudinit/datasource/proccmdline/proc_cmdline.go
@@ -57,7 +57,7 @@ func (c *ProcCmdline) Finish() error {
 }
 
 func (c *ProcCmdline) String() string {
-	return fmt.Sprintf("%s: %s (lastError: %s)", c.Type(), c.Location, c.lastError)
+	return fmt.Sprintf("%s: %s (lastError: %v)", c.Type(), c.Location, c.lastError)
 }
 
 func (c *ProcCmdline) AvailabilityChanges() bool {
diff --git a/config/cloudinit/datasource/url/url.go b/config/cloudinit/datasource/url/url.go
index 8535bf93..9ee62a24 100644
--- a/config/cloudinit/datasource/url/url.go
+++ b/config/cloudinit/datasource/url/url.go
@@ -43,7 +43,7 @@ func (f *RemoteFile) Finish() error {
 }
 
 func (f *RemoteFile) String() string {
-	return fmt.Sprintf("%s: %s (lastError: %s)", f.Type(), f.url, f.lastError)
+	return fmt.Sprintf("%s: %s (lastError: %v)", f.Type(), f.url, f.lastError)
 }
 
 func (f *RemoteFile) AvailabilityChanges() bool {
diff --git a/config/cloudinit/datasource/vmware/vmware.go b/config/cloudinit/datasource/vmware/vmware.go
index 80c50eb4..e5eb1206 100644
--- a/config/cloudinit/datasource/vmware/vmware.go
+++ b/config/cloudinit/datasource/vmware/vmware.go
@@ -40,7 +40,7 @@ func (v VMWare) Finish() error {
 }
 
 func (v VMWare) String() string {
-	return fmt.Sprintf("%s: %s (lastError: %s)", v.Type(), v.ovfFileName, v.lastError)
+	return fmt.Sprintf("%s: %s (lastError: %v)", v.Type(), v.ovfFileName, v.lastError)
 }
 
 func (v VMWare) AvailabilityChanges() bool {
diff --git a/config/cloudinit/datasource/waagent/waagent.go b/config/cloudinit/datasource/waagent/waagent.go
index da481327..bd04599c 100644
--- a/config/cloudinit/datasource/waagent/waagent.go
+++ b/config/cloudinit/datasource/waagent/waagent.go
@@ -47,7 +47,7 @@ func (a *Waagent) Finish() error {
 }
 
 func (a *Waagent) String() string {
-	return fmt.Sprintf("%s: %s (lastError: %s)", a.Type(), a.root, a.lastError)
+	return fmt.Sprintf("%s: %s (lastError: %v)", a.Type(), a.root, a.lastError)
 }
 
 func (a *Waagent) AvailabilityChanges() bool {