Remove test endpoint (#172)

Author: brianterry

cfn/cfn.go

@@ -69,17 +69,8 @@ func Start(h Handler) {
 		}
 	}()
 
-	// MODE is an environment variable that is set ONLY
-	// when contract test are performed.
-	mode, _ := os.LookupEnv("MODE")
-
-	if mode == "Test" {
-		log.Printf("Handler starting in test mode")
-		lambda.Start(makeTestEventFunc(h))
-	} else {
-		log.Printf("Handler starting")
-		lambda.Start(makeEventFunc(h))
-	}
+	log.Printf("Handler starting")
+	lambda.Start(makeEventFunc(h))
 
 	log.Printf("Handler finished")
 }
@@ -90,10 +81,6 @@ type tags map[string]string
 // eventFunc is the function signature required to execute an event from the Lambda SDK
 type eventFunc func(ctx context.Context, event *event) (response, error)
 
-// testEventFunc is the function signature required to execute an event from the Lambda SDK
-// and is only used in contract testing
-type testEventFunc func(ctx context.Context, event *testEvent) (handler.ProgressEvent, error)
-
 // handlerFunc is the signature required for all actions
 type handlerFunc func(request handler.Request) handler.ProgressEvent
 
@@ -189,34 +176,6 @@ func router(a string, h Handler) (handlerFunc, error) {
 	}
 }
 
