Type configuation (#208)

* add type config template

Author: brianterry

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
   rev: stable
   hooks:
   - id: black
-- repo: git://github.com/dnephin/pre-commit-golang
+- repo: https://github.com/dnephin/pre-commit-golang
   rev: master
   hooks:
     - id: go-fmt

cfn/callback/callback.go

@@ -1,3 +1,4 @@
+//go:build callback
 // +build callback
 
 /*
@@ -59,7 +60,7 @@ func (c *CloudFormationCallbackAdapter) ReportInitialStatus() error {
 	return nil
 }
 
-//ReportFailureStatus reports the failure status back to the Cloudformation service.
+// ReportFailureStatus reports the failure status back to the Cloudformation service.
 func (c *CloudFormationCallbackAdapter) ReportFailureStatus(model []byte, errCode string, handlerError error) error {
 	if err := c.reportProgress(errCode, Failed, InProgress, model, handlerError.Error()); err != nil {
 		return err

cfn/callback/callback_notag.go

@@ -1,3 +1,4 @@
+//go:build !callback
 // +build !callback
 
 package callback

cfn/callback/status.go

@@ -1,6 +1,6 @@
 package callback
 
-//Status represents the status of the handler during invocation.
+// Status represents the status of the handler during invocation.
 type Status string
 
 const (

cfn/cfn.go

@@ -130,6 +130,7 @@ func makeEventFunc(h Handler) eventFunc {
 			credentials.SessionFromCredentialsProvider(&event.RequestData.CallerCredentials),
 			event.RequestData.PreviousResourceProperties,
 			event.RequestData.ResourceProperties,
+			event.RequestData.TypeConfiguration,
 		)
 		p := invoke(handlerFn, request, m, event.Action)
 		r, err := newResponse(&p, event.BearerToken)

cfn/cfn_test.go

@@ -129,7 +129,7 @@ func TestMakeEventFunc(t *testing.T) {
 	}
 }
 
-//loadEvent is a helper function that unmarshal the event from a file.
+// loadEvent is a helper function that unmarshal the event from a file.
 func loadEvent(path string, evt *event) *event {
 	validevent, err := openFixture(path)
 	if err != nil {

cfn/event.go

@@ -36,6 +36,7 @@ type requestData struct {
 	ProviderLogGroupName       string                                        `json:"providerLogGroupName"`
 	StackTags                  tags                                          `json:"stackTags"`
 	SystemTags                 tags                                          `json:"systemTags"`
+	TypeConfiguration          json.RawMessage                               `json:"typeConfiguration"`
 }
 
 // validateEvent ensures the event struct generated from the Lambda SDK is correct

cfn/handler/handler_test.go

@@ -17,7 +17,7 @@ func TestNewRequest(t *testing.T) {
 		prev := Props{}
 		curr := Props{}
 
-		req := NewRequest("foo", nil, rctx, nil, []byte(`{"color": "red"}`), []byte(`{"color": "green"}`))
+		req := NewRequest("foo", nil, rctx, nil, []byte(`{"color": "red"}`), []byte(`{"color": "green"}`), nil)
 
 		if err := req.UnmarshalPrevious(&prev); err != nil {
 			t.Fatalf("Unable to unmarshal props: %v", err)
@@ -43,7 +43,7 @@ func TestNewRequest(t *testing.T) {
 
 	t.Run("ResourceProps", func(t *testing.T) {
 		t.Run("Invalid Body", func(t *testing.T) {
-			req := NewRequest("foo", nil, rctx, nil, []byte(``), []byte(``))
+			req := NewRequest("foo", nil, rctx, nil, []byte(``), []byte(``), nil)
 
 			invalid := struct {
 				Color *int `json:"color"`
@@ -61,7 +61,7 @@ func TestNewRequest(t *testing.T) {
 		})
 
 		t.Run("Invalid Marshal", func(t *testing.T) {
-			req := NewRequest("foo", nil, rctx, nil, []byte(`{"color": "ref"}`), []byte(`---BAD JSON---`))
+			req := NewRequest("foo", nil, rctx, nil, []byte(`{"color": "ref"}`), []byte(`---BAD JSON---`), nil)
 
 			var invalid Props
 
@@ -79,7 +79,7 @@ func TestNewRequest(t *testing.T) {
 
 	t.Run("PreviousResourceProps", func(t *testing.T) {
 		t.Run("Invalid Marshal", func(t *testing.T) {
-			req := NewRequest("foo", nil, rctx, nil, []byte(`---BAD JSON---`), []byte(`{"color": "green"}`))
+			req := NewRequest("foo", nil, rctx, nil, []byte(`---BAD JSON---`), []byte(`{"color": "green"}`), nil)
 
 			var invalid Props
 

cfn/handler/request.go

@@ -36,6 +36,7 @@ type Request struct {
 
 	previousResourcePropertiesBody []byte
 	resourcePropertiesBody         []byte
+	typeConfigurationBody          []byte
 }
 
 // RequestContext represents information about the current
@@ -61,14 +62,15 @@ type RequestContext struct {
 }
 
 // NewRequest returns a new Request based on the provided parameters
-func NewRequest(id string, ctx map[string]interface{}, requestCTX RequestContext, sess *session.Session, previousBody, body []byte) Request {
+func NewRequest(id string, ctx map[string]interface{}, requestCTX RequestContext, sess *session.Session, previousBody, body, typeConfig []byte) Request {
 	return Request{
 		LogicalResourceID:              id,
 		CallbackContext:                ctx,
 		Session:                        sess,
 		previousResourcePropertiesBody: previousBody,
 		resourcePropertiesBody:         body,
 		RequestContext:                 requestCTX,
+		typeConfigurationBody:          typeConfig,
 	}
 }
 
@@ -99,3 +101,17 @@ func (r *Request) Unmarshal(v interface{}) error {
 
 	return nil
 }
+
+// UnmarshalTypeConfig populates the provided interface
+// with the current properties of the model
+func (r *Request) UnmarshalTypeConfig(v interface{}) error {
+	if len(r.typeConfigurationBody) == 0 {
+		return cfnerr.New(bodyEmptyError, "Type Config is empty", nil)
+	}
+
+	if err := encoding.Unmarshal(r.typeConfigurationBody, v); err != nil {
+		return cfnerr.New(marshalingError, "Unable to convert type", err)
+	}
+
+	return nil
+}

cfn/handler/status.go

@@ -1,6 +1,6 @@
 package handler
 
-//Status represents the status of the handler.
+// Status represents the status of the handler.
 type Status string
 
 const (