removed delete validation

Author: Youssef-Beltagy

cfn/wrap.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"log"
 	"net/http"
 
@@ -58,11 +57,7 @@ func lambdaWrapWithClient(lambdaFunction CustomResourceFunction, client httpClie
 		if err != nil {
 			r.Status = StatusFailed
 			r.Reason = err.Error()
-			log.Printf("sending status failed: %s", r.Reason)
-		} else if event.RequestType == RequestDelete && event.PhysicalResourceID != r.PhysicalResourceID {
-			r.Status = StatusFailed
-			r.Reason = fmt.Sprintf("DELETE: cannot change the physical resource ID from %s to %s during deletion", event.PhysicalResourceID, r.PhysicalResourceID)
-			log.Printf("sending status failed: %s", r.Reason)
+			log.Printf("sending status failed: %s\n", r.Reason)
 		} else {
 			r.Status = StatusSuccess
 		}

cfn/wrap_test.go

@@ -60,6 +60,13 @@ func TestLambdaPhysicalResourceId(t *testing.T) {
 		// For Delete with returned PhysicalResourceID = old PhysicalResourceID
 		{RequestDelete, nil, "prevPhysicalResourceID", "prevPhysicalResourceID"},
 		{RequestDelete, fmt.Errorf("dummy error"), "prevPhysicalResourceID", "prevPhysicalResourceID"},
+
+		// For Delete with returned PhysicalResourceID != old PhysicalResourceID
+		// Technically, lambda handlers shouldn't return a different physical resource id upon deletion.
+		// Typescript CDK implementation for handlers would return an error here.
+		// But CFn ignores the returned PhysicalResourceID for deletion (if deletion succeeds) so it doesn't matter.
+		{RequestDelete, nil, "newPhysicalResourceID", "newPhysicalResourceID"},
+		{RequestDelete, fmt.Errorf("dummy error"), "newPhysicalResourceID", "newPhysicalResourceID"},
 	}
 	for _, test := range tests {
 
@@ -99,36 +106,6 @@ func TestLambdaPhysicalResourceId(t *testing.T) {
 	}
 }
 
-func TestDeleteFailsWhenPhysicalResourceIDChanges(t *testing.T) {
-
-	curTestEvent := *testEvent
-	curTestEvent.RequestType = RequestDelete
-
-	client := &mockClient{
-		DoFunc: func(req *http.Request) (*http.Response, error) {
-			response := extractResponseBody(t, req)
-
-			// Status should be Failed because the PhysicalResourceID changed
-			assert.Equal(t, StatusFailed, response.Status)
-			assert.Equal(t, curTestEvent.LogicalResourceID, response.LogicalResourceID)
-			assert.Equal(t, "newPhysicalResourceID", response.PhysicalResourceID)
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       nopCloser{bytes.NewBufferString("")},
-			}, nil
-		},
-	}
-
-	fn := func(ctx context.Context, event Event) (physicalResourceID string, data map[string]interface{}, err error) {
-		return "newPhysicalResourceID", nil, nil // No error but a "newPhysicalResourceID" is returned
-	}
-
-	_, err := lambdaWrapWithClient(fn, client)(context.TODO(), curTestEvent)
-	assert.NoError(t, err)
-
-}
-
 func TestPanicSendsFailure(t *testing.T) {
 	didSendStatus := false