Merge pull request hashicorp#5634 from TimeIncOSS/f-resource-not-foun…

…d-err helper/resource: Add more details (Retries) to resource.NotFoundError
stefreak · Jan 23, 2017 · 8fd8f46 · 8fd8f46
2 parents 4fcc301 + 6222b3e
commit 8fd8f46
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/helper/resource/error.go b/helper/resource/error.go
@@ -19,6 +19,10 @@ func (e *NotFoundError) Error() string {
 		return e.Message
 	}
 
+	if e.Retries > 0 {
+		return fmt.Sprintf("couldn't find resource (%d retries)", e.Retries)
+	}
+
 	return "couldn't find resource"
 }
 

diff --git a/helper/resource/state.go b/helper/resource/state.go
@@ -111,6 +111,7 @@ func (conf *StateChangeConf) WaitForState() (interface{}, error) {
 				if notfoundTick > conf.NotFoundChecks {
 					result.Error = &NotFoundError{
 						LastError: err,
+						Retries:   notfoundTick,
 					}
 					lastResult.Store(result)
 					return