Merge pull request #123 from shaheed121/fix_gitlab_payload

Modify Gitlab Job and Pipeline events

gitlab/payload.go

@@ -112,7 +112,8 @@ type PipelineEventPayload struct {
 	Project          Project                  `json:"project"`
 	Commit           Commit                   `json:"commit"`
 	ObjectAttributes PipelineObjectAttributes `json:"object_attributes"`
-	Jobs             []Job                    `json:"jobs"`
+	MergeRequest     MergeRequest             `json:"merge_request"`
+	Builds           []Build                  `json:"builds"`
 }
 
 // CommentEventPayload contains the information for GitLab's comment event
@@ -153,25 +154,27 @@ type BuildEventPayload struct {
 
 // JobEventPayload contains the information for GitLab's Job status change
 type JobEventPayload struct {
-	ObjectKind       string      `json:"object_kind"`
+	ObjectKind         string      `json:"object_kind"`
-	Ref              string      `json:"ref"`
+	Ref                string      `json:"ref"`
-	Tag              bool        `json:"tag"`
+	Tag                bool        `json:"tag"`
-	BeforeSHA        string      `json:"before_sha"`
+	BeforeSHA          string      `json:"before_sha"`
-	SHA              string      `json:"sha"`
+	SHA                string      `json:"sha"`
-	JobID            int64       `json:"Job_id"`
+	BuildID            int64       `json:"build_id"`
-	JobName          string      `json:"Job_name"`
+	BuildName          string      `json:"build_name"`
-	JobStage         string      `json:"Job_stage"`
+	BuildStage         string      `json:"build_stage"`
-	JobStatus        string      `json:"Job_status"`
+	BuildStatus        string      `json:"build_status"`
-	JobStartedAt     customTime  `json:"Job_started_at"`
+	BuildStartedAt     customTime  `json:"build_started_at"`
-	JobFinishedAt    customTime  `json:"Job_finished_at"`
+	BuildFinishedAt    customTime  `json:"build_finished_at"`
-	JobDuration      int64       `json:"Job_duration"`
+	BuildDuration      int64       `json:"build_duration"`
-	Job              bool        `json:"Job"`
+	BuildAllowFailure  bool        `json:"build_allow_failure"`
-	JobFailureReason string      `json:"job_failure_reason"`
+	BuildFailureReason string      `json:"build_failure_reason"`
-	ProjectID        int64       `json:"project_id"`
+	PipelineID         int64       `json:"pipeline_id"`
-	ProjectName      string      `json:"project_name"`
+	ProjectID          int64       `json:"project_id"`
-	User             User        `json:"user"`
+	ProjectName        string      `json:"project_name"`
-	Commit           BuildCommit `json:"commit"`
+	User               User        `json:"user"`
-	Repository       Repository  `json:"repository"`
+	Commit             BuildCommit `json:"commit"`
+	Repository         Repository  `json:"repository"`
+	Runner             Runner      `json:"runner"`
 }
 
 // SystemHookPayload contains the ObjectKind to match with real hook events
@@ -197,8 +200,8 @@ type Issue struct {
 	IID         int64      `json:"iid"`
 }
 
-// Job contains all of the GitLab job information
+// Build contains all of the GitLab Build information
-type Job struct {
+type Build struct {
 	ID            int64         `json:"id"`
 	Stage         string        `json:"stage"`
 	Name          string        `json:"name"`
@@ -240,6 +243,7 @@ type Wiki struct {
 type Commit struct {
 	ID        string     `json:"id"`
 	Message   string     `json:"message"`
+	Title     string     `json:"title"`
 	Timestamp customTime `json:"timestamp"`
 	URL       string     `json:"url"`
 	Author    Author     `json:"author"`
@@ -304,28 +308,40 @@ type Project struct {
 
 // Repository contains all of the GitLab repository information
 type Repository struct {
-	Name        string `json:"name"`
+	Name            string `json:"name"`
-	URL         string `json:"url"`
+	URL             string `json:"url"`
-	Description string `json:"description"`
+	Description     string `json:"description"`
-	Homepage    string `json:"homepage"`
+	Homepage        string `json:"homepage"`
+	GitSSHURL       string `json:"git_ssh_url"`
+	GitHTTPURL      string `json:"git_http_url"`
+	VisibilityLevel int64  `json:"visibility_level"`
 }
 
 // ObjectAttributes contains all of the GitLab object attributes information
 type ObjectAttributes struct {
 	ID               int64      `json:"id"`
 	Title            string     `json:"title"`
+	AssigneeIDS      []int64    `json:"assignee_ids"`
 	AssigneeID       int64      `json:"assignee_id"`
 	AuthorID         int64      `json:"author_id"`
 	ProjectID        int64      `json:"project_id"`
 	CreatedAt        customTime `json:"created_at"`
 	UpdatedAt        customTime `json:"updated_at"`
-	ChangePosition   Position   `json:"change_position"`
+	UpdatedByID      int64      `json:"updated_by_id"`
-	OriginalPosition Position   `json:"original_position"`
+	LastEditedAt     customTime `json:"last_edited_at"`
+	LastEditedByID   int64      `json:"last_edited_by_id"`
+	RelativePosition int64      `json:"relative_position"`
 	Position         Position   `json:"position"`
 	BranchName       string     `json:"branch_name"`
 	Description      string     `json:"description"`
 	MilestoneID      int64      `json:"milestone_id"`
 	State            string     `json:"state"`
+	StateID          int64      `json:"state_id"`
+	Confidential     bool       `json:"confidential"`
+	DiscussionLocked bool       `json:"discussion_locked"`
+	DueDate          customTime `json:"due_date"`
+	TimeEstimate     int64      `json:"time_estimate"`
+	TotalTimeSpent   int64      `json:"total_time_spent"`
 	IID              int64      `json:"iid"`
 	URL              string     `json:"url"`
 	Action           string     `json:"action"`
@@ -374,6 +390,13 @@ type PipelineObjectAttributes struct {
 	CreatedAt  customTime `json:"created_at"`
 	FinishedAt customTime `json:"finished_at"`
 	Duration   int64      `json:"duration"`
+	Variables  []Variable `json:"variables"`
+}
+
+// Variable contains pipeline variables
+type Variable struct {
+	Key   string `json:"key"`
+	Value string `json:"value"`
 }
 
 // Position defines a specific location, identified by paths line numbers and
@@ -421,6 +444,7 @@ type MergeRequest struct {
 	LastCommit      LastCommit `json:"last_commit"`
 	WorkInProgress  bool       `json:"work_in_progress"`
 	Assignee        Assignee   `json:"assignee"`
+	URL             string     `json:"url"`
 }
 
 // Assignee contains all of the GitLab assignee information

testdata/gitlab/job-event.json

@@ -1,42 +1,50 @@
 {
-    "object_kind": "job",
+  "object_kind": "build",
-    "ref": "gitlab-script-trigger",
+  "ref": "gitlab-script-trigger",
-    "tag": false,
+  "tag": false,
-    "before_sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+  "before_sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+  "sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+  "build_id": 1977,
+  "build_name": "test",
+  "build_stage": "test",
+  "build_status": "created",
+  "build_started_at": null,
+  "build_finished_at": null,
+  "build_duration": null,
+  "build_allow_failure": false,
+  "build_failure_reason": "script_failure",
+  "pipeline_id": 2366,
+  "project_id": 380,
+  "project_name": "gitlab-org/gitlab-test",
+  "user": {
+    "id": 3,
+    "name": "User",
+    "email": "user@gitlab.com",
+    "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+  },
+  "commit": {
+    "id": 2366,
     "sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
-    "job_id": 1977,
+    "message": "test\n",
-    "job_name": "test",
+    "author_name": "User",
-    "job_stage": "test",
+    "author_email": "user@gitlab.com",
-    "job_status": "created",
+    "status": "created",
-    "job_started_at": null,
+    "duration": null,
-    "job_finished_at": null,
+    "started_at": null,
-    "job_duration": null,
+    "finished_at": null
-    "job_allow_failure": false,
+  },
-    "job_failure_reason": "script_failure",
+  "repository": {
-    "project_id": 380,
+    "name": "gitlab_test",
-    "project_name": "gitlab-org/gitlab-test",
+    "description": "Atque in sunt eos similique dolores voluptatem.",
-    "user": {
+    "homepage": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
-      "id": 3,
+    "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
-      "name": "User",
+    "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
-      "email": "user@gitlab.com"
+    "visibility_level": 20
-    },
+  },
-    "commit": {
+  "runner": {
-      "id": 2366,
+    "active": true,
-      "sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+    "is_shared": false,
-      "message": "test\n",
+    "id": 380987,
-      "author_name": "User",
+    "description": "shared-runners-manager-6.gitlab.com"
-      "author_email": "user@gitlab.com",
-      "status": "created",
-      "duration": null,
-      "started_at": null,
-      "finished_at": null
-    },
-    "repository": {
-      "name": "gitlab_test",
-      "description": "Atque in sunt eos similique dolores voluptatem.",
-      "homepage": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
-      "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
-      "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
-      "visibility_level": 20
-    }
   }
+}

testdata/gitlab/pipeline-event.json

@@ -1,175 +1,194 @@
 {
-  "object_kind": "pipeline",
+   "object_kind": "pipeline",
-  "object_attributes":{
+   "object_attributes":{
-    "id": 31,
+      "id": 31,
-    "ref": "master",
+      "ref": "master",
-    "tag": false,
+      "tag": false,
-    "sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
+      "sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
-    "before_sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
+      "before_sha": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
-    "status": "success",
+      "source": "merge_request_event",
-    "stages":[
-      "build",
-      "test",
-      "deploy"
-    ],
-    "created_at": "2016-08-12 15:23:28 UTC",
-    "finished_at": "2016-08-12 15:26:29 UTC",
-    "duration": 63,
-    "variables": [
-      {
-        "key": "NESTOR_PROD_ENVIRONMENT",
-        "value": "us-west-1"
-      }
-    ]
-  },
-  "user":{
-    "name": "Administrator",
-    "username": "root",
-    "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
-  },
-  "project":{
-    "id": 1,
-    "name": "Gitlab Test",
-    "description": "Atque in sunt eos similique dolores voluptatem.",
-    "web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
-    "avatar_url": null,
-    "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
-    "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
-    "namespace": "Gitlab Org",
-    "visibility_level": 20,
-    "path_with_namespace": "gitlab-org/gitlab-test",
-    "default_branch": "master"
-  },
-  "commit":{
-    "id": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
-    "message": "test\n",
-    "timestamp": "2016-08-12T17:23:21+02:00",
-    "url": "http://example.com/gitlab-org/gitlab-test/commit/bcbb5ec396a2c0f828686f14fac9b80b780504f2",
-    "author":{
-      "name": "User",
-      "email": "user@gitlab.com"
-    }
-  },
-  "jobs":[
-    {
-      "id": 380,
-      "stage": "deploy",
-      "name": "production",
-      "status": "skipped",
-      "created_at": "2016-08-12 15:23:28 UTC",
-      "started_at": null,
-      "finished_at": null,
-      "when": "manual",
-      "manual": true,
-      "user":{
-        "name": "Administrator",
-        "username": "root",
-        "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
-      },
-      "runner": null,
-      "artifacts_file":{
-        "filename": null,
-        "size": null
-      }
-    },
-    {
-      "id": 377,
-      "stage": "test",
-      "name": "test-image",
       "status": "success",
+      "stages":[
+         "build",
+         "test",
+         "deploy"
+      ],
       "created_at": "2016-08-12 15:23:28 UTC",
-      "started_at": "2016-08-12 15:26:12 UTC",
-      "finished_at": null,
-      "when": "on_success",
-      "manual": false,
-      "user":{
-        "name": "Administrator",
-        "username": "root",
-        "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
-      },
-      "runner": {
-        "id":380987,
-        "description":"shared-runners-manager-6.gitlab.com",
-        "active":true,
-        "is_shared":true
-      },
-      "artifacts_file":{
-        "filename": null,
-        "size": null
-      }
-    },
-    {
-      "id": 378,
-      "stage": "test",
-      "name": "test-build",
-      "status": "success",
-      "created_at": "2016-08-12 15:23:28 UTC",
-      "started_at": "2016-08-12 15:26:12 UTC",
       "finished_at": "2016-08-12 15:26:29 UTC",
-      "when": "on_success",
+      "duration": 63,
-      "manual": false,
+      "variables": [
-      "user":{
+        {
-        "name": "Administrator",
+          "key": "NESTOR_PROD_ENVIRONMENT",
-        "username": "root",
+          "value": "us-west-1"
-        "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+        }
-      },
+      ]
-      "runner": {
+   },
-        "id":380987,
+    "merge_request": {
-        "description":"shared-runners-manager-6.gitlab.com",
+      "id": 1,
-        "active":true,
+      "iid": 1,
-        "is_shared":true
+      "title": "Test",
-      },
+      "source_branch": "test",
-      "artifacts_file":{
+      "source_project_id": 1,
-        "filename": null,
+      "target_branch": "master",
-        "size": null
+      "target_project_id": 1,
+      "state": "opened",
+      "merge_status": "can_be_merged",
+      "url": "http://192.168.64.1:3005/gitlab-org/gitlab-test/merge_requests/1"
+   },
+   "user":{
+      "name": "Administrator",
+      "username": "root",
+      "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon",
+      "email": "user_email@gitlab.com"
+   },
+   "project":{
+      "id": 1,
+      "name": "Gitlab Test",
+      "description": "Atque in sunt eos similique dolores voluptatem.",
+      "web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
+      "avatar_url": null,
+      "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
+      "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
+      "namespace": "Gitlab Org",
+      "visibility_level": 20,
+      "path_with_namespace": "gitlab-org/gitlab-test",
+      "default_branch": "master"
+   },
+   "commit":{
+      "id": "bcbb5ec396a2c0f828686f14fac9b80b780504f2",
+      "message": "test\n",
+      "timestamp": "2016-08-12T17:23:21+02:00",
+      "url": "http://example.com/gitlab-org/gitlab-test/commit/bcbb5ec396a2c0f828686f14fac9b80b780504f2",
+      "author":{
+         "name": "User",
+         "email": "user@gitlab.com"
       }
-    },
+   },
-    {
+   "builds":[
-      "id": 376,
+      {
-      "stage": "build",
+         "id": 380,
-      "name": "build-image",
+         "stage": "deploy",
-      "status": "success",
+         "name": "production",
-      "created_at": "2016-08-12 15:23:28 UTC",
+         "status": "skipped",
-      "started_at": "2016-08-12 15:24:56 UTC",
+         "created_at": "2016-08-12 15:23:28 UTC",
-      "finished_at": "2016-08-12 15:25:26 UTC",
+         "started_at": null,
-      "when": "on_success",
+         "finished_at": null,
-      "manual": false,
+         "when": "manual",
-      "user":{
+         "manual": true,
-        "name": "Administrator",
+         "allow_failure": false,
-        "username": "root",
+         "user":{
-        "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+            "name": "Administrator",
+            "username": "root",
+            "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+         },
+         "runner": null,
+         "artifacts_file":{
+            "filename": null,
+            "size": null
+         }
       },
-      "runner": {
+      {
-        "id":380987,
+         "id": 377,
-        "description":"shared-runners-manager-6.gitlab.com",
+         "stage": "test",
-        "active":true,
+         "name": "test-image",
-        "is_shared":true
+         "status": "success",
+         "created_at": "2016-08-12 15:23:28 UTC",
+         "started_at": "2016-08-12 15:26:12 UTC",
+         "finished_at": null,
+         "when": "on_success",
+         "manual": false,
+         "allow_failure": false,
+         "user":{
+            "name": "Administrator",
+            "username": "root",
+            "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+         },
+         "runner": {
+            "id":380987,
+            "description":"shared-runners-manager-6.gitlab.com",
+            "active":true,
+            "is_shared":true
+         },
+         "artifacts_file":{
+            "filename": null,
+            "size": null
+         }
       },
-      "artifacts_file":{
+      {
-        "filename": null,
+         "id": 378,
-        "size": null
+         "stage": "test",
+         "name": "test-build",
+         "status": "success",
+         "created_at": "2016-08-12 15:23:28 UTC",
+         "started_at": "2016-08-12 15:26:12 UTC",
+         "finished_at": "2016-08-12 15:26:29 UTC",
+         "when": "on_success",
+         "manual": false,
+         "allow_failure": false,
+         "user":{
+            "name": "Administrator",
+            "username": "root",
+            "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+         },
+         "runner": {
+            "id":380987,
+            "description":"shared-runners-manager-6.gitlab.com",
+            "active":true,
+            "is_shared":true
+         },
+         "artifacts_file":{
+            "filename": null,
+            "size": null
+         }
+      },
+      {
+         "id": 376,
+         "stage": "build",
+         "name": "build-image",
+         "status": "success",
+         "created_at": "2016-08-12 15:23:28 UTC",
+         "started_at": "2016-08-12 15:24:56 UTC",
+         "finished_at": "2016-08-12 15:25:26 UTC",
+         "when": "on_success",
+         "manual": false,
+         "allow_failure": false,
+         "user":{
+            "name": "Administrator",
+            "username": "root",
+            "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+         },
+         "runner": {
+            "id":380987,
+            "description":"shared-runners-manager-6.gitlab.com",
+            "active":true,
+            "is_shared":true
+         },
+         "artifacts_file":{
+            "filename": null,
+            "size": null
+         }
+      },
+      {
+         "id": 379,
+         "stage": "deploy",
+         "name": "staging",
+         "status": "created",
+         "created_at": "2016-08-12 15:23:28 UTC",
+         "started_at": null,
+         "finished_at": null,
+         "when": "on_success",
+         "manual": false,
+         "allow_failure": false,
+         "user":{
+            "name": "Administrator",
+            "username": "root",
+            "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
+         },
+         "runner": null,
+         "artifacts_file":{
+            "filename": null,
+            "size": null
+         }
       }
-    },
+   ]
-    {
-      "id": 379,
-      "stage": "deploy",
-      "name": "staging",
-      "status": "created",
-      "created_at": "2016-08-12 15:23:28 UTC",
-      "started_at": null,
-      "finished_at": null,
-      "when": "on_success",
-      "manual": false,
-      "user":{
-        "name": "Administrator",
-        "username": "root",
-        "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
-      },
-      "runner": null,
-      "artifacts_file":{
-        "filename": null,
-        "size": null
-      }
-    }
-  ]
 }