From 9d3f40a51327bdd01573d061b5e26442fd33df25 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 20 Jul 2016 16:18:40 -0700 Subject: [PATCH] Fix bad message from TimeoutError Before: Error creating IAM Role my-role: timeout while waiting for state to become 'success'. last error: %!s() --- helper/resource/error.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/helper/resource/error.go b/helper/resource/error.go index f13d4c405..d1f6076f9 100644 --- a/helper/resource/error.go +++ b/helper/resource/error.go @@ -44,9 +44,10 @@ type TimeoutError struct { } func (e *TimeoutError) Error() string { - return fmt.Sprintf( - "timeout while waiting for state to become '%s'. last error: %s", - strings.Join(e.ExpectedState, ", "), - e.LastError, - ) + msg := fmt.Sprintf("timeout while waiting for state to become '%s'", + strings.Join(e.ExpectedState, ", ")) + if e.LastError != nil { + msg += fmt.Sprintf(". last error: %s", e.LastError) + } + return msg }