From c4bec4a19bca6c976705e4ac24c1cade896fe1ba Mon Sep 17 00:00:00 2001 From: Jesse Whitham Date: Tue, 17 Sep 2019 13:54:39 +1200 Subject: [PATCH 1/5] [BREAKING CHANGE] Clean up CodePipeline Job Implementation * Incorrectly used "CodePipelineEvent" --- events/codepipeline_job.go | 4 ++-- .../{codepipeline_test.go => codepipeline_job_test.go} | 10 +++++----- ...depipline-event.json => codepipline-job-event.json} | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename events/{codepipeline_test.go => codepipeline_job_test.go} (70%) rename events/testdata/{codepipline-event.json => codepipline-job-event.json} (100%) diff --git a/events/codepipeline_job.go b/events/codepipeline_job.go index 68f96344..dd3b8236 100644 --- a/events/codepipeline_job.go +++ b/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"` } diff --git a/events/codepipeline_test.go b/events/codepipeline_job_test.go similarity index 70% rename from events/codepipeline_test.go rename to events/codepipeline_job_test.go index cf7dfed4..8aa8eafd 100644 --- a/events/codepipeline_test.go +++ b/events/codepipeline_job_test.go @@ -10,16 +10,16 @@ import ( "github.com/stretchr/testify/assert" ) -func TestCodePipeLineEventMarshaling(t *testing.T) { +func TestCodePipeLineJobEventMarshaling(t *testing.T) { // read json from file - inputJSON, err := ioutil.ReadFile("./testdata/codepipline-event.json") + inputJSON, err := ioutil.ReadFile("./testdata/codepipline-job-event.json") if err != nil { t.Errorf("could not open test file. details: %v", err) } // de-serialize into CognitoEvent - var inputEvent CodePipelineEvent + var inputEvent CodePipelineJobEvent if err := json.Unmarshal(inputJSON, &inputEvent); err != nil { t.Errorf("could not unmarshal event. details: %v", err) } @@ -33,6 +33,6 @@ func TestCodePipeLineEventMarshaling(t *testing.T) { assert.JSONEq(t, string(inputJSON), string(outputJSON)) } -func TestCodePipelineEventMarshalingMalformedJson(t *testing.T) { - test.TestMalformedJson(t, CodePipelineEvent{}) +func TestCodePipelineJobEventMarshalingMalformedJson(t *testing.T) { + test.TestMalformedJson(t, CodePipelineJobEvent{}) } diff --git a/events/testdata/codepipline-event.json b/events/testdata/codepipline-job-event.json similarity index 100% rename from events/testdata/codepipline-event.json rename to events/testdata/codepipline-job-event.json From fddd182498db4b1cbb49e050acd810b9f673dc74 Mon Sep 17 00:00:00 2001 From: Jesse Whitham Date: Tue, 29 Oct 2019 12:25:23 +1300 Subject: [PATCH 2/5] Fix original typo missed when moving to job --- events/codepipeline_job_test.go | 2 +- .../{codepipline-job-event.json => codepipeline-job-event.json} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename events/testdata/{codepipline-job-event.json => codepipeline-job-event.json} (100%) diff --git a/events/codepipeline_job_test.go b/events/codepipeline_job_test.go index 8aa8eafd..b99c4938 100644 --- a/events/codepipeline_job_test.go +++ b/events/codepipeline_job_test.go @@ -13,7 +13,7 @@ import ( func TestCodePipeLineJobEventMarshaling(t *testing.T) { // read json from file - inputJSON, err := ioutil.ReadFile("./testdata/codepipline-job-event.json") + inputJSON, err := ioutil.ReadFile("./testdata/codepipeline-job-event.json") if err != nil { t.Errorf("could not open test file. details: %v", err) } diff --git a/events/testdata/codepipline-job-event.json b/events/testdata/codepipeline-job-event.json similarity index 100% rename from events/testdata/codepipline-job-event.json rename to events/testdata/codepipeline-job-event.json From 4ef3776ace070604bd5e4f1b3ae2a647bbbef23f Mon Sep 17 00:00:00 2001 From: Jesse Whitham Date: Tue, 20 Jul 2021 11:35:25 +1200 Subject: [PATCH 3/5] Maintain backwards compatibility while making the ambiguity more clear --- events/codepipeline.go | 6 ++++++ events/codepipeline_test.go | 38 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 events/codepipeline.go create mode 100644 events/codepipeline_test.go diff --git a/events/codepipeline.go b/events/codepipeline.go new file mode 100644 index 00000000..239020bc --- /dev/null +++ b/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 \ No newline at end of file diff --git a/events/codepipeline_test.go b/events/codepipeline_test.go new file mode 100644 index 00000000..fd48d61f --- /dev/null +++ b/events/codepipeline_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 TestCodePipeLineJEventMarshaling(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 CognitoEvent + var inputEvent CodePipelineEvent + 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 TestCodePipelineEventMarshalingMalformedJson(t *testing.T) { + test.TestMalformedJson(t, CodePipelineEvent{}) +} From b5793869ab082a5eb90f2069c9d8439a4065178d Mon Sep 17 00:00:00 2001 From: Jesse Whitham Date: Tue, 20 Jul 2021 11:38:23 +1200 Subject: [PATCH 4/5] go fmt --- events/codepipeline.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events/codepipeline.go b/events/codepipeline.go index 239020bc..2134cbb5 100644 --- a/events/codepipeline.go +++ b/events/codepipeline.go @@ -3,4 +3,4 @@ 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 \ No newline at end of file +type CodePipelineEvent = CodePipelineJobEvent From 27541ec5537128bc8950796a4a66446a0bf3ebc3 Mon Sep 17 00:00:00 2001 From: Jesse Whitham Date: Tue, 20 Jul 2021 12:09:05 +1200 Subject: [PATCH 5/5] Fix up a merge issue and stray input --- events/codepipeline_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/events/codepipeline_test.go b/events/codepipeline_test.go index fd48d61f..063ea0b3 100644 --- a/events/codepipeline_test.go +++ b/events/codepipeline_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" ) -func TestCodePipeLineJEventMarshaling(t *testing.T) { +func TestCodePipeLineEventMarshaling(t *testing.T) { // read json from file inputJSON, err := ioutil.ReadFile("./testdata/codepipeline-job-event.json") @@ -18,7 +18,7 @@ func TestCodePipeLineJEventMarshaling(t *testing.T) { t.Errorf("could not open test file. details: %v", err) } - // de-serialize into CognitoEvent + // de-serialize into CodePipelineEvent var inputEvent CodePipelineEvent if err := json.Unmarshal(inputJSON, &inputEvent); err != nil { t.Errorf("could not unmarshal event. details: %v", err)