Update noaa errors to wrap error

consumer/async_test.go

@@ -2,6 +2,7 @@ package consumer_test
 
 import (
 	"crypto/tls"
+	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"sync"
@@ -936,7 +937,7 @@ var _ = Describe("Consumer (Asynchronous)", func() {
 })
 
 func BeRetryable() types.GomegaMatcher {
-	return BeAssignableToTypeOf(errors.RetryError("some-error"))
+	return BeAssignableToTypeOf(errors.NewRetryError(fmt.Errorf("some-error")))
 }
 
 func createError(message string) *events.Envelope {

errors/non_retry_error.go

@@ -5,14 +5,18 @@ import "fmt"
 // NonRetryError is a type that noaa uses when it encountered an error,
 // and is not going to retry the operation.  When errors of this type
 // are encountered, they should result in a closed connection.
-type NonRetryError string
+type NonRetryError struct {
+	Err error
+}
 
 // NewNonRetryError constructs a NonRetryError from any error.
 func NewNonRetryError(err error) NonRetryError {
-	return NonRetryError(err.Error())
+	return NonRetryError{
+		Err: err,
+	}
 }
 
 // Error implements error.
 func (e NonRetryError) Error() string {
-	return fmt.Sprintf("Please ask your Cloud Foundry Operator to check the platform configuration: %s", string(e))
+	return fmt.Sprintf("Please ask your Cloud Foundry Operator to check the platform configuration: %s", e.Err.Error())
 }

errors/retry_error.go

@@ -3,14 +3,18 @@ package errors
 // RetryError is a type that noaa uses when it encountered an error,
 // but is going to retry the operation.  When errors of this type
 // are encountered, they should not result in a closed connection.
-type RetryError string
+type RetryError struct {
+	Err error
+}
 
 // NewRetryError constructs a RetryError from any error.
 func NewRetryError(err error) RetryError {
-	return RetryError(err.Error())
+	return RetryError{
+		Err: err,
+	}
 }
 
 // Error implements error.
 func (e RetryError) Error() string {
-	return string(e)
+	return e.Err.Error()
 }