Merge pull request #264 from keptn/feature/2982/keptnspecversion

#2982 added shkeptnspecversion property

pkg/lib/v0_2_0/events.go

@@ -27,6 +27,7 @@ const keptnFinishedEventSuffix = ".finished"
 const keptnInvalidatedEventSuffix = ".invalidated"
 
 const keptnContextCEExtension = "shkeptncontext"
+const keptnSpecVersionCEExtension = "shkeptnspecversion"
 const triggeredIDCEExtension = "triggeredid"
 
 // HTTPEventSender sends CloudEvents via HTTP

pkg/lib/v0_2_0/keptn.go

@@ -173,6 +173,11 @@ func (k *Keptn) createCloudEventWithContextAndPayload(outEventType string, keptn
 	ce.SetExtension(triggeredIDCEExtension, k.CloudEvent.ID())
 	ce.SetSource(source)
 
+	// if available, add the keptnspecversion extension to the CloudEvent context
+	if keptnSpecVersion, err := k.CloudEvent.Context.GetExtension(keptnSpecVersionCEExtension); err == nil && keptnSpecVersion != "" {
+		ce.SetExtension(keptnSpecVersionCEExtension, keptnSpecVersion)
+	}
+
 	var eventData keptn.EventProperties
 	if data != nil {
 		eventData = data

pkg/lib/v0_2_0/keptn_test.go

@@ -117,6 +117,7 @@ func TestKeptn_SendEventConvenienceFunctions(t *testing.T) {
 	inputEvent := cloudevents.NewEvent()
 	inputEvent.SetType(GetTriggeredEventType(EvaluationTaskName))
 	inputEvent.SetExtension(keptnContextCEExtension, "my-context")
+	inputEvent.SetExtension(keptnSpecVersionCEExtension, "0.2.0")
 	inputEvent.SetID("my-triggered-id")
 	inputEvent.SetDataContentType(cloudevents.ApplicationJSON)
 	inputEvent.SetData(cloudevents.ApplicationJSON, &EventData{
@@ -136,10 +137,11 @@ func TestKeptn_SendEventConvenienceFunctions(t *testing.T) {
 		source string
 	}
 	type wantEventProperties struct {
-		eventType    string
-		keptnContext string
-		triggeredID  string
-		eventData    keptn.EventProperties
+		eventType        string
+		keptnContext     string
+		triggeredID      string
+		keptnSpecVersion string
+		eventData        keptn.EventProperties
 	}
 	tests := []struct {
 		name          string
@@ -163,9 +165,10 @@ func TestKeptn_SendEventConvenienceFunctions(t *testing.T) {
 			wantErr:       false,
 			wantEvents: []wantEventProperties{
 				{
-					eventType:    GetStartedEventType(EvaluationTaskName),
-					keptnContext: "my-context",
-					triggeredID:  "my-triggered-id",
+					eventType:        GetStartedEventType(EvaluationTaskName),
+					keptnContext:     "my-context",
+					triggeredID:      "my-triggered-id",
+					keptnSpecVersion: "0.2.0",
 					eventData: &EventData{
 						Project: "my-project",
 						Stage:   "my-stage",
@@ -191,9 +194,10 @@ func TestKeptn_SendEventConvenienceFunctions(t *testing.T) {
 			wantErr:       false,
 			wantEvents: []wantEventProperties{
 				{
-					eventType:    GetStatusChangedEventType(EvaluationTaskName),
-					keptnContext: "my-context",
-					triggeredID:  "my-triggered-id",
+					eventType:        GetStatusChangedEventType(EvaluationTaskName),
+					keptnContext:     "my-context",
+					triggeredID:      "my-triggered-id",
+					keptnSpecVersion: "0.2.0",
 					eventData: &EventData{
 						Project: "my-project",
 						Stage:   "my-stage",
@@ -219,9 +223,10 @@ func TestKeptn_SendEventConvenienceFunctions(t *testing.T) {
 			wantErr:       false,
 			wantEvents: []wantEventProperties{
 				{
-					eventType:    GetFinishedEventType(EvaluationTaskName),
-					keptnContext: "my-context",
-					triggeredID:  "my-triggered-id",
+					eventType:        GetFinishedEventType(EvaluationTaskName),
+					keptnContext:     "my-context",
+					triggeredID:      "my-triggered-id",
+					keptnSpecVersion: "0.2.0",
 					eventData: &EventData{
 						Project: "my-project",
 						Stage:   "my-stage",
@@ -250,9 +255,10 @@ func TestKeptn_SendEventConvenienceFunctions(t *testing.T) {
 			wantErr:       false,
 			wantEvents: []wantEventProperties{
 				{
-					eventType:    GetFinishedEventType(EvaluationTaskName),
-					keptnContext: "my-context",
-					triggeredID:  "my-triggered-id",
+					eventType:        GetFinishedEventType(EvaluationTaskName),
+					keptnContext:     "my-context",
+					triggeredID:      "my-triggered-id",
+					keptnSpecVersion: "0.2.0",
 					eventData: &EventData{
 						Project: "my-project",
 						Stage:   "my-stage",
@@ -353,6 +359,9 @@ func TestKeptn_SendEventConvenienceFunctions(t *testing.T) {
 				keptnContext, err := event.Context.GetExtension(keptnContextCEExtension)
 				assert.Nil(t, err)
 				assert.Equal(t, keptnContext.(string), tt.wantEvents[index].keptnContext)
+				keptnSpecVersion, err := event.Context.GetExtension(keptnSpecVersionCEExtension)
+				assert.Nil(t, err)
+				assert.Equal(t, keptnSpecVersion.(string), tt.wantEvents[index].keptnSpecVersion)
 				data := &EventData{}
 				err = event.DataAs(data)
 				assert.Nil(t, err)

swagger.yaml

@@ -252,6 +252,8 @@ definitions:
     properties: # CloudEvents v0.2 properties (https://raw.githubusercontent.com/cloudevents/spec/v0.2/spec.json#/definitions/event)
       shkeptncontext:
         type: string
+      shkeptnspecversion:
+        type: string
       triggeredid:
         type: string
       specversion: