Use errorcode values from the sdk rather than our own consts (#111)

Author: stilvoid

cfn/callback/callback.go

@@ -116,35 +116,23 @@ func (c *CloudFormationCallbackAdapter) reportProgress(errCode string, operation
 // TranslateErrorCode : Translate the error code into a standard Cloudformation error
 func TranslateErrorCode(errorCode string) string {
 
+	// Ensure the error code conforms to one of the available
 	switch errorCode {
-	case "NotUpdatable":
-		return cloudformation.HandlerErrorCodeNotUpdatable
-	case "InvalidRequest":
-		return cloudformation.HandlerErrorCodeInvalidRequest
-	case "AccessDenied":
-		return cloudformation.HandlerErrorCodeAccessDenied
-	case "InvalidCredentials":
-		return cloudformation.HandlerErrorCodeInvalidCredentials
-	case "AlreadyExists":
-		return cloudformation.HandlerErrorCodeAlreadyExists
-	case "NotFound":
-		return cloudformation.HandlerErrorCodeNotFound
-	case "ResourceConflict":
-		return cloudformation.HandlerErrorCodeResourceConflict
-	case "Throttling":
-		return cloudformation.HandlerErrorCodeThrottling
-	case "ServiceLimitExceeded":
-		return cloudformation.HandlerErrorCodeServiceLimitExceeded
-	case "NotStabilized":
-		return cloudformation.HandlerErrorCodeNotStabilized
-	case "GeneralServiceException":
-		return cloudformation.HandlerErrorCodeGeneralServiceException
-	case "ServiceInternalError":
-		return cloudformation.HandlerErrorCodeServiceInternalError
-	case "NetworkFailure":
-		return cloudformation.HandlerErrorCodeNetworkFailure
-	case "InternalFailure":
-		return cloudformation.HandlerErrorCodeInternalFailure
+	case cloudformation.HandlerErrorCodeNotUpdatable,
+		cloudformation.HandlerErrorCodeInvalidRequest,
+		cloudformation.HandlerErrorCodeAccessDenied,
+		cloudformation.HandlerErrorCodeInvalidCredentials,
+		cloudformation.HandlerErrorCodeAlreadyExists,
+		cloudformation.HandlerErrorCodeNotFound,
+		cloudformation.HandlerErrorCodeResourceConflict,
+		cloudformation.HandlerErrorCodeThrottling,
+		cloudformation.HandlerErrorCodeServiceLimitExceeded,
+		cloudformation.HandlerErrorCodeNotStabilized,
+		cloudformation.HandlerErrorCodeGeneralServiceException,
+		cloudformation.HandlerErrorCodeServiceInternalError,
+		cloudformation.HandlerErrorCodeNetworkFailure,
+		cloudformation.HandlerErrorCodeInternalFailure:
+		return errorCode
 	default:
 		// InternalFailure is CloudFormation's fallback error code when no more specificity is there
 		return cloudformation.HandlerErrorCodeInternalFailure

cfn/callback/callback_notag.go

@@ -83,36 +83,22 @@ func (c *CloudFormationCallbackAdapter) reportProgress(code string, operationSta
 
 // TranslateErrorCode : Translate the error code into a standard Cloudformation error
 func TranslateErrorCode(errorCode string) string {
-
 	switch errorCode {
-	case "NotUpdatable":
-		return cloudformation.HandlerErrorCodeNotUpdatable
-	case "InvalidRequest":
-		return cloudformation.HandlerErrorCodeInvalidRequest
-	case "AccessDenied":
-		return cloudformation.HandlerErrorCodeAccessDenied
-	case "InvalidCredentials":
-		return cloudformation.HandlerErrorCodeInvalidCredentials
-	case "AlreadyExists":
-		return cloudformation.HandlerErrorCodeAlreadyExists
-	case "NotFound":
-		return cloudformation.HandlerErrorCodeNotFound
-	case "ResourceConflict":
-		return cloudformation.HandlerErrorCodeResourceConflict
-	case "Throttling":
-		return cloudformation.HandlerErrorCodeThrottling
-	case "ServiceLimitExceeded":
-		return cloudformation.HandlerErrorCodeServiceLimitExceeded
-	case "NotStabilized":
-		return cloudformation.HandlerErrorCodeNotStabilized
-	case "GeneralServiceException":
-		return cloudformation.HandlerErrorCodeGeneralServiceException
-	case "ServiceInternalError":
-		return cloudformation.HandlerErrorCodeServiceInternalError
-	case "NetworkFailure":
-		return cloudformation.HandlerErrorCodeNetworkFailure
-	case "InternalFailure":
-		return cloudformation.HandlerErrorCodeInternalFailure
+	case cloudformation.HandlerErrorCodeNotUpdatable,
+		cloudformation.HandlerErrorCodeInvalidRequest,
+		cloudformation.HandlerErrorCodeAccessDenied,
+		cloudformation.HandlerErrorCodeInvalidCredentials,
+		cloudformation.HandlerErrorCodeAlreadyExists,
+		cloudformation.HandlerErrorCodeNotFound,
+		cloudformation.HandlerErrorCodeResourceConflict,
+		cloudformation.HandlerErrorCodeThrottling,
+		cloudformation.HandlerErrorCodeServiceLimitExceeded,
+		cloudformation.HandlerErrorCodeNotStabilized,
+		cloudformation.HandlerErrorCodeGeneralServiceException,
+		cloudformation.HandlerErrorCodeServiceInternalError,
+		cloudformation.HandlerErrorCodeNetworkFailure,
+		cloudformation.HandlerErrorCodeInternalFailure:
+		return errorCode
 	default:
 		// InternalFailure is CloudFormation's fallback error code when no more specificity is there
 		return cloudformation.HandlerErrorCodeInternalFailure

cfn/cfn_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/scheduler"
 	"github.com/aws/aws-lambda-go/lambdacontext"
 	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/cloudformation"
 )
 
 func TestReschedule(t *testing.T) {
@@ -188,7 +189,7 @@ func TestMakeEventFunc(t *testing.T) {
 		}, true},
 		{"Test wrap panic", args{&MockHandler{f6}, context.Background(), loadEvent("request.create.json", &event{})}, response{
 			OperationStatus: handler.Failed,
-			ErrorCode:       handler.GeneralServiceException,
+			ErrorCode:       cloudformation.HandlerErrorCodeGeneralServiceException,
 			Message:         "Unable to complete request: error",
 			BearerToken:     "123456",
 		}, false},

cfn/cfnerr/consts.go

@@ -1,6 +1,9 @@
 package handler
 
-import "github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/cfnerr"
+import (
+	"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/cfnerr"
+	"github.com/aws/aws-sdk-go/service/cloudformation"
+)
 
 // ProgressEvent represent the progress of CRUD handlers.
 type ProgressEvent struct {
@@ -9,7 +12,7 @@ type ProgressEvent struct {
 	OperationStatus Status `json:"status,omitempty"`
 
 	// HandlerErrorCode should be provided when OperationStatus is FAILED or IN_PROGRESS.
-	HandlerErrorCode ErrorCode `json:"errorCode,omitempty"`
+	HandlerErrorCode string `json:"errorCode,omitempty"`
 
 	// Message which can be shown to callers to indicate the
 	//nature of a progress transition or callback delay; for example a message
@@ -50,14 +53,14 @@ func NewProgressEvent() ProgressEvent {
 // based on the error passed in.
 func NewFailedEvent(err error) ProgressEvent {
 	cerr := cfnerr.New(
-		cfnerr.GeneralServiceException,
+		cloudformation.HandlerErrorCodeGeneralServiceException,
 		"Unable to complete request: "+err.Error(),
 		err,
 	)
 
 	return ProgressEvent{
 		OperationStatus:  Failed,
 		Message:          cerr.Message(),
-		HandlerErrorCode: GeneralServiceException,
+		HandlerErrorCode: cloudformation.HandlerErrorCodeGeneralServiceException,
 	}
 }

cfn/handler/errs.go

@@ -8,6 +8,7 @@ import (
 	"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/callback"
 	"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/cfnerr"
 	"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/metrics"
+	"github.com/aws/aws-sdk-go/service/cloudformation"
 )
 
 //reportErr is an unexported struct that handles reporting of errors.
@@ -31,7 +32,7 @@ func (r *reportErr) report(event *event, message string, err error, errCode stri
 	m := fmt.Sprintf("Unable to complete request; %s error", message)
 
 	if isMutatingAction(event.Action) && r.publishStatus {
-		if reportErr := r.callbackAdapter.ReportFailureStatus(event.RequestData.ResourceProperties, cfnerr.InternalFailure, err); reportErr != nil {
+		if reportErr := r.callbackAdapter.ReportFailureStatus(event.RequestData.ResourceProperties, cloudformation.HandlerErrorCodeInternalFailure, err); reportErr != nil {
 			log.Printf("Callback report error; Error: %s", reportErr.Error())
 		}
 	}

cfn/handler/event.go

@@ -2,6 +2,7 @@ package cfn
 
 import (
 	"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/handler"
+	"github.com/aws/aws-sdk-go/service/cloudformation"
 )
 
 // response represents a response to the
@@ -23,7 +24,7 @@ type response struct {
 	ResourceModel interface{} `json:"resourceModel,omitempty"`
 
 	// ErrorCode is used to report granular failures back to CloudFormation
-	ErrorCode handler.ErrorCode `json:"errorCode,omitempty"`
+	ErrorCode string `json:"errorCode,omitempty"`
 
 	// BearerToken is used to report progress back to CloudFormation and is
 	//passed back to CloudFormation
@@ -40,7 +41,7 @@ type response struct {
 func newFailedResponse(err error, bearerToken string) response {
 	return response{
 		OperationStatus: handler.Failed,
-		ErrorCode:       handler.InternalFailure,
+		ErrorCode:       cloudformation.HandlerErrorCodeInternalFailure,
 		Message:         err.Error(),
 		BearerToken:     bearerToken,
 	}

cfn/reportErr.go

@@ -3,6 +3,7 @@ package cfn
 import (
 	"testing"
 
+	"github.com/aws/aws-sdk-go/service/cloudformation"
 	"github.com/google/go-cmp/cmp"
 
 	"encoding/json"
@@ -24,7 +25,7 @@ func TestMarshalJSON(t *testing.T) {
 			Name:    encoding.NewString("Douglas"),
 			Version: encoding.NewFloat(42.1),
 		},
-		ErrorCode:   handler.NotUpdatable,
+		ErrorCode:   cloudformation.HandlerErrorCodeNotUpdatable,
 		BearerToken: "xyzzy",
 	}