Tweak the event code just a little

Author: svanharmelen

event_parsing.go

@@ -27,28 +27,21 @@ type EventType string
 
 // List of available event types.
 const (
+	EventConfidentialIssue EventType = "Confidential Issue Hook"
+	EventConfidentialNote  EventType = "Confidential Note Hook"
 	EventTypeBuild         EventType = "Build Hook"
 	EventTypeDeployment    EventType = "Deployment Hook"
 	EventTypeIssue         EventType = "Issue Hook"
-	EventConfidentialIssue EventType = "Confidential Issue Hook"
 	EventTypeJob           EventType = "Job Hook"
 	EventTypeMergeRequest  EventType = "Merge Request Hook"
 	EventTypeNote          EventType = "Note Hook"
-	EventConfidentialNote  EventType = "Confidential Note Hook"
 	EventTypePipeline      EventType = "Pipeline Hook"
 	EventTypePush          EventType = "Push Hook"
 	EventTypeRelease       EventType = "Release Hook"
+	EventTypeServiceHook   EventType = "Service Hook"
 	EventTypeSystemHook    EventType = "System Hook"
 	EventTypeTagPush       EventType = "Tag Push Hook"
 	EventTypeWikiPage      EventType = "Wiki Page Hook"
-	EventTypeServiceHook   EventType = "Service Hook"
-)
-
-const (
-	noteableTypeCommit       = "Commit"
-	noteableTypeMergeRequest = "MergeRequest"
-	noteableTypeIssue        = "Issue"
-	noteableTypeSnippet      = "Snippet"
 )
 
 const (
@@ -57,6 +50,13 @@ const (
 	eventObjectKindMergeRequest = "merge_request"
 )
 
+const (
+	noteableTypeCommit       = "Commit"
+	noteableTypeIssue        = "Issue"
+	noteableTypeMergeRequest = "MergeRequest"
+	noteableTypeSnippet      = "Snippet"
+)
+
 type noteEvent struct {
 	ObjectKind       string `json:"object_kind"`
 	ObjectAttributes struct {
@@ -220,16 +220,6 @@ func ParseWebhook(eventType EventType, payload []byte) (event interface{}, err e
 		event = &JobEvent{}
 	case EventTypeMergeRequest:
 		event = &MergeEvent{}
-	case EventTypePipeline:
-		event = &PipelineEvent{}
-	case EventTypePush:
-		event = &PushEvent{}
-	case EventTypeRelease:
-		event = &ReleaseEvent{}
-	case EventTypeTagPush:
-		event = &TagEvent{}
-	case EventTypeWikiPage:
-		event = &WikiPageEvent{}
 	case EventTypeNote, EventConfidentialNote:
 		note := &noteEvent{}
 		err := json.Unmarshal(payload, note)
@@ -253,6 +243,12 @@ func ParseWebhook(eventType EventType, payload []byte) (event interface{}, err e
 		default:
 			return nil, fmt.Errorf("unexpected noteable type %s", note.ObjectAttributes.NoteableType)
 		}
+	case EventTypePipeline:
+		event = &PipelineEvent{}
+	case EventTypePush:
+		event = &PushEvent{}
+	case EventTypeRelease:
+		event = &ReleaseEvent{}
 	case EventTypeServiceHook:
 		service := &serviceEvent{}
 		err := json.Unmarshal(payload, service)
@@ -269,7 +265,10 @@ func ParseWebhook(eventType EventType, payload []byte) (event interface{}, err e
 		default:
 			return nil, fmt.Errorf("unexpected service type %s", service.ObjectKind)
 		}
-
+	case EventTypeTagPush:
+		event = &TagEvent{}
+	case EventTypeWikiPage:
+		event = &WikiPageEvent{}
 	default:
 		return nil, fmt.Errorf("unexpected event type: %s", eventType)
 	}

event_parsing_webhook_test.go

@@ -330,6 +330,29 @@ func TestParseReleaseHook(t *testing.T) {
 	}
 }
 
+func TestParseServiceWebHook(t *testing.T) {
+	parsedEvent, err := ParseWebhook("Service Hook", loadFixture("testdata/webhooks/service_merge_request.json"))
+	if err != nil {
+		t.Errorf("Error parsing service hook merge request: %s", err)
+	}
+
+	switch event := parsedEvent.(type) {
+	case *MergeEvent:
+		assert.EqualValues(t, &EventUser{
+			ID:        2,
+			Name:      "the test",
+			Username:  "test",
+			Email:     "[email protected]",
+			AvatarURL: "https://www.gravatar.com/avatar/dd46a756faad4727fb679320751f6dea?s=80&d=identicon",
+		}, event.User)
+		assert.EqualValues(t, "unchecked", event.ObjectAttributes.MergeStatus)
+		assert.EqualValues(t, "next-feature", event.ObjectAttributes.SourceBranch)
+		assert.EqualValues(t, "master", event.ObjectAttributes.TargetBranch)
+	default:
+		t.Errorf("unexpected event type: %s", reflect.TypeOf(parsedEvent))
+	}
+}
+
 func TestParseSnippetCommentHook(t *testing.T) {
 	raw := loadFixture("testdata/webhooks/note_snippet.json")
 
@@ -423,26 +446,3 @@ func TestParseWikiPageHook(t *testing.T) {
 		t.Errorf("Message is %v, want %v", event.ObjectAttributes.Message, "adding an awesome page to the wiki")
 	}
 }
-
-func TestParseServiceWebHook(t *testing.T) {
-	parsedEvent, err := ParseWebhook("Service Hook", loadFixture("testdata/webhooks/service_merge_request.json"))
-	if err != nil {
-		t.Errorf("Error parsing service hook merge request: %s", err)
-	}
-
-	switch event := parsedEvent.(type) {
-	case *MergeEvent:
-		assert.EqualValues(t, &EventUser{
-			ID:        2,
-			Name:      "the test",
-			Username:  "test",
-			Email:     "[email protected]",
-			AvatarURL: "https://www.gravatar.com/avatar/dd46a756faad4727fb679320751f6dea?s=80&d=identicon",
-		}, event.User)
-		assert.EqualValues(t, "unchecked", event.ObjectAttributes.MergeStatus)
-		assert.EqualValues(t, "next-feature", event.ObjectAttributes.SourceBranch)
-		assert.EqualValues(t, "master", event.ObjectAttributes.TargetBranch)
-	default:
-		t.Errorf("unexpected event type: %s", reflect.TypeOf(parsedEvent))
-	}
-}

strings_test.go

@@ -1,8 +1,9 @@
 package gitlab
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 type Person struct {