Merge branch 'master' into master

events/codepipeline.go

@@ -0,0 +1,6 @@
+package events
+
+// CodePipelineJob has been incorrectly assigned as CodePipelineEvent
+//  - https://github.com/aws/aws-lambda-go/issues/244
+// This maintains backwards compatability until a v2 release
+type CodePipelineEvent = CodePipelineJobEvent

events/codepipeline_job.go

@@ -2,8 +2,8 @@
 
 package events
 
-// CodePipelineEvent contains data from an event sent from AWS Codepipeline
-type CodePipelineEvent struct {
+// CodePipelineJobEvent contains data from an event sent from AWS CodePipeline
+type CodePipelineJobEvent struct {
 	CodePipelineJob CodePipelineJob `json:"CodePipeline.job"`
 }
 

events/codepipeline_job_test.go

@@ -0,0 +1,38 @@
+// Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+package events
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"testing"
+
+	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCodePipeLineJobEventMarshaling(t *testing.T) {
+
+	// read json from file
+	inputJSON, err := ioutil.ReadFile("./testdata/codepipeline-job-event.json")
+	if err != nil {
+		t.Errorf("could not open test file. details: %v", err)
+	}
+
+	// de-serialize into CodePipelineJobEvent
+	var inputEvent CodePipelineJobEvent
+	if err := json.Unmarshal(inputJSON, &inputEvent); err != nil {
+		t.Errorf("could not unmarshal event. details: %v", err)
+	}
+
+	// serialize to json
+	outputJSON, err := json.Marshal(inputEvent)
+	if err != nil {
+		t.Errorf("could not marshal event. details: %v", err)
+	}
+
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
+}
+
+func TestCodePipelineJobEventMarshalingMalformedJson(t *testing.T) {
+	test.TestMalformedJson(t, CodePipelineJobEvent{})
+}

events/codepipeline_test.go

@@ -13,7 +13,7 @@ import (
 func TestCodePipeLineEventMarshaling(t *testing.T) {
 
 	// read json from file
-	inputJSON, err := ioutil.ReadFile("./testdata/codepipline-event.json")
+	inputJSON, err := ioutil.ReadFile("./testdata/codepipeline-job-event.json")
 	if err != nil {
 		t.Errorf("could not open test file. details: %v", err)
 	}