-// MakeTestEventFunc is the entry point that allows the CLI's
-// contract testing framework to invoke the resource's CRUDL handlers.
-func makeTestEventFunc(h Handler) testEventFunc {
-	return func(ctx context.Context, event *testEvent) (handler.ProgressEvent, error) {
-		handlerFn, err := router(event.Action, h)
-		if err != nil {
-			return handler.NewFailedEvent(err), err
-		}
-		rctx := handler.RequestContext{
-			Region:     event.Request.Region,
-			AccountID:  event.Request.AWSAccountID,
-			StackTags:  event.Request.DesiredResourceTags,
-			SystemTags: event.Request.SystemTags,
-			NextToken:  event.Request.NextToken,
-		}
-		request := handler.NewRequest(
-			event.Request.LogicalResourceIdentifier,
-			event.CallbackContext,
-			rctx,
-			credentials.SessionFromCredentialsProvider(&event.Credentials),
-			event.Request.PreviousResourceState,
-			event.Request.DesiredResourceState,
-		)
-		progEvt := handlerFn(request)
-		return progEvt, nil
-	}
-}
-
 // Invoke handles the invocation of the handerFn.
 func invoke(handlerFn handlerFunc, request handler.Request, metricsPublisher *metrics.Publisher, action string) handler.ProgressEvent {
 

cfn/cfn_test.go

@@ -142,91 +142,6 @@ func loadEvent(path string, evt *event) *event {
 	return evt
 }
 
-func TestMakeTestEventFunc(t *testing.T) {
-	start := time.Now()
-	future := start.Add(time.Minute * 15)
-
-	tc, cancel := context.WithDeadline(context.Background(), future)
-
-	defer cancel()
-
-	lc := lambdacontext.NewContext(tc, &lambdacontext.LambdaContext{})
-
-	f1 := func(callback map[string]interface{}, s *session.Session) handler.ProgressEvent {
-		response := handler.ProgressEvent{
-			OperationStatus: handler.Success,
-			Message:         "Create complete",
-		}
-		return response
-	}
-
-	type args struct {
-		h     Handler
-		ctx   context.Context
-		event *testEvent
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    handler.ProgressEvent
-		wantErr bool
-	}{
-		{"Test simple CREATE", args{&MockHandler{f1}, lc, loadTestEvent("test.create.json", &testEvent{})}, handler.ProgressEvent{
-			OperationStatus: handler.Success,
-			Message:         "Create complete",
-		}, false},
-		{"Test simple READ", args{&MockHandler{f1}, lc, loadTestEvent("test.read.json", &testEvent{})}, handler.ProgressEvent{
-			OperationStatus: handler.Success,
-			Message:         "Create complete",
-		}, false},
-		{"Test simple DELETE", args{&MockHandler{f1}, lc, loadTestEvent("test.delete.json", &testEvent{})}, handler.ProgressEvent{
-			OperationStatus: handler.Success,
-			Message:         "Create complete",
-		}, false},
-		{"Test simple INVALID", args{&MockHandler{f1}, lc, loadTestEvent("test.INVALID.json", &testEvent{})}, handler.ProgressEvent{
-			OperationStatus: handler.Failed,
-			Message:         "InvalidRequest: No action/invalid action specified",
-		}, true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := makeTestEventFunc(tt.args.h)
-			got, err := f(tt.args.ctx, tt.args.event)
-
-			if (err != nil) != tt.wantErr {
-				t.Errorf("makeEventFunc() = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-
-			switch tt.wantErr {
-			case true:
-				if tt.want.OperationStatus != got.OperationStatus {
-					t.Errorf("response = %v; want %v", got.OperationStatus, tt.want.OperationStatus)
-				}
-
-			case false:
-				if !reflect.DeepEqual(tt.want, got) {
-					t.Errorf("response = %v; want %v", got, tt.want)
-				}
-
-			}
-		})
-	}
-}
-
-//loadEvent is a helper function that unmarshal the event from a file.
-func loadTestEvent(path string, evt *testEvent) *testEvent {
-	validevent, err := openFixture(path)
-	if err != nil {
-		log.Fatalf("Unable to read fixture: %v", err)
-	}
-
-	if err := json.Unmarshal(validevent, evt); err != nil {
-		log.Fatalf("Marshaling error with event: %v", err)
-	}
-	return evt
-}
-
 func TestMakeEventFuncModel(t *testing.T) {
 	start := time.Now()
 	future := start.Add(time.Minute * 15)

cfn/event.go

@@ -16,7 +16,7 @@ type event struct {
 	BearerToken         string                 `json:"bearerToken" validate:"nonzero"`
 	Region              string                 `json:"region" validate:"nonzero"`
 	Action              string                 `json:"action"`
-	ResourceType        string                 `json:"resourceType" validate:"nonzero"`
+	ResourceType        string                 `json:"resourceType"`
 	ResourceTypeVersion encoding.Float         `json:"resourceTypeVersion"`
 	CallbackContext     map[string]interface{} `json:"callbackContext,omitempty"`
 	RequestData         requestData            `json:"requestData"`
@@ -48,15 +48,6 @@ func validateEvent(event *event) error {
 	return nil
 }
 
-// testEvent base structure, it will be internal to the RPDK.
-type testEvent struct {
-	Action          string                                        `json:"action"`
-	Credentials     credentials.CloudFormationCredentialsProvider `json:"credentials"`
-	CallbackContext map[string]interface{}                        `json:"callbackContext"`
-
-	Request resourceHandlerRequest
-}
-
 // resourceHandlerRequest is internal to the RPDK. It contains a number of fields that are for
 // internal contract testing use only.
 type resourceHandlerRequest struct {

cfn/metrics/noop_publisher.go

@@ -2,7 +2,6 @@ package metrics
 
 import (
 	"log"
-	"strings"
 
 	"github.com/aws-cloudformation/cloudformation-cli-go-plugin/cfn/logging"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
@@ -21,13 +20,6 @@ type noopCloudWatchClient struct {
 }
 
 func (n *noopCloudWatchClient) PutMetricData(input *cloudwatch.PutMetricDataInput) (*cloudwatch.PutMetricDataOutput, error) {
-	datum := []string{}
-	for _, v := range input.MetricData {
-		datum = append(datum, v.GoString())
-	}
-
-	n.logger.Printf("Namespace: %s, Datums: %s", *input.Namespace, strings.Join(datum, " :: "))
-
 	// out implementation doesn't care about the response
 	return nil, nil
 }