Skip to content

Commit e2e7980

Browse files
authored
Support the "environment" field in the Pipeline and Job webhook events (#1297)
1 parent 2d576fb commit e2e7980

File tree

5 files changed

+73
-0
lines changed

5 files changed

+73
-0
lines changed

gitlab4j-models/src/main/java/org/gitlab4j/api/models/Build.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.Date;
44

5+
import org.gitlab4j.api.webhook.EventEnvironment;
56
import org.gitlab4j.models.utils.JacksonJson;
67

78
/**
@@ -25,6 +26,7 @@ public class Build {
2526
private User user;
2627
private Runner runner;
2728
private ArtifactsFile artifactsFile;
29+
private EventEnvironment environment;
2830

2931
public Long getId() {
3032
return id;
@@ -154,6 +156,14 @@ public void setArtifactsFile(ArtifactsFile artifactsFile) {
154156
this.artifactsFile = artifactsFile;
155157
}
156158

159+
public EventEnvironment getEnvironment() {
160+
return environment;
161+
}
162+
163+
public void setEnvironment(EventEnvironment environment) {
164+
this.environment = environment;
165+
}
166+
157167
@Override
158168
public String toString() {
159169
return (JacksonJson.toJsonString(this));

gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ public class BuildEvent extends AbstractEvent {
4242
private EventProject project;
4343
private Runner runner;
4444

45+
private EventEnvironment environment;
46+
4547
@Override
4648
public String getObjectKind() {
4749
return (OBJECT_KIND);
@@ -244,6 +246,14 @@ public void setRunner(Runner runner) {
244246
this.runner = runner;
245247
}
246248

249+
public EventEnvironment getEnvironment() {
250+
return environment;
251+
}
252+
253+
public void setEnvironment(EventEnvironment environment) {
254+
this.environment = environment;
255+
}
256+
247257
@Override
248258
public String toString() {
249259
return (JacksonJson.toJsonString(this));
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package org.gitlab4j.api.webhook;
2+
3+
import org.gitlab4j.models.utils.JacksonJson;
4+
5+
public class EventEnvironment {
6+
private String name;
7+
private String action;
8+
private String deploymentTier;
9+
10+
public String getName() {
11+
return name;
12+
}
13+
14+
public void setName(String name) {
15+
this.name = name;
16+
}
17+
18+
public String getAction() {
19+
return action;
20+
}
21+
22+
public void setAction(String action) {
23+
this.action = action;
24+
}
25+
26+
public String getDeploymentTier() {
27+
return deploymentTier;
28+
}
29+
30+
public void setDeploymentTier(String deploymentTier) {
31+
this.deploymentTier = deploymentTier;
32+
}
33+
34+
@Override
35+
public String toString() {
36+
return (JacksonJson.toJsonString(this));
37+
}
38+
}

gitlab4j-models/src/test/resources/org/gitlab4j/models/build-event.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@
5454
"path_with_namespace": "gitlab-org/gitlab-test",
5555
"default_branch": "master"
5656
},
57+
"environment": {
58+
"name": "Test Env",
59+
"action": "start",
60+
"deployment_tier": "testing"
61+
},
5762
"runner": {
5863
"active": true,
5964
"runner_type": "project_type",

gitlab4j-models/src/test/resources/org/gitlab4j/models/pipeline-event.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@
189189
"username": "root",
190190
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon",
191191
"email": "[email protected]"
192+
},
193+
"environment": {
194+
"name": "production",
195+
"action": "start",
196+
"deployment_tier": "production"
192197
}
193198
},
194199
{
@@ -304,6 +309,11 @@
304309
"username": "root",
305310
"avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon",
306311
"email": "[email protected]"
312+
},
313+
"environment": {
314+
"name": "staging",
315+
"action": "start",
316+
"deployment_tier": "staging"
307317
}
308318
}
309319
]

0 commit comments

Comments
 (0)