feat: Add --git-commit-id flag to CLI (#401)

Signed-off-by: odubajDT <[email protected]>
keptn · Feb 23, 2022 · 45c145b · 45c145b
1 parent 9083494
commit 45c145b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/pkg/api/models/evaluation.go b/pkg/api/models/evaluation.go
@@ -15,6 +15,9 @@ type Evaluation struct {
 
 	// Evaluation end timestamp
 	End string `json:"end,omitempty"`
+
+	// Evaluation commit ID context
+	GitCommitID string `json:"gitcommitid,omitempty"`
 }
 
 // ToJSON converts object to JSON string

diff --git a/pkg/api/models/keptn_context_extended_c_e.go b/pkg/api/models/keptn_context_extended_c_e.go
@@ -44,7 +44,7 @@ type KeptnContextExtendedCE struct {
 	Triggeredid string `json:"triggeredid,omitempty"`
 
 	// gitcommitid
-	Gitcommitid string `json:"gitcommitid,omitempty"`
+	GitCommitID string `json:"gitcommitid,omitempty"`
 
 	// type
 	// Required: true

diff --git a/pkg/api/models/keptn_context_extended_c_e_test.go b/pkg/api/models/keptn_context_extended_c_e_test.go
@@ -25,7 +25,7 @@ func TestKeptnContextExtendedCE_Validate(t *testing.T) {
 		Specversion        string
 		Time               time.Time
 		Triggeredid        string
-		Gitcommitid        string
+		GitCommitID        string
 		Type               *string
 	}
 	tests := []struct {
@@ -93,7 +93,7 @@ func TestKeptnContextExtendedCE_Validate(t *testing.T) {
 				Specversion:        tt.fields.Specversion,
 				Time:               tt.fields.Time,
 				Triggeredid:        tt.fields.Triggeredid,
-				Gitcommitid:        tt.fields.Gitcommitid,
+				GitCommitID:        tt.fields.GitCommitID,
 				Type:               tt.fields.Type,
 			}
 			if err := ce.Validate(); (err != nil) != tt.wantErr {

diff --git a/pkg/lib/v0_2_0/events.go b/pkg/lib/v0_2_0/events.go
@@ -284,10 +284,11 @@ func IsTriggeredEventType(eventType string) bool {
 
 // EventData contains mandatory fields of all Keptn CloudEvents
 type EventData struct {
-	Project string            `json:"project,omitempty"`
-	Stage   string            `json:"stage,omitempty"`
-	Service string            `json:"service,omitempty"`
-	Labels  map[string]string `json:"labels,omitempty"`
+	Project     string            `json:"project,omitempty"`
+	Stage       string            `json:"stage,omitempty"`
+	Service     string            `json:"service,omitempty"`
+	Labels      map[string]string `json:"labels,omitempty"`
+	GitCommitID string            `json:"gitcommitid,omitempty"`
 
 	Status  StatusType `json:"status,omitempty" jsonschema:"enum=succeeded,enum=errored,enum=unknown"`
 	Result  ResultType `json:"result,omitempty" jsonschema:"enum=pass,enum=warning,enum=fail"`
@@ -398,7 +399,7 @@ func (eb *KeptnEventBuilder) WithTriggeredID(triggeredID string) *KeptnEventBuil
 
 // WithGitCommitID can be used to set the git commit ID
 func (eb *KeptnEventBuilder) WithGitCommitID(gitCommitID string) *KeptnEventBuilder {
-	eb.Gitcommitid = gitCommitID
+	eb.GitCommitID = gitCommitID
 	return eb
 }
 
@@ -419,7 +420,7 @@ func ToCloudEvent(keptnEvent models.KeptnContextExtendedCE) cloudevents.Event {
 	event.SetData(cloudevents.ApplicationJSON, keptnEvent.Data)
 	event.SetExtension(keptnContextCEExtension, keptnEvent.Shkeptncontext)
 	event.SetExtension(triggeredIDCEExtension, keptnEvent.Triggeredid)
-	event.SetExtension(keptnGitCommitIDCEExtension, keptnEvent.Gitcommitid)
+	event.SetExtension(keptnGitCommitIDCEExtension, keptnEvent.GitCommitID)
 	event.SetExtension(keptnSpecVersionCEExtension, keptnEvent.Shkeptnspecversion)
 	return event
 }
@@ -451,7 +452,7 @@ func ToKeptnEvent(event cloudevents.Event) (models.KeptnContextExtendedCE, error
 		Specversion:        event.SpecVersion(),
 		Time:               event.Time(),
 		Triggeredid:        triggeredID,
-		Gitcommitid:        gitCommitID,
+		GitCommitID:        gitCommitID,
 		Type:               strutils.Stringp(event.Type()),
 	}
 

diff --git a/pkg/lib/v0_2_0/events_test.go b/pkg/lib/v0_2_0/events_test.go
@@ -281,7 +281,7 @@ func TestCreateSimpleKeptnEvent(t *testing.T) {
 	require.NotEmpty(t, event.Shkeptnspecversion)
 	require.Equal(t, defaultSpecVersion, event.Specversion)
 	require.Equal(t, "", event.Triggeredid)
-	require.Equal(t, "", event.Gitcommitid)
+	require.Equal(t, "", event.GitCommitID)
 	require.Equal(t, strutils.Stringp("sh.keptn.event.dev.delivery.triggered"), event.Type)
 }
 
@@ -304,7 +304,7 @@ func TestCreateKeptnEvent(t *testing.T) {
 	require.Equal(t, strutils.Stringp("source"), event.Source)
 	require.Equal(t, "my-keptn-context", event.Shkeptncontext)
 	require.Equal(t, "my-triggered-id", event.Triggeredid)
-	require.Equal(t, "my-commit-id", event.Gitcommitid)
+	require.Equal(t, "my-commit-id", event.GitCommitID)
 	require.Equal(t, strutils.Stringp("sh.keptn.event.dev.delivery.triggered"), event.Type)
 }
 
@@ -335,7 +335,7 @@ func TestToCloudEvent(t *testing.T) {
 		Shkeptnspecversion: config.GetKeptnGoUtilsConfig().ShKeptnSpecVersion,
 		Specversion:        defaultSpecVersion,
 		Triggeredid:        "my-triggered-id",
-		Gitcommitid:        "git-commit-id",
+		GitCommitID:        "git-commit-id",
 		Type:               strutils.Stringp("sh.keptn.event.dev.delivery.triggered"),
 	}
 	cloudevent := ToCloudEvent(keptnEvent)
@@ -359,7 +359,7 @@ func TestToKeptnEvent(t *testing.T) {
 		Specversion:        defaultSpecVersion,
 		Time:               time.Time{},
 		Triggeredid:        "my-triggered-id",
-		Gitcommitid:        "my-commit-id",
+		GitCommitID:        "my-commit-id",
 		Type:               strutils.Stringp("sh.keptn.event.dev.delivery.triggered"),
 	}